[SSSD] [PATCH] tools: Don't shadow 'exit'

Lukas Slebodnik lslebodn at redhat.com
Mon Nov 9 17:35:05 UTC 2015


On (09/11/15 15:32), Jakub Hrozek wrote:
>On Mon, Nov 09, 2015 at 12:05:34PM +0100, Lukas Slebodnik wrote:
>> On (09/11/15 10:30), Jakub Hrozek wrote:
>> >Hi,
>> >
>> >please see the attached trivial patch.
>> 
>> >From a27bf8f594bbbba372a4c324b00b7931306b774c Mon Sep 17 00:00:00 2001
>> >From: Jakub Hrozek <jhrozek at redhat.com>
>> >Date: Mon, 9 Nov 2015 10:27:41 +0100
>> >Subject: [PATCH] tools: Don't shadow 'exit'
>> >MIME-Version: 1.0
>> >Content-Type: text/plain; charset=UTF-8
>> >Content-Transfer-Encoding: 8bit
>> >
>> >Fixes:
>> >    /sssd/src/tools/sss_override.c: In function ‘override_user_import’:
>> >    /sssd/src/tools/sss_override.c:1471: warning: declaration of ‘exit’ shadows a global declaration
>> >    /usr/include/stdlib.h:544: warning: shadowed declaration is here
>> >    /sssd/src/tools/sss_override.c: In function ‘override_group_import’:
>> >    /sssd/src/tools/sss_override.c:1737: warning: declaration of ‘exit’ shadows a global declaration
>> >    /usr/include/stdlib.h:544: warning: shadowed declaration is here
>> I found few others similar warnings.
>> Do we want to fix them or ignore?
>> 
>> I can see then only on centos 6 which has old gcc.
>> 
>> See few patches. I might squash them
>> 
>> LS
>> 
>
>> From 88847d4ec8a06370233301d99f7be7e317acf902 Mon Sep 17 00:00:00 2001
>> From: Lukas Slebodnik <lslebodn at redhat.com>
>> Date: Mon, 9 Nov 2015 10:40:11 +0100
>> Subject: [PATCH 1/6] cache_req: Fix warning -Wshadow
>
>ACK
>
>> From 2d96b8dd6a6518b7a23bb733108b61665f5a9e39 Mon Sep 17 00:00:00 2001
>> From: Lukas Slebodnik <lslebodn at redhat.com>
>> Date: Mon, 9 Nov 2015 10:48:55 +0100
>> Subject: [PATCH 2/6] SBUS: Fix warnings -Wshadow
>
>ACK
>
>> From 9cb16f3a5859f6a5f35a908d9b5e6e93b5a75221 Mon Sep 17 00:00:00 2001
>> From: Lukas Slebodnik <lslebodn at redhat.com>
>> Date: Mon, 9 Nov 2015 10:57:28 +0100
>> Subject: [PATCH 3/6] SBUS: Fix warnings -Wshadow
>
>Please either squash this patch into the previous one or at least make
>them differ in the commit message.
>
>> 
>> 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;
>>  }
>
>Also please add:
>diff --git a/src/sbus/sssd_dbus_common_signals.c b/src/sbus/sssd_dbus_common_signals.c
>index 2950c35..959acab 100644
>--- a/src/sbus/sssd_dbus_common_signals.c
>+++ b/src/sbus/sssd_dbus_common_signals.c
>@@ -27,10 +27,10 @@
> #include "sbus/sssd_dbus_private.h"
> 
> static void
>-sbus_signal_name_owner_changed(struct sbus_incoming_signal *signal,
>+sbus_signal_name_owner_changed(struct sbus_incoming_signal *sig,
>                                void *handler_data)
> {
>-    hash_table_t *table = signal->conn->clients;
>+    hash_table_t *table = sig->conn->clients;
BTW which version do you prefer?
a) signl
b) sig
c) a_signal

LS


More information about the sssd-devel mailing list