debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-29 14:14:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: refactor _notmuch_messsage_file_get_combined_header

Browse source 
We need to rewrite the loop for gmime-3.0; move the loop body to its
own function to avoid code duplication.  Keep the common exit via
"goto DONE" to make this pure code movement.  It's important to note
that the existing exit path only deallocates the iterator.
This commit is contained in:
David Bremner 2017-05-17 07:18:55 -03:00
parent c040464a7c
commit 439c5896b6
1 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
lib/message-file.c
View file

@ -201,6 +201,37 @@ _notmuch_message_file_get_mime_message (notmuch_message_file_t *message,
* *
* Return NULL on errors, empty string for non-existing headers. * Return NULL on errors, empty string for non-existing headers.
*/ */
static char *
_extend_header (char *combined, const char *value) {
char *decoded;
decoded = g_mime_utils_header_decode_text (value);
if (! decoded) {
if (combined) {
g_free (combined);
combined = NULL;
}
goto DONE;
}
if (combined) {
char *tmp = g_strdup_printf ("%s %s", combined, decoded);
g_free (decoded);
g_free (combined);
if (! tmp) {
combined = NULL;
goto DONE;
}
combined = tmp;
} else {
combined = decoded;
}
DONE:
return combined;
}
static char * static char *
_notmuch_message_file_get_combined_header (notmuch_message_file_t *message, _notmuch_message_file_get_combined_header (notmuch_message_file_t *message,
const char *header) const char *header)
@ -222,37 +253,13 @@ _notmuch_message_file_get_combined_header (notmuch_message_file_t *message,
do { do {
const char *value; const char *value;
char *decoded;
if (strcasecmp (g_mime_header_iter_get_name (iter), header) != 0) if (strcasecmp (g_mime_header_iter_get_name (iter), header) != 0)
continue; continue;
/* Note that GMime retains ownership of value... */ /* Note that GMime retains ownership of value... */
value = g_mime_header_iter_get_value (iter); value = g_mime_header_iter_get_value (iter);
/* ... while decoded needs to be freed with g_free(). */ combined = _extend_header (combined, value);
decoded = g_mime_utils_header_decode_text (value);
if (! decoded) {
if (combined) {
g_free (combined);
combined = NULL;
}
goto DONE;
}
if (combined) {
char *tmp = g_strdup_printf ("%s %s", combined, decoded);
g_free (decoded);
g_free (combined);
if (! tmp) {
combined = NULL;
goto DONE;
}
combined = tmp;
} else {
combined = decoded;
}
} while (g_mime_header_iter_next (iter)); } while (g_mime_header_iter_next (iter));
/* Return empty string for non-existing headers. */ /* Return empty string for non-existing headers. */