emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build: fix some scan-build warnings

This commit is contained in:
Dirk-Jan C. Binnema 2022-02-07 17:36:34 +02:00
parent 8493e8649d
commit e818e94d0e
6 changed files with 132 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guile/mu-guile.cc
View File

@ -149,14 +149,14 @@ SCM_DEFINE_PUBLIC(mu_initialize,
muhome = scm_to_utf8_string(MUHOME);
rv = mu_guile_init_instance(muhome);
if (!rv) {
free(muhome);
if (!rv)
return mu_guile_error(FUNC_NAME, 0, "Failed to initialize mu", SCM_UNSPECIFIED);
mu_guile_error(FUNC_NAME, 0, "Failed to initialize mu", SCM_UNSPECIFIED);
}
g_debug("mu-guile: initialized @ %s (%p)",
muhome ? muhome : "<default>",
StoreSingleton.get());
muhome ? muhome : "<default>", StoreSingleton.get());
free(muhome);
/* cleanup when we're exiting */
atexit(mu_guile_uninit_instance);

11
lib/mu-msg.cc
View File

@ -282,20 +282,15 @@ get_str_field(MuMsg* self, MuMsgFieldId mfid)
static gint64
get_num_field(MuMsg* self, MuMsgFieldId mfid)
{
guint64 val;
val = -1;
if (self->_doc && mu_msg_field_xapian_value(mfid))
val = mu_msg_doc_get_num_field(self->_doc, mfid);
else {
return mu_msg_doc_get_num_field(self->_doc, mfid);
/* if we don't have a file object yet, we need to
* create it from the file on disk */
if (!mu_msg_load_msg_file(self, NULL))
return -1;
val = mu_msg_file_get_num_field(self->_file, mfid);
}
return val;
return mu_msg_file_get_num_field(self->_file, mfid);
}
const char*

8
lib/mu-script.cc
View File

@ -306,10 +306,6 @@ mu_script_guile_run(MuScriptInfo* msi, const char* muhome, const char** args, GE
g_return_val_if_fail(msi, FALSE);
g_return_val_if_fail(muhome, FALSE);
argv = g_new0(char*, 6);
argv[0] = g_strdup(GUILE_BINARY);
argv[1] = g_strdup("-l");
if (access(mu_script_info_path(msi), R_OK) != 0) {
mu_util_g_set_error(err,
MU_ERROR_FILE_CANNOT_READ,
@ -318,6 +314,10 @@ mu_script_guile_run(MuScriptInfo* msi, const char* muhome, const char** args, GE
return FALSE;
}
argv = g_new0(char*, 6);
argv[0] = g_strdup(GUILE_BINARY);
argv[1] = g_strdup("-l");
s = mu_script_info_path(msi);
argv[2] = g_strdup(s ? s : "");

2
lib/tests/test-mu-msg.cc
View File

@ -283,7 +283,6 @@ test_mu_msg_references(void)
g_assert_cmpstr((char*)refs->data, ==, "non-exist-03@msg.id");
refs = g_slist_next(refs);
g_assert_cmpstr((char*)refs->data, ==, "non-exist-04@msg.id");
refs = g_slist_next(refs);
mu_msg_unref(msg);
}
@ -313,7 +312,6 @@ test_mu_msg_references_dups(void)
g_assert_cmpstr((char*)refs->data, ==, "439A1E03.3090604@euler.org");
refs = g_slist_next(refs);
g_assert_cmpstr((char*)refs->data, ==, "20051211184308.GB13513@gauss.org");
refs = g_slist_next(refs);
mlist = mu_msg_get_mailing_list(msg);
g_assert_cmpstr(mlist, ==, "Example of List Id");

15
lib/utils/tests/test-mu-util.c
View File

@ -55,7 +55,6 @@ test_mu_util_dir_expand_01 (void)
* work. Turn of the test for now */
return;
#ifdef HAVE_WORDEXP_H
{
gchar *got, *expected;
@ -72,8 +71,6 @@ test_mu_util_dir_expand_01 (void)
#endif /*HAVE_WORDEXP_H*/
}
static void
test_mu_util_guess_maildir_01(void)
{
@ -93,7 +90,6 @@ test_mu_util_guess_maildir_01 (void)
g_free(got);
}
static void
test_mu_util_guess_maildir_02(void)
{
@ -114,7 +110,6 @@ test_mu_util_guess_maildir_02 (void)
g_free(mdir);
}
static void
test_mu_util_check_dir_01(void)
{
@ -126,7 +121,6 @@ test_mu_util_check_dir_01 (void)
}
}
static void
test_mu_util_check_dir_02(void)
{
@ -138,7 +132,6 @@ test_mu_util_check_dir_02 (void)
}
}
static void
test_mu_util_check_dir_03(void)
{
@ -150,7 +143,6 @@ test_mu_util_check_dir_03 (void)
}
}
static void
test_mu_util_check_dir_04(void)
{
@ -173,16 +165,16 @@ test_mu_util_get_dtype_with_lstat (void)
==, DT_REG);
}
static void
test_mu_util_supports(void)
{
gboolean has_guile;
gchar* path;
has_guile = FALSE;
#ifdef BUILD_GUILE
has_guile = TRUE;
#else
has_guile = FALSE;
#endif /*BUILD_GUILE*/
g_assert_cmpuint(mu_util_supports(MU_FEATURE_GUILE), ==, has_guile);
@ -199,15 +191,12 @@ test_mu_util_supports (void)
has_guile && path ? TRUE : FALSE);
}
static void
test_mu_util_program_in_path(void)
{
g_assert_cmpuint(mu_util_program_in_path("ls"), ==, TRUE);
}
int
main(int argc, char* argv[])
{

2
mu/mu-config.cc
View File

@ -841,8 +841,6 @@ parse_params(int* argcp, char*** argvp, GError** err)
context = g_option_context_new("- mu general options");
g_option_context_set_help_enabled(context, TRUE);
rv = TRUE;
g_option_context_set_main_group(context, config_options_group_mu());
g_option_context_set_ignore_unknown_options(context, FALSE);