>From 9cb16f3a5859f6a5f35a908d9b5e6e93b5a75221 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Mon, 9 Nov 2015 10:57:28 +0100 Subject: [PATCH 3/6] SBUS: Fix warnings -Wshadow src/sbus/sssd_dbus_signals.c:29: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here src/sbus/sssd_dbus_signals.c: In function 'sbus_new_incoming_signal': src/sbus/sssd_dbus_signals.c:39: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here src/sbus/sssd_dbus_signals.c: In function 'sbus_incoming_signal_hash_add': src/sbus/sssd_dbus_signals.c:73: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here src/sbus/sssd_dbus_signals.c: In function 'sbus_incoming_signal_hash_lookup': src/sbus/sssd_dbus_signals.c:134: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here src/sbus/sssd_dbus_signals.c: In function 'sbus_signal_listen': src/sbus/sssd_dbus_signals.c:168: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here src/sbus/sssd_dbus_signals.c: In function 'sbus_signal_handler': src/sbus/sssd_dbus_signals.c:227: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here src/sbus/sssd_dbus_signals.c: In function 'sbus_signal_handler_got_caller_id': src/sbus/sssd_dbus_signals.c:264: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here src/sbus/sssd_dbus_common_signals.c: In function 'sbus_signal_name_owner_changed': src/sbus/sssd_dbus_common_signals.c:30: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here --- src/sbus/sssd_dbus_signals.c | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/sbus/sssd_dbus_signals.c b/src/sbus/sssd_dbus_signals.c index 1dc08ae25761881f23a81e7871a8af626497a9a3..3f463e603a625cae8415fb17f5cd811ef0c10e15 100644 --- a/src/sbus/sssd_dbus_signals.c +++ b/src/sbus/sssd_dbus_signals.c @@ -26,9 +26,9 @@ #include "sbus/sssd_dbus.h" #include "sbus/sssd_dbus_private.h" -static int sbus_incoming_signal_destructor(struct sbus_incoming_signal *signal) +static int sbus_incoming_signal_destructor(struct sbus_incoming_signal *a_signal) { - dbus_message_unref(signal->message); + dbus_message_unref(a_signal->message); return 0; } @@ -36,23 +36,23 @@ static struct sbus_incoming_signal * sbus_new_incoming_signal(struct sbus_connection *conn, DBusMessage *message) { - struct sbus_incoming_signal *signal; + struct sbus_incoming_signal *a_signal; - signal = talloc_zero(conn, struct sbus_incoming_signal); - if (signal == NULL) { + a_signal = talloc_zero(conn, struct sbus_incoming_signal); + if (a_signal == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory allocating D-Bus signal\n"); return NULL; } - signal->conn = conn; - signal->message = dbus_message_ref(message); - signal->interface = dbus_message_get_interface(message); - signal->signal = dbus_message_get_member(message); - signal->path = dbus_message_get_path(message); + a_signal->conn = conn; + a_signal->message = dbus_message_ref(message); + a_signal->interface = dbus_message_get_interface(message); + a_signal->signal = dbus_message_get_member(message); + a_signal->path = dbus_message_get_path(message); - talloc_set_destructor(signal, sbus_incoming_signal_destructor); + talloc_set_destructor(a_signal, sbus_incoming_signal_destructor); - return signal; + return a_signal; } struct sbus_incoming_signal_data { @@ -70,7 +70,7 @@ sbus_incoming_signal_hash_init(TALLOC_CTX *mem_ctx, static errno_t sbus_incoming_signal_hash_add(hash_table_t *table, const char *iface, - const char *signal, + const char *a_signal, sbus_incoming_signal_fn handler_fn, void *handler_data) { @@ -88,7 +88,7 @@ sbus_incoming_signal_hash_add(hash_table_t *table, } key.type = HASH_KEY_STRING; - key.str = talloc_asprintf(tmp_ctx, "%s.%s", iface, signal); + key.str = talloc_asprintf(tmp_ctx, "%s.%s", iface, a_signal); if (key.str == NULL) { ret = ENOMEM; goto done; @@ -131,7 +131,7 @@ done: static struct sbus_incoming_signal_data * sbus_incoming_signal_hash_lookup(hash_table_t *table, const char *iface, - const char *signal) + const char *a_signal) { struct sbus_incoming_signal_data *data; hash_key_t key; @@ -139,7 +139,7 @@ sbus_incoming_signal_hash_lookup(hash_table_t *table, int hret; key.type = HASH_KEY_STRING; - key.str = talloc_asprintf(NULL, "%s.%s", iface, signal); + key.str = talloc_asprintf(NULL, "%s.%s", iface, a_signal); if (key.str == NULL) { return NULL; } @@ -165,7 +165,7 @@ done: errno_t sbus_signal_listen(struct sbus_connection *conn, const char *iface, - const char *signal, + const char *a_signal, sbus_incoming_signal_fn handler_fn, void *handler_data) { @@ -183,7 +183,7 @@ sbus_signal_listen(struct sbus_connection *conn, dbus_error_init(&error); ret = sbus_incoming_signal_hash_add(conn->incoming_signals, iface, - signal, handler_fn, handler_data); + a_signal, handler_fn, handler_data); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, "Unable to register signal handler " "[%d]: %s\n", ret, sss_strerror(ret)); @@ -191,7 +191,7 @@ sbus_signal_listen(struct sbus_connection *conn, } rule = talloc_asprintf(tmp_ctx, "type='signal',interface='%s',member='%s'", - iface, signal); + iface, a_signal); if (rule == NULL) { ret = ENOMEM; goto done; @@ -205,7 +205,7 @@ sbus_signal_listen(struct sbus_connection *conn, goto done; } - DEBUG(SSSDBG_TRACE_FUNC, "Listening to signal %s.%s\n", iface, signal); + DEBUG(SSSDBG_TRACE_FUNC, "Listening to signal %s.%s\n", iface, a_signal); done: dbus_error_free(&error); @@ -224,7 +224,7 @@ sbus_signal_handler(DBusConnection *dbus_conn, { struct tevent_req *req; struct sbus_connection *conn; - struct sbus_incoming_signal *signal; + struct sbus_incoming_signal *a_signal; const char *sender; int type; @@ -238,21 +238,21 @@ sbus_signal_handler(DBusConnection *dbus_conn, sender = dbus_message_get_sender(message); /* we have a valid handler, create D-Bus request */ - signal = sbus_new_incoming_signal(conn, message); - if (signal == NULL) { + a_signal = sbus_new_incoming_signal(conn, message); + if (a_signal == NULL) { return DBUS_HANDLER_RESULT_NEED_MEMORY; } DEBUG(SSSDBG_TRACE_INTERNAL, "Received D-Bus signal %s.%s\n", - signal->interface, signal->signal); + a_signal->interface, a_signal->signal); /* now get the sender ID */ - req = sbus_get_sender_id_send(signal, conn->ev, conn, sender); + req = sbus_get_sender_id_send(a_signal, conn->ev, conn, sender); if (req == NULL) { - talloc_free(signal); + talloc_free(a_signal); return DBUS_HANDLER_RESULT_NEED_MEMORY; } - tevent_req_set_callback(req, sbus_signal_handler_got_caller_id, signal); + tevent_req_set_callback(req, sbus_signal_handler_got_caller_id, a_signal); return DBUS_HANDLER_RESULT_HANDLED; } @@ -261,12 +261,12 @@ static void sbus_signal_handler_got_caller_id(struct tevent_req *req) { struct sbus_incoming_signal_data *signal_data; - struct sbus_incoming_signal *signal; + struct sbus_incoming_signal *a_signal; errno_t ret; - signal = tevent_req_callback_data(req, struct sbus_incoming_signal); + a_signal = tevent_req_callback_data(req, struct sbus_incoming_signal); - ret = sbus_get_sender_id_recv(req, &signal->client); + ret = sbus_get_sender_id_recv(req, &a_signal->client); if (ret == ERR_SBUS_SENDER_BUS) { DEBUG(SSSDBG_TRACE_FUNC, "Got a signal from the bus..\n"); } else if (ret != EOK) { @@ -276,17 +276,17 @@ sbus_signal_handler_got_caller_id(struct tevent_req *req) } signal_data = sbus_incoming_signal_hash_lookup( - signal->conn->incoming_signals, - signal->interface, - signal->signal); + a_signal->conn->incoming_signals, + a_signal->interface, + a_signal->signal); if (signal_data == NULL) { DEBUG(SSSDBG_MINOR_FAILURE, "Received signal %s.%s that we are " - "not listening to.\n", signal->interface, signal->signal); + "not listening to.\n", a_signal->interface, a_signal->signal); goto done; } - signal_data->handler_fn(signal, signal_data->handler_data); + signal_data->handler_fn(a_signal, signal_data->handler_data); done: - talloc_free(signal); + talloc_free(a_signal); } -- 2.5.0