Przeglądaj źródła

Fix coverity bug ID 4: remove unused code & fix compile error

In evs_dispatch()  the local ignore_dispatch is not used.
So I have removed this code.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1717 fd59a12c-fef9-0310-b244-a6a79926bd2f
Angus Salkeld 17 lat temu
rodzic
commit
c049f8bf21
4 zmienionych plików z 4 dodań i 28 usunięć
  1. 1 1
      exec/ipc.c
  2. 1 9
      lib/confdb.c
  3. 1 9
      lib/cpg.c
  4. 1 9
      lib/evs.c

+ 1 - 1
exec/ipc.c

@@ -525,7 +525,7 @@ retry_poll:
 
 
 		case CONN_STATE_DISCONNECTED:
 		case CONN_STATE_DISCONNECTED:
 			rel_mutex = conn_info->shared_mutex;
 			rel_mutex = conn_info->shared_mutex;
-			rel2_mutex = conn_info->mutex;
+			rel2_mutex = &conn_info->mutex;
 			private_data = conn_info->private_data;
 			private_data = conn_info->private_data;
 			cinfo_partner = conn_info->conn_info_partner;
 			cinfo_partner = conn_info->conn_info_partner;
 			conn_info_destroy (conn);
 			conn_info_destroy (conn);

+ 1 - 9
lib/confdb.c

@@ -315,7 +315,6 @@ cs_error_t confdb_dispatch (
 	struct res_lib_confdb_object_create_callback *res_object_created_pt;
 	struct res_lib_confdb_object_create_callback *res_object_created_pt;
 	struct res_lib_confdb_object_destroy_callback *res_object_destroyed_pt;
 	struct res_lib_confdb_object_destroy_callback *res_object_destroyed_pt;
 	struct confdb_res_overlay dispatch_data;
 	struct confdb_res_overlay dispatch_data;
-	int ignore_dispatch = 0;
 
 
 	error = saHandleInstanceGet (&confdb_handle_t_db, handle, (void *)&confdb_inst);
 	error = saHandleInstanceGet (&confdb_handle_t_db, handle, (void *)&confdb_inst);
 	if (error != CS_OK) {
 	if (error != CS_OK) {
@@ -453,16 +452,9 @@ cs_error_t confdb_dispatch (
 		 * */
 		 * */
 		switch (dispatch_types) {
 		switch (dispatch_types) {
 		case CONFDB_DISPATCH_ONE:
 		case CONFDB_DISPATCH_ONE:
-			if (ignore_dispatch) {
-				ignore_dispatch = 0;
-			} else {
-				cont = 0;
-			}
+			cont = 0;
 			break;
 			break;
 		case CONFDB_DISPATCH_ALL:
 		case CONFDB_DISPATCH_ALL:
-			if (ignore_dispatch) {
-				ignore_dispatch = 0;
-			}
 			break;
 			break;
 		case CONFDB_DISPATCH_BLOCKING:
 		case CONFDB_DISPATCH_BLOCKING:
 			break;
 			break;

+ 1 - 9
lib/cpg.c

@@ -254,7 +254,6 @@ cs_error_t cpg_dispatch (
 	struct res_lib_cpg_groups_get_callback *res_lib_cpg_groups_get_callback;
 	struct res_lib_cpg_groups_get_callback *res_lib_cpg_groups_get_callback;
 	cpg_callbacks_t callbacks;
 	cpg_callbacks_t callbacks;
 	struct cpg_res_overlay dispatch_data;
 	struct cpg_res_overlay dispatch_data;
-	int ignore_dispatch = 0;
 	struct cpg_address member_list[CPG_MEMBERS_MAX];
 	struct cpg_address member_list[CPG_MEMBERS_MAX];
 	struct cpg_address left_list[CPG_MEMBERS_MAX];
 	struct cpg_address left_list[CPG_MEMBERS_MAX];
 	struct cpg_address joined_list[CPG_MEMBERS_MAX];
 	struct cpg_address joined_list[CPG_MEMBERS_MAX];
@@ -434,16 +433,9 @@ cs_error_t cpg_dispatch (
 		 * */
 		 * */
 		switch (dispatch_types) {
 		switch (dispatch_types) {
 		case CS_DISPATCH_ONE:
 		case CS_DISPATCH_ONE:
-			if (ignore_dispatch) {
-				ignore_dispatch = 0;
-			} else {
-				cont = 0;
-			}
+			cont = 0;
 			break;
 			break;
 		case CS_DISPATCH_ALL:
 		case CS_DISPATCH_ALL:
-			if (ignore_dispatch) {
-				ignore_dispatch = 0;
-			}
 			break;
 			break;
 		case CS_DISPATCH_BLOCKING:
 		case CS_DISPATCH_BLOCKING:
 			break;
 			break;

+ 1 - 9
lib/evs.c

@@ -219,7 +219,6 @@ cs_error_t evs_dispatch (
 	struct res_evs_deliver_callback *res_evs_deliver_callback;
 	struct res_evs_deliver_callback *res_evs_deliver_callback;
 	evs_callbacks_t callbacks;
 	evs_callbacks_t callbacks;
 	struct evs_res_overlay dispatch_data;
 	struct evs_res_overlay dispatch_data;
-	int ignore_dispatch = 0;
 
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
 	if (error != CS_OK) {
 	if (error != CS_OK) {
@@ -337,16 +336,9 @@ cs_error_t evs_dispatch (
 		 * */
 		 * */
 		switch (dispatch_types) {
 		switch (dispatch_types) {
 		case CS_DISPATCH_ONE:
 		case CS_DISPATCH_ONE:
-			if (ignore_dispatch) {
-				ignore_dispatch = 0;
-			} else {
-				cont = 0;
-			}
+			cont = 0;
 			break;
 			break;
 		case CS_DISPATCH_ALL:
 		case CS_DISPATCH_ALL:
-			if (ignore_dispatch) {
-				ignore_dispatch = 0;
-			}
 			break;
 			break;
 		case CS_DISPATCH_BLOCKING:
 		case CS_DISPATCH_BLOCKING:
 			break;
 			break;