[PATCH] lib: fix warnings when building with clang
Jani Nikula
jani at nikula.org
Mon Oct 1 00:36:11 PDT 2012
Building notmuch with CC=clang and CXX=clang++ produces the warnings:
CC -O2 lib/tags.o
lib/tags.c:43:5: warning: expression result unused [-Wunused-value]
talloc_steal (tags, list);
^~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/talloc.h:345:143: note: expanded from:
...__location__); __talloc_steal_ret; })
^~~~~~~~~~~~~~~~~~
1 warning generated.
CXX -O2 lib/message.o
lib/message.cc:791:5: warning: expression result unused [-Wunused-value]
talloc_reference (message, message->tag_list);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/talloc.h:932:36: note: expanded from:
...(_TALLOC_TYPEOF(ptr))_talloc_reference_loc((ctx),(ptr), __location__)
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
Check talloc_reference() return value, and explicitly ignore
talloc_steal() return value as it has no failure modes, to silence the
warnings.
---
lib/message.cc | 4 +++-
lib/tags.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/message.cc b/lib/message.cc
index 978de06..320901f 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -788,7 +788,9 @@ notmuch_message_get_tags (notmuch_message_t *message)
* possible to modify the message tags (which talloc_unlink's the
* current list from the message) while still iterating because
* the iterator will keep the current list alive. */
- talloc_reference (message, message->tag_list);
+ if (!talloc_reference (message, message->tag_list))
+ return NULL;
+
return tags;
}
diff --git a/lib/tags.c b/lib/tags.c
index c58924f..b7e5602 100644
--- a/lib/tags.c
+++ b/lib/tags.c
@@ -40,7 +40,7 @@ _notmuch_tags_create (const void *ctx, notmuch_string_list_t *list)
return NULL;
tags->iterator = list->head;
- talloc_steal (tags, list);
+ (void) talloc_steal (tags, list);
return tags;
}
--
1.7.2.5
More information about the notmuch
mailing list