From 365fe7479c753f198430812337a7ba8cdb0baf7d Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Mon, 9 Nov 2015 10:48:55 +0100 Subject: SBUS: Fix warnings -Wshadow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/sbus/sssd_dbus_invokers.c -fPIC -DPIC -o src/sbus/.libs/libsss_util_la-sssd_dbus_invokers.o src/sbus/sssd_dbus_introspect.c: In function 'sbus_introspect_generate_signals': src/sbus/sssd_dbus_introspect.c:206: warning: declaration of 'signal' shadows a global declaration /usr/include/signal.h:101: warning: shadowed declaration is here src/sbus/sssd_dbus_introspect.c: In function 'sbus_introspect_generate_properties': src/sbus/sssd_dbus_introspect.c:243: warning: declaration of 'access' shadows a global declaration /usr/include/unistd.h:288: warning: shadowed declaration is here 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_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 Reviewed-by: Jakub Hrozek --- src/sbus/sssd_dbus_introspect.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/sbus/sssd_dbus_introspect.c') diff --git a/src/sbus/sssd_dbus_introspect.c b/src/sbus/sssd_dbus_introspect.c index a66432dd9..fe833f2b0 100644 --- a/src/sbus/sssd_dbus_introspect.c +++ b/src/sbus/sssd_dbus_introspect.c @@ -203,7 +203,7 @@ static int sbus_introspect_generate_signals(FILE *file, const struct sbus_signal_meta *signals) { - const struct sbus_signal_meta *signal; + const struct sbus_signal_meta *a_signal; int ret; int i; @@ -212,16 +212,16 @@ sbus_introspect_generate_signals(FILE *file, } for (i = 0; signals[i].name != NULL; i++) { - signal = &signals[i]; + a_signal = &signals[i]; - if (!SIGNAL_HAS_ARGS(signal)) { - WRITE_OR_FAIL(file, ret, done, FMT_SIGNAL_NOARG, signal->name); + if (!SIGNAL_HAS_ARGS(a_signal)) { + WRITE_OR_FAIL(file, ret, done, FMT_SIGNAL_NOARG, a_signal->name); continue; } - WRITE_OR_FAIL(file, ret, done, FMT_SIGNAL, signal->name); + WRITE_OR_FAIL(file, ret, done, FMT_SIGNAL, a_signal->name); - ret = sbus_introspect_generate_signal_args(file, signal->args); + ret = sbus_introspect_generate_signal_args(file, a_signal->args); if (ret != EOK) { goto done; } @@ -240,7 +240,7 @@ sbus_introspect_generate_properties(FILE *file, const struct sbus_property_meta *props) { const struct sbus_property_meta *prop; - const char *access; + const char *access_mode; int ret; int i; @@ -251,9 +251,10 @@ sbus_introspect_generate_properties(FILE *file, for (i = 0; props[i].name != NULL; i++) { prop = &props[i]; - access = prop->flags & SBUS_PROPERTY_WRITABLE ? "readwrite" : "read"; + access_mode = prop->flags & SBUS_PROPERTY_WRITABLE + ? "readwrite" : "read"; WRITE_OR_FAIL(file, ret, done, FMT_PROPERTY, - prop->name, prop->type, access); + prop->name, prop->type, access_mode); } ret = EOK; -- cgit