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

Merge pull request #1359 from OnkelUlla/fix_compiler_warnings

Browse Source 
Fix compiler warnings
This commit is contained in:
Dirk-Jan C. Binnema
2019-01-17 22:26:50 +02:00
committed by GitHub
parent 0903eaba79 d37a961c8f
commit d41242ff6c
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mu-msg-json.c
View File

@ -251,8 +251,6 @@ errexit:
static gchar* static gchar*
get_temp_file_maybe (MuMsg *msg, MuMsgPart *part, MuMsgOptions opts) get_temp_file_maybe (MuMsg *msg, MuMsgPart *part, MuMsgOptions opts)
{ {
char *tmp, *tmpfile;
opts |= MU_MSG_OPTION_USE_EXISTING; opts |= MU_MSG_OPTION_USE_EXISTING;
if (!(opts & MU_MSG_OPTION_EXTRACT_IMAGES) || if (!(opts & MU_MSG_OPTION_EXTRACT_IMAGES) ||
@ -273,7 +271,6 @@ typedef struct _PartInfo PartInfo;
static void static void
add_part_crypto (JsonBuilder *bob, MuMsgPart *mpart, PartInfo *pinfo) add_part_crypto (JsonBuilder *bob, MuMsgPart *mpart, PartInfo *pinfo)
{ {
char *signers, *s;
const char *verdict; const char *verdict;
MuMsgPartSigStatusReport *report; MuMsgPartSigStatusReport *report;
@ -329,13 +326,11 @@ static void
each_part (MuMsg *msg, MuMsgPart *part, PartInfo *pinfo) each_part (MuMsg *msg, MuMsgPart *part, PartInfo *pinfo)
{ {
char *name, *tmpfile; char *name, *tmpfile;
const char *cid;
pinfo->bob = json_builder_begin_object(pinfo->bob); pinfo->bob = json_builder_begin_object(pinfo->bob);
name = mu_msg_part_get_filename (part, TRUE); name = mu_msg_part_get_filename (part, TRUE);
tmpfile = get_temp_file_maybe (msg, part, pinfo->opts); tmpfile = get_temp_file_maybe (msg, part, pinfo->opts);
cid = mu_msg_part_get_content_id(part);
add_int_member (pinfo->bob, "index", part->index); add_int_member (pinfo->bob, "index", part->index);
add_string_member (pinfo->bob, "name", name); add_string_member (pinfo->bob, "name", name);

2
lib/parser/parser.cc
View File

@ -135,7 +135,7 @@ range (const ProcIface::FieldInfoVec& fields, const std::string& lower,
if (prange.lower > prange.upper) if (prange.lower > prange.upper)
prange = proc->process_range (field.field, upper, lower); prange = proc->process_range (field.field, upper, lower);
return Tree({{Node::Type::Range}, return Tree({Node::Type::Range,
std::make_unique<Range>(field.field, field.prefix, field.id, std::make_unique<Range>(field.field, field.prefix, field.id,
prange.lower, prange.upper)}); prange.lower, prange.upper)});
} }

2
lib/tests/test-mu-str.c
View File

@ -277,7 +277,7 @@ test_mu_str_subject_normalize (void)
int i; int i;
struct { struct {
char *src, *exp; const char *src, *exp;
} tests[] = { } tests[] = {
{ "test123", "test123" }, { "test123", "test123" },
{ "Re:test123", "test123" }, { "Re:test123", "test123" },