* fix glib warnings (compile time, runtime): add error gquark, don't use g_atexit

This commit is contained in:
djcb
2012-04-01 13:08:02 +03:00
parent fa10095ce2
commit bc6f9ebbb8
16 changed files with 112 additions and 83 deletions

View File

@ -75,19 +75,19 @@ check_params (MuConfig *opts, GError **err)
{
/* param[0] == 'index' there should be no param[1] */
if (opts->params[1]) {
g_set_error (err, 0, MU_ERROR_IN_PARAMETERS,
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_IN_PARAMETERS,
"unexpected parameter");
return FALSE;
}
if (opts->xbatchsize < 0) {
g_set_error (err, 0, MU_ERROR_IN_PARAMETERS,
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_IN_PARAMETERS,
"the batch size must be non-negative");
return FALSE;
}
if (opts->max_msg_size < 0) {
g_set_error (err, 0, MU_ERROR_IN_PARAMETERS,
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_IN_PARAMETERS,
"the maximum message size must be non-negative");
return FALSE;
}
@ -99,20 +99,20 @@ static gboolean
check_maildir (const char *maildir, GError **err)
{
if (!maildir) {
g_set_error (err, 0, MU_ERROR_IN_PARAMETERS,
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_IN_PARAMETERS,
"no maildir to work on; use --maildir=");
return FALSE;
}
if (!g_path_is_absolute (maildir)) {
g_set_error (err, 0, MU_ERROR_IN_PARAMETERS,
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_IN_PARAMETERS,
"maildir path '%s' is not absolute",
maildir);
return FALSE;
}
if (!mu_util_check_dir (maildir, TRUE, FALSE)) {
g_set_error (err, 0, MU_ERROR_IN_PARAMETERS,
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_IN_PARAMETERS,
"not a valid Maildir: %s", maildir);
return FALSE;
}
@ -347,7 +347,7 @@ cmd_index (MuIndex *midx, MuConfig *opts, MuIndexStats *stats,
if (rv == MU_STOP)
rv = MU_OK;
} else
g_set_error (err, 0, rv, "error while indexing");
g_set_error (err, MU_ERROR_DOMAIN, rv, "error while indexing");
return rv;
}