Kaynağa Gözat

quorum: Fix inconsistent union access warning

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Jan Friesse 1 hafta önce
ebeveyn
işleme
d1cc166cd7
1 değiştirilmiş dosya ile 3 ekleme ve 3 silme
  1. 3 3
      lib/quorum.c

+ 3 - 3
lib/quorum.c

@@ -59,8 +59,8 @@ struct quorum_inst {
 	qb_ipcc_connection_t *c;
 	qb_ipcc_connection_t *c;
 	int finalize;
 	int finalize;
 	const void *context;
 	const void *context;
+	quorum_model_t model;
 	union {
 	union {
-		quorum_model_data_t model_data;
 		quorum_model_v0_data_t model_v0_data;
 		quorum_model_v0_data_t model_v0_data;
 		quorum_model_v1_data_t model_v1_data;
 		quorum_model_v1_data_t model_v1_data;
 	};
 	};
@@ -185,7 +185,7 @@ cs_error_t quorum_model_initialize (
 		}
 		}
 	}
 	}
 
 
-	quorum_inst->model_data.model = model;
+	quorum_inst->model = model;
 	quorum_inst->context = context;
 	quorum_inst->context = context;
 
 
 	(void)hdb_handle_put (&quorum_handle_t_db, *handle);
 	(void)hdb_handle_put (&quorum_handle_t_db, *handle);
@@ -490,7 +490,7 @@ cs_error_t quorum_dispatch (
 		 * operate at the same time that quorum_finalize has been called in another thread.
 		 * operate at the same time that quorum_finalize has been called in another thread.
 		 */
 		 */
 		memcpy (&quorum_inst_copy, quorum_inst, sizeof(quorum_inst_copy));
 		memcpy (&quorum_inst_copy, quorum_inst, sizeof(quorum_inst_copy));
-		switch (quorum_inst_copy.model_data.model) {
+		switch (quorum_inst_copy.model) {
 		case QUORUM_MODEL_V0:
 		case QUORUM_MODEL_V0:
 			/*
 			/*
 			 * Dispatch incoming message
 			 * Dispatch incoming message