Renamed local variable to additional_headers
Done to match new patch better
This commit is contained in:
parent
c81eedcc83
commit
f6d68db718
|
@ -1517,7 +1517,7 @@ static void procmime_parse_message_rfc822(MimeInfo *mimeinfo, gboolean short_sca
|
|||
FILE *fp;
|
||||
gchar *tmp;
|
||||
gint len = 0;
|
||||
GPtrArray *headers = NULL;
|
||||
GPtrArray *additional_headers = NULL;
|
||||
|
||||
procmime_decode_content(mimeinfo);
|
||||
|
||||
|
@ -1534,7 +1534,7 @@ static void procmime_parse_message_rfc822(MimeInfo *mimeinfo, gboolean short_sca
|
|||
return;
|
||||
}
|
||||
|
||||
headers = procheader_get_all_header_fields(fp, hentry);
|
||||
additional_headers = procheader_get_all_header_fields(fp, hentry);
|
||||
|
||||
if (hentry[0].body != NULL) {
|
||||
tmp = conv_unmime_header(hentry[0].body, NULL, FALSE);
|
||||
|
@ -1577,9 +1577,9 @@ static void procmime_parse_message_rfc822(MimeInfo *mimeinfo, gboolean short_sca
|
|||
* We can replace item witn NULL to state it should not be freed and we take ownership
|
||||
* instead of stealing it which forces array to resize and move items around.
|
||||
*/
|
||||
while(headers->len) {
|
||||
while(additional_headers->len) {
|
||||
/* Take ownership because header is passed to mimeinfo struct without copy */
|
||||
Header *header = (Header *)g_ptr_array_steal_index(headers, 0);
|
||||
Header *header = (Header *)g_ptr_array_steal_index(additional_headers, 0);
|
||||
/* TODO: Sanity check, remove for prod!*/
|
||||
// g_message("testing Header: %s", headbuf);
|
||||
hp = &hentry[0];
|
||||
|
@ -1599,7 +1599,7 @@ static void procmime_parse_message_rfc822(MimeInfo *mimeinfo, gboolean short_sca
|
|||
procmime_mimeinfo_add_extra_header(mimeinfo, header);
|
||||
}
|
||||
}
|
||||
g_ptr_array_unref(headers);
|
||||
g_ptr_array_unref(additional_headers);
|
||||
|
||||
content_start = ftell(fp);
|
||||
claws_fclose(fp);
|
||||
|
|
Loading…
Reference in a new issue