diff options
author | Jani Nikula <jani@nikula.org> | 2012-10-01 09:36:11 +0200 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-12-01 08:10:32 -0400 |
commit | 5505d55515594025fe319c5150fdb360b0ffcd60 (patch) | |
tree | 2e602879ed1d5d98d5fecb1bf370b807520952e9 /lib | |
parent | 869986f725b3dfa0260671e4a1256b8c8c072864 (diff) |
lib: fix warnings when building with clang
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.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/message.cc | 4 | ||||
-rw-r--r-- | lib/tags.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/message.cc b/lib/message.cc index 978de066..320901f7 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; } @@ -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; } |