From 957ae198e708dc901e3a8c89b7364c2bc75ce371 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 6 Jan 2010 14:35:11 -0800 Subject: lib: Treat NULL as a valid (and empty) notmuch_filenames_t iterator. This will be convenient to avoid some special-casing in higher-level code. --- lib/directory.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib/directory.cc') diff --git a/lib/directory.cc b/lib/directory.cc index 196f7805..d5015e0a 100644 --- a/lib/directory.cc +++ b/lib/directory.cc @@ -81,12 +81,18 @@ _notmuch_filenames_create (void *ctx, notmuch_bool_t notmuch_filenames_has_more (notmuch_filenames_t *filenames) { + if (filenames == NULL) + return NULL; + return (filenames->iterator != filenames->end); } const char * notmuch_filenames_get (notmuch_filenames_t *filenames) { + if (filenames == NULL || filenames->iterator == filenames->end) + return NULL; + if (filenames->filename == NULL) { std::string term = *filenames->iterator; @@ -101,6 +107,9 @@ notmuch_filenames_get (notmuch_filenames_t *filenames) void notmuch_filenames_advance (notmuch_filenames_t *filenames) { + if (filenames == NULL) + return; + if (filenames->filename) { talloc_free (filenames->filename); filenames->filename = NULL; @@ -113,6 +122,9 @@ notmuch_filenames_advance (notmuch_filenames_t *filenames) void notmuch_filenames_destroy (notmuch_filenames_t *filenames) { + if (filenames == NULL) + return; + talloc_free (filenames); } -- cgit v1.2.3