mirror of https://github.com/djcb/mu.git
* make sure line35, cc10 pass
This commit is contained in:
parent
3132b8dd42
commit
cf37e29101
12
mu/mu-cmd.c
12
mu/mu-cmd.c
|
@ -515,13 +515,6 @@ show_usage (void)
|
||||||
"more information\n");
|
"more information\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
show_version (void)
|
|
||||||
{
|
|
||||||
g_print ("mu (mail indexer/searcher) version " VERSION "\n"
|
|
||||||
"Copyright (C) 2008-2011 Dirk-Jan C. Binnema (GPLv3+)\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef MuError (*store_func) (MuStore *, MuConfig *, GError **err);
|
typedef MuError (*store_func) (MuStore *, MuConfig *, GError **err);
|
||||||
|
|
||||||
MuError
|
MuError
|
||||||
|
@ -569,11 +562,6 @@ mu_cmd_execute (MuConfig *opts, GError **err)
|
||||||
MuError merr;
|
MuError merr;
|
||||||
g_return_val_if_fail (opts, MU_ERROR_INTERNAL);
|
g_return_val_if_fail (opts, MU_ERROR_INTERNAL);
|
||||||
|
|
||||||
if (opts->version) {
|
|
||||||
show_version ();
|
|
||||||
return MU_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!check_params(opts, err))
|
if (!check_params(opts, err))
|
||||||
return MU_G_ERROR_CODE(err);
|
return MU_G_ERROR_CODE(err);
|
||||||
|
|
||||||
|
|
21
mu/mu.cc
21
mu/mu.cc
|
@ -32,6 +32,14 @@
|
||||||
#include "mu-runtime.h"
|
#include "mu-runtime.h"
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
show_version (void)
|
||||||
|
{
|
||||||
|
g_print ("mu (mail indexer/searcher) version " VERSION "\n"
|
||||||
|
"Copyright (C) 2008-2012 Dirk-Jan C. Binnema (GPLv3+)\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
handle_error (MuConfig *conf, GError *err)
|
handle_error (MuConfig *conf, GError *err)
|
||||||
{
|
{
|
||||||
|
@ -47,13 +55,11 @@ handle_error (MuConfig *conf, GError *err)
|
||||||
switch (err->code) {
|
switch (err->code) {
|
||||||
|
|
||||||
case MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK:
|
case MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK:
|
||||||
advise = "maybe mu is already running?";
|
advise = "maybe mu is already running?"; break;
|
||||||
break;
|
|
||||||
|
|
||||||
case MU_ERROR_XAPIAN_CORRUPTION:
|
case MU_ERROR_XAPIAN_CORRUPTION:
|
||||||
case MU_ERROR_XAPIAN_NOT_UP_TO_DATE:
|
case MU_ERROR_XAPIAN_NOT_UP_TO_DATE:
|
||||||
advise = "please try 'mu index --rebuild'";
|
advise = "please try 'mu index --rebuild'"; break;
|
||||||
break;
|
|
||||||
case MU_ERROR_XAPIAN_IS_EMPTY:
|
case MU_ERROR_XAPIAN_IS_EMPTY:
|
||||||
advise = "please try 'mu index'";
|
advise = "please try 'mu index'";
|
||||||
break;
|
break;
|
||||||
|
@ -62,8 +68,7 @@ handle_error (MuConfig *conf, GError *err)
|
||||||
dynadvise = g_strdup_printf ("see 'mu help %s'",
|
dynadvise = g_strdup_printf ("see 'mu help %s'",
|
||||||
conf->cmdstr);
|
conf->cmdstr);
|
||||||
break;
|
break;
|
||||||
default:
|
default:break; /* nothing to do */
|
||||||
break; /* nothing to do */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
g_warning ("%s", err->message);
|
g_warning ("%s", err->message);
|
||||||
|
@ -89,6 +94,10 @@ main (int argc, char *argv[])
|
||||||
conf = mu_config_init (&argc, &argv);
|
conf = mu_config_init (&argc, &argv);
|
||||||
if (!conf)
|
if (!conf)
|
||||||
return 1;
|
return 1;
|
||||||
|
else if (conf->version) {
|
||||||
|
show_version ();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!mu_runtime_init (conf->muhome, PACKAGE_NAME)) {
|
if (!mu_runtime_init (conf->muhome, PACKAGE_NAME)) {
|
||||||
mu_config_uninit (conf);
|
mu_config_uninit (conf);
|
||||||
|
|
Loading…
Reference in New Issue