* make mu compile warning-free with clang/clang++

This commit is contained in:
Dirk-Jan C. Binnema
2012-02-29 21:08:23 +02:00
parent 6761f0e5d3
commit f02bb34188
2 changed files with 25 additions and 24 deletions

View File

@ -287,7 +287,7 @@ check_param_num (GSList *args, unsigned min, unsigned max)
do { \ do { \
if (!check_param_num((ARGS),(MN),(MX))) \ if (!check_param_num((ARGS),(MN),(MX))) \
return server_error(NULL,MU_ERROR_IN_PARAMETERS, \ return server_error(NULL,MU_ERROR_IN_PARAMETERS, \
(USAGE)); \ "%s",(USAGE)); \
} while (0) } while (0)
@ -362,7 +362,8 @@ cmd_find (MuStore *store, MuQuery *query, GSList *args, GError **err)
return_if_fail_param_num (args, 2, 2, usage); return_if_fail_param_num (args, 2, 2, usage);
if ((maxnum = atoi((const char*)args->next->data)) == 0) if ((maxnum = atoi((const char*)args->next->data)) == 0)
return server_error (NULL, MU_ERROR_IN_PARAMETERS, usage); return server_error (NULL, MU_ERROR_IN_PARAMETERS,
"%s", usage);
/* TODO: ask for *all* results, then, get the <maxnum> newest /* TODO: ask for *all* results, then, get the <maxnum> newest
* ones; it seems we cannot get a sorted list of a subset of * ones; it seems we cannot get a sorted list of a subset of
@ -496,7 +497,7 @@ do_move (MuStore *store, unsigned docid, MuMsg *msg, const char *maildir,
* wel */ * wel */
rv = mu_store_update_msg (store, docid, msg, err); rv = mu_store_update_msg (store, docid, msg, err);
if (rv == MU_STORE_INVALID_DOCID) if (rv == MU_STORE_INVALID_DOCID)
return server_error (err, MU_ERROR_XAPIAN, return server_error (err, MU_ERROR_XAPIAN, "%s",
"failed to update message"); "failed to update message");
sexp = mu_msg_to_sexp (msg, docid, NULL, TRUE); sexp = mu_msg_to_sexp (msg, docid, NULL, TRUE);
@ -589,7 +590,7 @@ cmd_remove (MuStore *store, GSList *args, GError **err)
"no valid doc for docid"); "no valid doc for docid");
if (unlink (path) != 0) if (unlink (path) != 0)
return server_error (err, MU_ERROR_FILE_CANNOT_UNLINK, return server_error (err, MU_ERROR_FILE_CANNOT_UNLINK, "%s",
strerror (errno)); strerror (errno));
if (!mu_store_remove_path (store, path)) if (!mu_store_remove_path (store, path))

View File

@ -55,7 +55,7 @@ enum _MuFlags {
}; };
typedef enum _MuFlags MuFlags; typedef enum _MuFlags MuFlags;
#define MU_FLAG_INVALID ((unsigned)-1) #define MU_FLAG_INVALID ((MuFlags)-1)
enum _MuFlagType { enum _MuFlagType {
MU_FLAG_TYPE_MAILFILE = 1 << 0, MU_FLAG_TYPE_MAILFILE = 1 << 0,
@ -65,7 +65,7 @@ enum _MuFlagType {
}; };
typedef enum _MuFlagType MuFlagType; typedef enum _MuFlagType MuFlagType;
#define MU_FLAG_TYPE_ANY ((MuFlags)-1) #define MU_FLAG_TYPE_ANY ((MuFlagType)-1)
#define MU_FLAG_TYPE_INVALID ((MuFlagType)-1) #define MU_FLAG_TYPE_INVALID ((MuFlagType)-1)