gmime-cleanup: pass NULL as default GMimeParserOptions

This is a functional change, not a straight translation, because we
are no longer directly invoking g_mime_parser_options_get_default(),
but the GMime source has indicated that the options parameter for
g_mime_parser_construct_message() is "nullable" since upstream commit
d0ebdd2ea3e6fa635a2a551c846e9bc8b6040353 (which itself precedes GMime
3.0).

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2019-05-02 09:19:46 -04:00 committed by David Bremner
parent bbe3015b3e
commit e9b870b692
3 changed files with 2 additions and 4 deletions

View file

@ -152,7 +152,7 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
parser = g_mime_parser_new_with_stream (stream);
g_mime_parser_set_scan_from (parser, is_mbox);
message->message = g_mime_parser_construct_message (parser);
message->message = g_mime_parser_construct_message (parser, NULL);
if (! message->message) {
status = NOTMUCH_STATUS_FILE_NOT_EMAIL;
goto DONE;

View file

@ -121,7 +121,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
goto DONE;
}
mctx->mime_message = g_mime_parser_construct_message (mctx->parser);
mctx->mime_message = g_mime_parser_construct_message (mctx->parser, NULL);
if (!mctx->mime_message) {
fprintf (stderr, "Failed to parse %s\n", filename);
status = NOTMUCH_STATUS_FILE_ERROR;

View file

@ -9,8 +9,6 @@ extern "C" {
GMimeStream *g_mime_stream_stdout_new(void);
#define g_mime_parser_construct_message(p) g_mime_parser_construct_message (p, g_mime_parser_options_get_default ())
/**
* Get last 16 hex digits of fingerprint ("keyid")
*/