From c1e8ea08e38464243f1d6b4079413ee431410c6d Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 9 Nov 2011 15:20:07 +1100 Subject: [PATCH] Clean up warnings: log some unchecked return codes from function calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In a few places functions are called, the return code is assigned into a variable but it is not checked. This generates a compiler warning like this: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] Instead we remove the warning by checking the return code variable and log a warning at DEBUG level if the return code indicates an error. The justification is that there may have been a future intent to check the return code but it hasn't been important enough to follow-up. If it matters, it will be logged for easy debugging. Signed-off-by: Martin Schwenke (This used to be ctdb commit 1932466c76de2b184c2a257120768ab8c9d6c12a) --- ctdb/client/ctdb_client.c | 6 ++++++ ctdb/server/ctdb_call.c | 3 +++ ctdb/tests/src/ctdb_bench.c | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index f0172e42326..870edaa5827 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -388,6 +388,9 @@ static struct ctdb_client_call_state *ctdb_client_call_local_send(struct ctdb_db state->ctdb_db = ctdb_db; ret = ctdb_call_local(ctdb_db, state->call, header, state, data, true); + if (ret != 0) { + DEBUG(DEBUG_DEBUG,("ctdb_call_local() failed, ignoring return code %d\n", ret)); + } return state; } @@ -916,6 +919,9 @@ static void invoke_control_callback(struct event_context *ev, struct timed_event NULL, NULL, NULL); + if (ret != 0) { + DEBUG(DEBUG_DEBUG,("ctdb_control_recv() failed, ignoring return code %d\n", ret)); + } talloc_free(tmp_ctx); } diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index ddeaae6f991..f7d1eca6bff 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -937,6 +937,9 @@ struct ctdb_call_state *ctdb_call_local_send(struct ctdb_db_context *ctdb_db, state->ctdb_db = ctdb_db; ret = ctdb_call_local(ctdb_db, state->call, header, state, data, true); + if (ret != 0) { + DEBUG(DEBUG_DEBUG,("ctdb_call_local() failed, ignoring return code %d\n", ret)); + } event_add_timed(ctdb->ev, state, timeval_zero(), call_local_trigger, state); diff --git a/ctdb/tests/src/ctdb_bench.c b/ctdb/tests/src/ctdb_bench.c index 8e0e0d79561..14d25a138fa 100644 --- a/ctdb/tests/src/ctdb_bench.c +++ b/ctdb/tests/src/ctdb_bench.c @@ -234,7 +234,13 @@ int main(int argc, const char *argv[]) /* setup a ctdb call function */ ret = ctdb_set_call(ctdb_db, incr_func, FUNC_INCR); + if (ret != 0) { + DEBUG(DEBUG_DEBUG,("ctdb_set_call() failed, ignoring return code %d\n", ret)); + } ret = ctdb_set_call(ctdb_db, fetch_func, FUNC_FETCH); + if (ret != 0) { + DEBUG(DEBUG_DEBUG,("ctdb_set_call() failed, ignoring return code %d\n", ret)); + } if (ctdb_client_set_message_handler(ctdb, 0, ring_message_handler,&msg_count)) goto error;