alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-cmd-find.c: fix compiler warning

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-06-15 08:15:13 +03:00
parent 57ebeda135
commit de24a59d8c
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mu-cmd-find.c
View File

@ -97,12 +97,13 @@ upgrade_warning (void)
static gboolean static gboolean
print_xapian_query (MuQuery *xapian, const gchar *query) print_xapian_query (MuQuery *xapian, const gchar *query, size_t *count)
{ {
char *querystr; char *querystr;
GError *err; GError *err;
err = NULL; err = NULL;
querystr = mu_query_as_string (xapian, query, &err); querystr = mu_query_as_string (xapian, query, &err);
if (!querystr) { if (!querystr) {
g_warning ("error: %s", err->message); g_warning ("error: %s", err->message);
@ -113,6 +114,7 @@ print_xapian_query (MuQuery *xapian, const gchar *query)
g_print ("%s\n", querystr); g_print ("%s\n", querystr);
g_free (querystr); g_free (querystr);
*count = 1;
return TRUE; return TRUE;
} }
@ -770,7 +772,7 @@ mu_cmd_find (MuConfig *opts)
MuQuery *xapian; MuQuery *xapian;
gboolean rv; gboolean rv;
gchar *query; gchar *query;
size_t count; size_t count = 0;
OutputFormat format; OutputFormat format;
g_return_val_if_fail (opts, FALSE); g_return_val_if_fail (opts, FALSE);
@ -780,18 +782,14 @@ mu_cmd_find (MuConfig *opts)
return MU_EXITCODE_ERROR; return MU_EXITCODE_ERROR;
format = get_output_format (opts->formatstr); format = get_output_format (opts->formatstr);
xapian = get_query_obj (); xapian = get_query_obj ();
if (!xapian) query = get_query (opts);
return MU_EXITCODE_ERROR;
/* first param is 'query', search params are after that */ if (!xapian ||!query)
query = get_query (opts);
if (!query)
return MU_EXITCODE_ERROR; return MU_EXITCODE_ERROR;
if (format == FORMAT_XQUERY) if (format == FORMAT_XQUERY)
rv = print_xapian_query (xapian, query); rv = print_xapian_query (xapian, query, &count);
else else
rv = run_query (xapian, query, opts, format, &count); rv = run_query (xapian, query, opts, format, &count);
@ -800,7 +798,6 @@ mu_cmd_find (MuConfig *opts)
if (!rv) if (!rv)
return MU_EXITCODE_ERROR; return MU_EXITCODE_ERROR;
else
return (count == 0) ? return count == 0 ? MU_EXITCODE_NO_MATCHES : MU_EXITCODE_OK;
MU_EXITCODE_NO_MATCHES : MU_EXITCODE_OK;
} }