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

Normalize part counting and formatting in show_message_part function.

Browse source 
Simplify the function by moving part counting and formatting outside
of conditionals, thereby eliminating redundant code.  This also wraps
message part output handling with proper part formatting.
This commit is contained in:
Jameson Graef Rollins 2011-05-22 22:08:08 -07:00
parent 5a9d5f2f14
commit ecae541031
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
show-message.c
View file

@ -28,47 +28,37 @@ show_message_part (GMimeObject *part,
const notmuch_show_format_t *format, const notmuch_show_format_t *format,
int first) int first)
{ {
*part_count += 1;
if (! (GMIME_IS_PART (part) || GMIME_IS_MULTIPART (part) || GMIME_IS_MESSAGE_PART (part))) {
fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
g_type_name (G_OBJECT_TYPE (part)));
return;
}
if (!first) if (!first)
fputs (format->part_sep, stdout); fputs (format->part_sep, stdout);
format->part (part, part_count);
if (GMIME_IS_MULTIPART (part)) { if (GMIME_IS_MULTIPART (part)) {
GMimeMultipart *multipart = GMIME_MULTIPART (part); GMimeMultipart *multipart = GMIME_MULTIPART (part);
int i; int i;
*part_count = *part_count + 1;
format->part (part, part_count);
for (i = 0; i < g_mime_multipart_get_count (multipart); i++) { for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
show_message_part (g_mime_multipart_get_part (multipart, i), show_message_part (g_mime_multipart_get_part (multipart, i),
part_count, format, i == 0); part_count, format, i == 0);
} }
if (format->part_end) } else if (GMIME_IS_MESSAGE_PART (part)) {
format->part_end (part);
return;
}
if (GMIME_IS_MESSAGE_PART (part)) {
GMimeMessage *mime_message; GMimeMessage *mime_message;
mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part)); mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
show_message_part (g_mime_message_get_mime_part (mime_message), show_message_part (g_mime_message_get_mime_part (mime_message),
part_count, format, first); part_count, format, first);
return;
} }
if (! (GMIME_IS_PART (part))) {
fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
g_type_name (G_OBJECT_TYPE (part)));
return;
}
*part_count = *part_count + 1;
format->part (part, part_count);
if (format->part_end) if (format->part_end)
format->part_end (part); format->part_end (part);
} }