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 <jhro...@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 <lsleb...@redhat.com>
Date: Mon, 9 Nov 2015 10:40:11 +0100
Subject: [PATCH 1/6] cache_req: Fix warning -Wshadow
src/responder/common/responder_cache_req.c: In function
'cache_req_input_set_name':
src/responder/common/responder_cache_req.c:199: warning: declaration of 'dup'
shadows a global declaration
/usr/include/unistd.h:528: warning: shadowed declaration is here
---
src/responder/common/responder_cache_req.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/responder/common/responder_cache_req.c
b/src/responder/common/responder_cache_req.c
index
fc63f84f1725b98398d383983c385c01508c73b6..68206e42af6fdab29567588db307dca3f9f2f877
100644
--- a/src/responder/common/responder_cache_req.c
+++ b/src/responder/common/responder_cache_req.c
@@ -196,15 +196,15 @@ static errno_t
cache_req_input_set_name(struct cache_req_input *input,
const char *name)
{
- const char *dup;
+ const char *dup_name;
- dup = talloc_strdup(input, name);
- if (dup == NULL) {
+ dup_name = talloc_strdup(input, name);
+ if (dup_name == NULL) {
return ENOMEM;
}
talloc_zfree(input->name);
- input->name = dup;
+ input->name = dup_name;
return EOK;
}
--
2.5.0
>From 2d96b8dd6a6518b7a23bb733108b61665f5a9e39 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Mon, 9 Nov 2015 10:48:55 +0100
Subject: [PATCH 2/6] SBUS: Fix warnings -Wshadow
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_introspect.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/sbus/sssd_dbus_introspect.c b/src/sbus/sssd_dbus_introspect.c
index
a66432dd97fecea81e9f5f543bba6ca6a9a13107..fe833f2b07c2f352a5c3022cd029b80c642ea9d9
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;
--
2.5.0
>From 9cb16f3a5859f6a5f35a908d9b5e6e93b5a75221 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
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
>From 97c5be2906005870409a6376a2aa5cfb47284407 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Mon, 9 Nov 2015 10:59:55 +0100
Subject: [PATCH 4/6] test_sss_sifp: Fix warnings -Wshadow
src/tests/cmocka/test_sss_sifp.c: In function 'test_sss_sifp_strdup_valid':
src/tests/cmocka/test_sss_sifp.c:153: warning: declaration of 'dup' shadows a
global declaration
/usr/include/unistd.h:528: warning: shadowed declaration is here
src/tests/cmocka/test_sss_sifp.c: In function 'test_sss_sifp_strdup_null':
src/tests/cmocka/test_sss_sifp.c:163: warning: declaration of 'dup' shadows a
global declaration
/usr/include/unistd.h:528: warning: shadowed declaration is here
---
src/tests/cmocka/test_sss_sifp.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/tests/cmocka/test_sss_sifp.c b/src/tests/cmocka/test_sss_sifp.c
index
9773d0f9554a7742f6855fb5245fae18123d6dc0..acf6a6ec87f4dddb0c92186e66da959e1ddd8463
100644
--- a/src/tests/cmocka/test_sss_sifp.c
+++ b/src/tests/cmocka/test_sss_sifp.c
@@ -150,18 +150,18 @@ static int test_teardown_api(void **state)
void test_sss_sifp_strdup_valid(void **state)
{
const char *str = "test_string";
- char *dup = sss_sifp_strdup(test_ctx.dbus_ctx, str);
- assert_non_null(dup);
- assert_string_equal(str, dup);
+ char *dup_str = sss_sifp_strdup(test_ctx.dbus_ctx, str);
+ assert_non_null(dup_str);
+ assert_string_equal(str, dup_str);
- sss_sifp_free_string(test_ctx.dbus_ctx, &dup);
- assert_null(dup);
+ sss_sifp_free_string(test_ctx.dbus_ctx, &dup_str);
+ assert_null(dup_str);
}
void test_sss_sifp_strdup_null(void **state)
{
- char *dup = sss_sifp_strdup(test_ctx.dbus_ctx, NULL);
- assert_null(dup);
+ char *dup_str = sss_sifp_strdup(test_ctx.dbus_ctx, NULL);
+ assert_null(dup_str);
}
void test_sss_sifp_strcat_valid(void **state)
--
2.5.0
>From 0cb083a55af89eb318b17ca460ce6ebb06d96d58 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Mon, 9 Nov 2015 11:01:22 +0100
Subject: [PATCH 5/6] test_sdap: Fix warnings -Wshadow
src/tests/cmocka/test_sdap.c: In function '__wrap_ldap_next_attribute':
src/tests/cmocka/test_sdap.c:203: warning: declaration of 'index' shadows a
global declaration
/usr/include/string.h:489: warning: shadowed declaration is here
---
src/tests/cmocka/test_sdap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tests/cmocka/test_sdap.c b/src/tests/cmocka/test_sdap.c
index
86c940c89b1a1010e0d33e1b89441c09d8b2e9dd..d9f807076b56b24b5abbff8cefa3da3d9ed8369b
100644
--- a/src/tests/cmocka/test_sdap.c
+++ b/src/tests/cmocka/test_sdap.c
@@ -200,12 +200,12 @@ char *__wrap_ldap_next_attribute(LDAP *ld,
{
struct mock_ldap_entry *ldap_entry = mock_ldap_entry_get();
- int index = mock_ldap_entry_iter();
+ int idx = mock_ldap_entry_iter();
char *val;
- val = discard_const(ldap_entry->attrs[index].name);
+ val = discard_const(ldap_entry->attrs[idx].name);
if (val != NULL) {
- will_return(mock_ldap_entry_iter, index+1);
+ will_return(mock_ldap_entry_iter, idx + 1);
}
return val;
}
--
2.5.0
>From 1f8ecc21dc2029b06b310288da9a03719f484182 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Mon, 9 Nov 2015 11:46:18 +0100
Subject: [PATCH 6/6] test_responder_cache_req: Fix warnings -Wshadow
src/tests/cmocka/test_responder_cache_req.c: In function 'prepare_user':
src/tests/cmocka/test_responder_cache_req.c:163: warning: declaration of 'time'
shadows a global declaration
/usr/include/time.h:186: warning: shadowed declaration is here
src/tests/cmocka/test_responder_cache_req.c: In function 'prepare_group':
src/tests/cmocka/test_responder_cache_req.c:244: warning: declaration of 'time'
shadows a global declaration
/usr/include/time.h:186: warning: shadowed declaration is here
---
src/tests/cmocka/test_responder_cache_req.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/tests/cmocka/test_responder_cache_req.c
b/src/tests/cmocka/test_responder_cache_req.c
index
744c8f4a8f7aa4e08f82aca5aea003438b5b59da..85d986bd7d159dc238bce4bc770272d18288f2dd
100644
--- a/src/tests/cmocka/test_responder_cache_req.c
+++ b/src/tests/cmocka/test_responder_cache_req.c
@@ -160,7 +160,7 @@ static void cache_req_group_by_id_test_done(struct
tevent_req *req)
static void prepare_user(TALLOC_CTX *mem_ctx,
struct sss_domain_info *domain,
uint64_t timeout,
- time_t time)
+ time_t transaction_time)
{
struct sysdb_attrs *attrs;
errno_t ret;
@@ -174,7 +174,7 @@ static void prepare_user(TALLOC_CTX *mem_ctx,
ret = sysdb_store_user(domain, TEST_USER_NAME, "pwd",
TEST_USER_ID, TEST_GROUP_ID, NULL, NULL, NULL,
"cn=test-user,dc=test", attrs, NULL,
- timeout, time);
+ timeout, transaction_time);
assert_int_equal(ret, EOK);
}
@@ -241,12 +241,12 @@ static void check_user(struct cache_req_test_ctx
*test_ctx,
static void prepare_group(TALLOC_CTX *mem_ctx,
struct sss_domain_info *domain,
uint64_t timeout,
- time_t time)
+ time_t transaction_time)
{
errno_t ret;
ret = sysdb_store_group(domain, TEST_GROUP_NAME, TEST_GROUP_ID, NULL,
- timeout, time);
+ timeout, transaction_time);
assert_int_equal(ret, EOK);
}
--
2.5.0
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
