diff options
author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-11-09 10:59:55 +0100 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-11-10 15:34:41 +0100 |
commit | df9e9a1f9b7dc255eb62c390163c25917b08f5a2 (patch) | |
tree | de7bf77f6f4bb2d4c067484b80dc55217cfb4c43 | |
parent | 365fe7479c753f198430812337a7ba8cdb0baf7d (diff) | |
download | sssd-df9e9a1f9b7dc255eb62c390163c25917b08f5a2.tar.gz sssd-df9e9a1f9b7dc255eb62c390163c25917b08f5a2.tar.xz sssd-df9e9a1f9b7dc255eb62c390163c25917b08f5a2.zip |
TESTS: 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_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_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
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r-- | src/tests/cmocka/test_responder_cache_req.c | 8 | ||||
-rw-r--r-- | src/tests/cmocka/test_sdap.c | 6 | ||||
-rw-r--r-- | src/tests/cmocka/test_sss_sifp.c | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/tests/cmocka/test_responder_cache_req.c b/src/tests/cmocka/test_responder_cache_req.c index 744c8f4a8..85d986bd7 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); } diff --git a/src/tests/cmocka/test_sdap.c b/src/tests/cmocka/test_sdap.c index 86c940c89..d9f807076 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; } diff --git a/src/tests/cmocka/test_sss_sifp.c b/src/tests/cmocka/test_sss_sifp.c index 9773d0f95..acf6a6ec8 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) |