aboutsummaryrefslogtreecommitdiff
path: root/notmuch-show.c
diff options
context:
space:
mode:
authorJani Nikula <jani@nikula.org>2012-02-06 21:57:23 +0200
committerDavid Bremner <bremner@debian.org>2012-02-12 11:58:20 -0500
commit2c8959dad8863d185b237ed3e1f947fc46b32c98 (patch)
tree1fb4e980a19c34d93f9ff7a11573b90a6bec2f11 /notmuch-show.c
parent2d09775baf1591e51ef7a8911655f2a5e9651c47 (diff)
cli: reach previously unreachable cleanup code in "notmuch show"
The last lines of notmuch_show_command() function were unreachable. Fix it by using a variable for return value. Signed-off-by: Jani Nikula <jani@nikula.org>
Diffstat (limited to 'notmuch-show.c')
-rw-r--r--notmuch-show.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/notmuch-show.c b/notmuch-show.c
index 8f72e58..d930f94 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -1029,7 +1029,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
notmuch_database_t *notmuch;
notmuch_query_t *query;
char *query_string;
- int opt_index;
+ int opt_index, ret;
const notmuch_show_format_t *format = &format_text;
notmuch_show_params_t params = { .part = -1 };
int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;
@@ -1134,9 +1134,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
}
if (params.part >= 0)
- return do_show_single (ctx, query, format, &params);
+ ret = do_show_single (ctx, query, format, &params);
else
- return do_show (ctx, query, format, &params);
+ ret = do_show (ctx, query, format, &params);
notmuch_query_destroy (query);
notmuch_database_close (notmuch);
@@ -1144,5 +1144,5 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
if (params.cryptoctx)
g_object_unref(params.cryptoctx);
- return 0;
+ return ret;
}