From 1ccb5cde4da83c524ae5ccbf9bfb599421ccbd39 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sun, 21 Nov 2004 17:20:42 +0000 Subject: [PATCH] Cleanup some of the warnings reported by George. This commit was SVN r3647. --- src/mca/gpr/base/gpr_base_unpack_mode_ops.c | 2 +- src/mca/gpr/base/gpr_base_unpack_synchro.c | 3 +- .../gpr/replica/gpr_replica_recv_proxy_msgs.c | 128 +++++++++--------- .../gpr/replica/gpr_replica_test_internals.c | 14 +- src/mca/oob/tcp/oob_tcp_msg.c | 4 +- src/mca/oob/tcp/oob_tcp_peer.c | 16 +-- src/runtime/ompi_rte_parse_cmd_line.c | 2 +- src/tools/console/ompiconsole.c | 2 +- src/tools/openmpi/openmpi.c | 2 +- 9 files changed, 86 insertions(+), 87 deletions(-) diff --git a/src/mca/gpr/base/gpr_base_unpack_mode_ops.c b/src/mca/gpr/base/gpr_base_unpack_mode_ops.c index 7262dcdfee..70bf542ebf 100644 --- a/src/mca/gpr/base/gpr_base_unpack_mode_ops.c +++ b/src/mca/gpr/base/gpr_base_unpack_mode_ops.c @@ -20,7 +20,7 @@ int mca_gpr_base_unpack_triggers_active_cmd(ompi_buffer_t cmd) return OMPI_SUCCESS; } -int mca_gpr_base_unpack_triggers_inactive(ompi_buffer_t cmd) +int mca_gpr_base_unpack_triggers_inactive_cmd(ompi_buffer_t cmd) { return OMPI_SUCCESS; diff --git a/src/mca/gpr/base/gpr_base_unpack_synchro.c b/src/mca/gpr/base/gpr_base_unpack_synchro.c index b27d602428..948724a07f 100644 --- a/src/mca/gpr/base/gpr_base_unpack_synchro.c +++ b/src/mca/gpr/base/gpr_base_unpack_synchro.c @@ -19,7 +19,6 @@ int mca_gpr_base_unpack_synchro(ompi_buffer_t buffer, ompi_registry_notify_id_t *remote_idtag) { mca_gpr_cmd_flag_t command; - int32_t response; if ((OMPI_SUCCESS != ompi_unpack(buffer, &command, 1, MCA_GPR_OOB_PACK_CMD)) || (MCA_GPR_SUBSCRIBE_CMD != command)) { @@ -30,7 +29,7 @@ int mca_gpr_base_unpack_synchro(ompi_buffer_t buffer, ompi_registry_notify_id_t return OMPI_ERROR; } - return (int)response; + return OMPI_SUCCESS; } diff --git a/src/mca/gpr/replica/gpr_replica_recv_proxy_msgs.c b/src/mca/gpr/replica/gpr_replica_recv_proxy_msgs.c index 4de3347978..e5cf2e4deb 100644 --- a/src/mca/gpr/replica/gpr_replica_recv_proxy_msgs.c +++ b/src/mca/gpr/replica/gpr_replica_recv_proxy_msgs.c @@ -52,8 +52,8 @@ void mca_gpr_replica_recv(int status, ompi_process_name_t* sender, { ompi_buffer_t answer; size_t buf_size=0; - bool return_requested; - bool compound_cmd_detected; + bool return_requested=true; + bool compound_cmd_detected=false; if (mca_gpr_replica_debug) { ompi_output(0, "gpr replica: received message"); @@ -102,7 +102,7 @@ ompi_buffer_t mca_gpr_replica_process_command_buffer(ompi_buffer_t buffer, int32_t test_level=0; mca_gpr_cmd_flag_t command; int32_t response=0; - int8_t tmp_bool; + int8_t tmp_bool=0; if (OMPI_SUCCESS != ompi_buffer_init(&answer, 0)) { @@ -540,7 +540,7 @@ ompi_buffer_t mca_gpr_replica_process_command_buffer(ompi_buffer_t buffer, static int32_t mca_gpr_replica_recv_delete_segment_cmd(ompi_buffer_t buffer) { char *segment=NULL; - mca_gpr_replica_segment_t *seg; + mca_gpr_replica_segment_t *seg=NULL; if (0 > ompi_unpack_string(buffer, &segment)) { return OMPI_ERROR; @@ -561,15 +561,15 @@ static int32_t mca_gpr_replica_recv_put_cmd(ompi_buffer_t buffer) { ompi_registry_mode_t mode; char *segment=NULL, **tokens=NULL, **tokptr=NULL; - int32_t num_tokens, response=(int32_t)OMPI_ERROR; - ompi_registry_object_size_t object_size; + int32_t num_tokens=0, response=(int32_t)OMPI_ERROR; + ompi_registry_object_size_t object_size=0; ompi_registry_object_t *object=NULL; - mca_gpr_replica_segment_t *seg; - mca_gpr_replica_key_t *keys; - mca_ns_base_jobid_t jobid; - int num_keys; - int8_t action_taken; - int i; + mca_gpr_replica_segment_t *seg=NULL; + mca_gpr_replica_key_t *keys=NULL; + mca_ns_base_jobid_t jobid=0; + int num_keys=0; + int8_t action_taken=0; + int i=0; if (OMPI_SUCCESS != ompi_unpack(buffer, &mode, 1, MCA_GPR_OOB_PACK_MODE)) { goto RETURN_ERROR; @@ -663,13 +663,13 @@ static int32_t mca_gpr_replica_recv_put_cmd(ompi_buffer_t buffer) static ompi_list_t* mca_gpr_replica_recv_get_cmd(ompi_buffer_t buffer) { ompi_registry_mode_t mode; - mca_gpr_replica_segment_t *seg; - mca_gpr_replica_key_t *keys; - int num_keys; + mca_gpr_replica_segment_t *seg=NULL; + mca_gpr_replica_key_t *keys=NULL; + int num_keys=0; char *segment=NULL, **tokens=NULL, **tokptr=NULL; int32_t num_tokens=0; ompi_list_t *returned_list=NULL; - int i; + int i=0; returned_list = OBJ_NEW(ompi_list_t); @@ -739,11 +739,11 @@ static ompi_list_t* mca_gpr_replica_recv_get_cmd(ompi_buffer_t buffer) static int32_t mca_gpr_replica_recv_delete_object_cmd(ompi_buffer_t buffer) { ompi_registry_mode_t mode; - mca_gpr_replica_key_t *keys; - mca_gpr_replica_segment_t *seg; + mca_gpr_replica_key_t *keys=NULL; + mca_gpr_replica_segment_t *seg=NULL; char *segment=NULL, **tokens=NULL, **tokptr=NULL; - int32_t num_tokens, response=(int32_t)OMPI_ERROR; - int i, num_keys; + int32_t num_tokens=0, response=(int32_t)OMPI_ERROR; + int i=0, num_keys=0; if (OMPI_SUCCESS != ompi_unpack(buffer, &mode, 1, MCA_GPR_OOB_PACK_MODE)) { goto RETURN_ERROR; @@ -813,8 +813,8 @@ static int32_t mca_gpr_replica_recv_delete_object_cmd(ompi_buffer_t buffer) static ompi_list_t* mca_gpr_replica_recv_index_cmd(ompi_buffer_t buffer) { ompi_registry_mode_t mode; - mca_gpr_replica_segment_t *seg; - char *segment; + mca_gpr_replica_segment_t *seg=NULL; + char *segment=NULL; ompi_list_t *returned_list=NULL; if (OMPI_SUCCESS != ompi_unpack(buffer, &mode, 1, MCA_GPR_OOB_PACK_MODE)) { @@ -859,12 +859,12 @@ static ompi_registry_notify_id_t mca_gpr_replica_recv_subscribe_cmd(ompi_process ompi_registry_mode_t mode; char *segment=NULL, **tokens=NULL, **tokptr=NULL; ompi_registry_notify_action_t action; - ompi_registry_notify_id_t local_idtag1, id_tag, return_tag; - mca_gpr_replica_segment_t *seg; - mca_gpr_replica_key_t *keys; - int num_keys; - int32_t num_tokens, response=(int32_t)OMPI_ERROR; - int i; + ompi_registry_notify_id_t local_idtag1=0, id_tag=0, return_tag=0; + mca_gpr_replica_segment_t *seg=NULL; + mca_gpr_replica_key_t *keys=NULL; + int num_keys=0; + int32_t num_tokens=0, response=(int32_t)OMPI_ERROR; + int i=0; return_tag = OMPI_REGISTRY_NOTIFY_ID_MAX; @@ -960,7 +960,7 @@ static ompi_registry_notify_id_t mca_gpr_replica_recv_subscribe_cmd(ompi_process static int32_t mca_gpr_replica_recv_unsubscribe_cmd(ompi_buffer_t buffer) { - ompi_registry_notify_id_t sub_number; + ompi_registry_notify_id_t sub_number=0; int32_t response=(int32_t)OMPI_ERROR; if (OMPI_SUCCESS != ompi_unpack(buffer, &sub_number, 1, MCA_GPR_OOB_PACK_NOTIFY_ID)) { @@ -984,12 +984,12 @@ static ompi_registry_notify_id_t mca_gpr_replica_recv_synchro_cmd(ompi_process_n { ompi_registry_mode_t mode; char *segment=NULL, **tokens=NULL, **tokptr=NULL; - ompi_registry_notify_id_t local_idtag1, id_tag, return_tag; - mca_gpr_replica_segment_t *seg; - mca_gpr_replica_key_t *keys; - int num_keys; - int32_t num_tokens, response=(int32_t)OMPI_ERROR, synchro_mode, trigger; - int i; + ompi_registry_notify_id_t local_idtag1=0, id_tag=0, return_tag=0; + mca_gpr_replica_segment_t *seg=NULL; + mca_gpr_replica_key_t *keys=NULL; + int num_keys=0; + int32_t num_tokens=0, response=(int32_t)OMPI_ERROR, synchro_mode=0, trigger=0; + int i=0; return_tag = OMPI_REGISTRY_NOTIFY_ID_MAX; @@ -1099,7 +1099,7 @@ static ompi_registry_notify_id_t mca_gpr_replica_recv_synchro_cmd(ompi_process_n static int32_t mca_gpr_replica_recv_cancel_synchro_cmd(ompi_buffer_t buffer) { - ompi_registry_notify_id_t synch_number; + ompi_registry_notify_id_t synch_number=0; int32_t response=(int32_t)OMPI_ERROR; if (OMPI_SUCCESS != ompi_unpack(buffer, &synch_number, 1, MCA_GPR_OOB_PACK_NOTIFY_ID)) { @@ -1128,13 +1128,13 @@ static void mca_gpr_replica_recv_dump_cmd(ompi_buffer_t answer) static void mca_gpr_replica_recv_get_startup_msg_cmd(ompi_buffer_t buffer, ompi_buffer_t answer) { - char *jobidstring; - mca_ns_base_jobid_t jobid; - ompi_list_t *recipients; + char *jobidstring=NULL; + mca_ns_base_jobid_t jobid=0; + ompi_list_t *recipients=NULL; ompi_buffer_t msg; - ompi_name_server_namelist_t *recip; - void *addr; - int32_t size, num_recipients, i; + ompi_name_server_namelist_t *recip=NULL; + void *addr=NULL; + int32_t size=0, num_recipients=0, i=0; if (OMPI_SUCCESS != ompi_unpack_string(buffer, &jobidstring)) { return; @@ -1169,13 +1169,13 @@ static void mca_gpr_replica_recv_get_startup_msg_cmd(ompi_buffer_t buffer, ompi_ static void mca_gpr_replica_recv_get_shutdown_msg_cmd(ompi_buffer_t buffer, ompi_buffer_t answer) { - char *jobidstring; - mca_ns_base_jobid_t jobid; - ompi_list_t *recipients; + char *jobidstring=NULL; + mca_ns_base_jobid_t jobid=0; + ompi_list_t *recipients=NULL; ompi_buffer_t msg; - ompi_name_server_namelist_t *recip; - void *addr; - int32_t size, num_recipients, i; + ompi_name_server_namelist_t *recip=NULL; + void *addr=NULL; + int32_t size=0, num_recipients=0, i=0; if (OMPI_SUCCESS != ompi_unpack_string(buffer, &jobidstring)) { return; @@ -1208,7 +1208,7 @@ static void mca_gpr_replica_recv_get_shutdown_msg_cmd(ompi_buffer_t buffer, ompi static void mca_gpr_replica_recv_triggers_active_cmd(ompi_buffer_t cmd) { - mca_ns_base_jobid_t jobid; + mca_ns_base_jobid_t jobid=0; if (OMPI_SUCCESS != ompi_unpack(cmd, &jobid, 1, MCA_GPR_OOB_PACK_JOBID)) { return; @@ -1221,7 +1221,7 @@ static void mca_gpr_replica_recv_triggers_active_cmd(ompi_buffer_t cmd) static void mca_gpr_replica_recv_triggers_inactive_cmd(ompi_buffer_t cmd) { - mca_ns_base_jobid_t jobid; + mca_ns_base_jobid_t jobid=0; if (OMPI_SUCCESS != ompi_unpack(cmd, &jobid, 1, MCA_GPR_OOB_PACK_JOBID)) { return; @@ -1234,7 +1234,7 @@ static void mca_gpr_replica_recv_triggers_inactive_cmd(ompi_buffer_t cmd) static void mca_gpr_replica_recv_cleanup_job_cmd(ompi_buffer_t cmd) { - mca_ns_base_jobid_t jobid; + mca_ns_base_jobid_t jobid=0; if (OMPI_SUCCESS != ompi_unpack(cmd, &jobid, 1, MCA_GPR_OOB_PACK_JOBID)) { return; @@ -1249,8 +1249,8 @@ static void mca_gpr_replica_recv_cleanup_job_cmd(ompi_buffer_t cmd) static void mca_gpr_replica_recv_cleanup_proc_cmd(ompi_buffer_t cmd) { ompi_process_name_t proc; - bool purge; - int8_t tmp; + bool purge=false; + int8_t tmp=0; if (OMPI_SUCCESS != ompi_unpack(cmd, &tmp, 1, MCA_GPR_OOB_PACK_BOOL)) { return; @@ -1269,10 +1269,10 @@ static void mca_gpr_replica_recv_cleanup_proc_cmd(ompi_buffer_t cmd) static void mca_gpr_replica_recv_notify_on_cmd(ompi_buffer_t cmd) { - ompi_process_name_t *proc; + ompi_process_name_t proc; ompi_registry_notify_id_t sub_number; - if (OMPI_SUCCESS != ompi_unpack(cmd, proc, 1, MCA_GPR_OOB_PACK_NAME)) { + if (OMPI_SUCCESS != ompi_unpack(cmd, &proc, 1, MCA_GPR_OOB_PACK_NAME)) { return; } @@ -1281,16 +1281,16 @@ static void mca_gpr_replica_recv_notify_on_cmd(ompi_buffer_t cmd) } OMPI_THREAD_LOCK(&mca_gpr_replica_mutex); - mca_gpr_replica_notify_on_nl(proc, sub_number); + mca_gpr_replica_notify_on_nl(&proc, sub_number); OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex); } static void mca_gpr_replica_recv_notify_off_cmd(ompi_buffer_t cmd) { - ompi_process_name_t *proc; + ompi_process_name_t proc; ompi_registry_notify_id_t sub_number; - if (OMPI_SUCCESS != ompi_unpack(cmd, proc, 1, MCA_GPR_OOB_PACK_NAME)) { + if (OMPI_SUCCESS != ompi_unpack(cmd, &proc, 1, MCA_GPR_OOB_PACK_NAME)) { return; } @@ -1299,17 +1299,17 @@ static void mca_gpr_replica_recv_notify_off_cmd(ompi_buffer_t cmd) } OMPI_THREAD_LOCK(&mca_gpr_replica_mutex); - mca_gpr_replica_notify_off_nl(proc, sub_number); + mca_gpr_replica_notify_off_nl(&proc, sub_number); OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex); } static int32_t mca_gpr_replica_recv_assume_ownership_cmd(ompi_buffer_t cmd) { - mca_ns_base_jobid_t jobid; - mca_gpr_replica_segment_t *seg; - char *segment; - int32_t rc; + mca_ns_base_jobid_t jobid=0; + mca_gpr_replica_segment_t *seg=NULL; + char *segment=NULL; + int32_t rc=0; if (OMPI_SUCCESS != ompi_unpack(cmd, &jobid, 1, MCA_GPR_OOB_PACK_JOBID)) { return OMPI_ERROR; @@ -1339,7 +1339,7 @@ static int32_t mca_gpr_replica_recv_assume_ownership_cmd(ompi_buffer_t cmd) static bool mca_gpr_replica_recv_silent_mode(ompi_buffer_t buffer) { - int8_t tmp; + int8_t tmp=0; if (OMPI_SUCCESS != ompi_unpack(buffer, &tmp, 1, MCA_GPR_OOB_PACK_BOOL)) { return false; diff --git a/src/mca/gpr/replica/gpr_replica_test_internals.c b/src/mca/gpr/replica/gpr_replica_test_internals.c index f4c8adfdd3..22551b1462 100644 --- a/src/mca/gpr/replica/gpr_replica_test_internals.c +++ b/src/mca/gpr/replica/gpr_replica_test_internals.c @@ -19,16 +19,16 @@ ompi_list_t *mca_gpr_replica_test_internals(int level) { - ompi_list_t *test_results; - ompi_registry_internal_test_results_t *result; + ompi_list_t *test_results=NULL; + ompi_registry_internal_test_results_t *result=NULL; char name[30], name2[30]; char *name3[30]; int i, j, num_keys; - mca_gpr_replica_key_t segkey, key, *keys; - mca_gpr_replica_segment_t *seg; - mca_gpr_replica_keytable_t *dict_entry; - bool success; - mca_ns_base_jobid_t test_jobid; + mca_gpr_replica_key_t segkey, key, *keys=NULL; + mca_gpr_replica_segment_t *seg=NULL; + mca_gpr_replica_keytable_t *dict_entry=NULL; + bool success=false; + mca_ns_base_jobid_t test_jobid=0; test_results = OBJ_NEW(ompi_list_t); diff --git a/src/mca/oob/tcp/oob_tcp_msg.c b/src/mca/oob/tcp/oob_tcp_msg.c index 96b38e377e..966775c590 100644 --- a/src/mca/oob/tcp/oob_tcp_msg.c +++ b/src/mca/oob/tcp/oob_tcp_msg.c @@ -89,8 +89,8 @@ int mca_oob_tcp_msg_timedwait(mca_oob_tcp_msg_t* msg, int* rc, struct timespec* #if OMPI_HAVE_THREADS OMPI_THREAD_LOCK(&msg->msg_lock); while(msg->msg_complete == false && - (tv.tv_sec <= secs || - (tv.tv_sec == secs && tv.tv_usec < usecs))) { + ((uint32_t)tv.tv_sec <= secs || + ((uint32_t)tv.tv_sec == secs && (uint32_t)tv.tv_usec < usecs))) { if(ompi_event_progress_thread()) { int rc; OMPI_THREAD_UNLOCK(&msg->msg_lock); diff --git a/src/mca/oob/tcp/oob_tcp_peer.c b/src/mca/oob/tcp/oob_tcp_peer.c index c7592b14fe..b599add193 100644 --- a/src/mca/oob/tcp/oob_tcp_peer.c +++ b/src/mca/oob/tcp/oob_tcp_peer.c @@ -589,14 +589,14 @@ int mca_oob_tcp_peer_send_ident(mca_oob_tcp_peer_t* peer) } -static void mca_oob_tcp_peer_recv_ident(mca_oob_tcp_peer_t* peer, mca_oob_tcp_hdr_t* hdr) -{ - OMPI_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock); - ompi_rb_tree_delete(&mca_oob_tcp_component.tcp_peer_tree, &peer->peer_name); - peer->peer_name = hdr->msg_src; - ompi_rb_tree_insert(&mca_oob_tcp_component.tcp_peer_tree, &peer->peer_name, peer); - OMPI_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock); -} +/* static void mca_oob_tcp_peer_recv_ident(mca_oob_tcp_peer_t* peer, mca_oob_tcp_hdr_t* hdr) */ +/* { */ +/* OMPI_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock); */ +/* ompi_rb_tree_delete(&mca_oob_tcp_component.tcp_peer_tree, &peer->peer_name); */ +/* peer->peer_name = hdr->msg_src; */ +/* ompi_rb_tree_insert(&mca_oob_tcp_component.tcp_peer_tree, &peer->peer_name, peer); */ +/* OMPI_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock); */ +/* } */ /* diff --git a/src/runtime/ompi_rte_parse_cmd_line.c b/src/runtime/ompi_rte_parse_cmd_line.c index b395dfac28..682b39834b 100644 --- a/src/runtime/ompi_rte_parse_cmd_line.c +++ b/src/runtime/ompi_rte_parse_cmd_line.c @@ -26,7 +26,7 @@ void ompi_rte_parse_cmd_line(ompi_cmd_line_t *cmd_line) { - char *universe, *nsreplica, *gprreplica, *tmp; + char *universe=NULL, *nsreplica=NULL, *gprreplica=NULL, *tmp=NULL; /* get universe name and store it, if user specified it */ diff --git a/src/tools/console/ompiconsole.c b/src/tools/console/ompiconsole.c index 01aa4c237f..5e2c02ab33 100644 --- a/src/tools/console/ompiconsole.c +++ b/src/tools/console/ompiconsole.c @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) char *hostname, *contact_info; ompi_process_name_t proc_name; int32_t proc_slots; - int ret; + int ret=0; ompi_cmd_line_t *cmd_line; bool allow_multi_user_threads = false; bool have_hidden_threads = false; diff --git a/src/tools/openmpi/openmpi.c b/src/tools/openmpi/openmpi.c index d5c9f1f1bd..fbb3b1801c 100644 --- a/src/tools/openmpi/openmpi.c +++ b/src/tools/openmpi/openmpi.c @@ -54,7 +54,7 @@ int main(int argc, char **argv) pid_t pid; bool multi_thread = false; bool hidden_thread = false; - int ret; + int ret=0; /* * Intialize the Open MPI environment