On (28/07/15 10:16), Pavel Reichl wrote:
Hello, please see trivial patch attached which fixes compiler
warnings:
>../src/tests/cmocka/test_sysdb_views.c: In function
>‘test_sysdb_add_overrides_to_object_local’:
>../src/tests/cmocka/test_sysdb_views.c:307:33: error: assignment discards
>‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
> test_ctx->domain->view_name = "LOCAL";
> ^
>../src/tests/cmocka/test_sysdb_views.c:288:33: error: unused variable ‘el’
>[-Werror=unused-variable]
> struct ldb_message_element *el;
> ^
>../src/tests/cmocka/test_sysdb_views.c: In function
>‘test_sysdb_add_overrides_to_object_missing_overridedn’:
>../src/tests/cmocka/test_sysdb_views.c:340:33: error: assignment discards
>‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
> test_ctx->domain->view_name = "NON-LOCAL";
> ^
>../src/tests/cmocka/test_sysdb_views.c:317:33: error: unused variable ‘el’
>[-Werror=unused-variable]
> struct ldb_message_element *el;
Thanks!
From 017c7fced87e5416f617002f303a37d2f0d0ee41 Mon Sep 17 00:00:00
2001
From: Pavel Reichl <preichl(a)redhat.com>
Date: Tue, 28 Jul 2015 04:12:48 -0400
Subject: [PATCH] TESTS: fix compiler warnings
---
src/tests/cmocka/test_sysdb_views.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/tests/cmocka/test_sysdb_views.c b/src/tests/cmocka/test_sysdb_views.c
index 83007b76a625edef67109850648b2d71645e22bb..0bacf1f3c5f261d73c006b56503e60afb142b745
100644
--- a/src/tests/cmocka/test_sysdb_views.c
+++ b/src/tests/cmocka/test_sysdb_views.c
@@ -285,7 +285,6 @@ void test_sysdb_add_overrides_to_object_local(void **state)
{
int ret;
struct ldb_message *orig;
- struct ldb_message_element *el;
char *tmp_str;
struct sysdb_test_ctx *test_ctx = talloc_get_type_abort(*state,
struct sysdb_test_ctx);
@@ -304,7 +303,7 @@ void test_sysdb_add_overrides_to_object_local(void **state)
assert_int_equal(ret, EOK);
test_ctx->domain->has_views = true;
- test_ctx->domain->view_name = "LOCAL";
+ test_ctx->domain->view_name = discard_const("LOCAL");
ret = sysdb_add_overrides_to_object(test_ctx->domain, orig, NULL, NULL);
assert_int_equal(ret, EOK);
@@ -314,7 +313,6 @@ void test_sysdb_add_overrides_to_object_missing_overridedn(void
**state)
{
int ret;
struct ldb_message *orig;
- struct ldb_message_element *el;
char *tmp_str;
struct sysdb_test_ctx *test_ctx = talloc_get_type_abort(*state,
struct sysdb_test_ctx);
@@ -337,7 +335,7 @@ void test_sysdb_add_overrides_to_object_missing_overridedn(void
**state)
assert_int_equal(ret, EOK);
test_ctx->domain->has_views = true;
- test_ctx->domain->view_name = "NON-LOCAL";
+ test_ctx->domain->view_name = discard_const("NON-LOCAL");
ret = sysdb_add_overrides_to_object(test_ctx->domain, orig, NULL, NULL);
assert_int_equal(ret, ENOENT);
--
2.4.3
ACK for unused variables
NACK for discard_const
It's beeter to change type of view_name from "char *" -> "const
char *"
LS