Mercurial > libpst
diff src/readpst.c @ 150:06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Thu, 05 Mar 2009 08:23:32 -0800 |
| parents | 0695de3b5a98 |
| children | cda7c812ec01 |
line wrap: on
line diff
--- a/src/readpst.c Sat Feb 28 11:55:48 2009 -0800 +++ b/src/readpst.c Thu Mar 05 08:23:32 2009 -0800 @@ -132,11 +132,11 @@ while (d_ptr) { DEBUG_MAIN(("main: New item record\n")); if (!d_ptr->desc) { - DEBUG_WARN(("main: ERROR ?? item's desc record is NULL\n")); + DEBUG_WARN(("main: ERROR item's desc record is NULL\n")); ff.skip_count++; } else { - DEBUG_MAIN(("main: Desc Email ID %#"PRIx64" [d_ptr->id = %#"PRIx64"]\n", d_ptr->desc->id, d_ptr->id)); + DEBUG_MAIN(("main: Desc Email ID %#"PRIx64" [d_ptr->d_id = %#"PRIx64"]\n", d_ptr->desc->id, d_ptr->d_id)); item = pst_parse_item(&pstfile, d_ptr, NULL); DEBUG_MAIN(("main: About to process item\n")); @@ -748,16 +748,16 @@ ptr = pst_getID(pf, attach->id_val); pst_desc_ll d_ptr; - d_ptr.id = ptr->id; - d_ptr.parent_id = 0; - d_ptr.list_index = NULL; - d_ptr.desc = ptr; - d_ptr.no_child = 0; - d_ptr.prev = NULL; - d_ptr.next = NULL; - d_ptr.parent = NULL; - d_ptr.child = NULL; - d_ptr.child_tail = NULL; + d_ptr.d_id = 0; + d_ptr.parent_d_id = 0; + d_ptr.assoc_tree = NULL; + d_ptr.desc = ptr; + d_ptr.no_child = 0; + d_ptr.prev = NULL; + d_ptr.next = NULL; + d_ptr.parent = NULL; + d_ptr.child = NULL; + d_ptr.child_tail = NULL; pst_item *item = pst_parse_item(pf, &d_ptr, attach->id2_head); write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers); @@ -1082,9 +1082,9 @@ // setup default body character set and report type snprintf(body_charset, sizeof(body_charset), "%s", - (item->email->body_charset) ? item->email->body_charset : - (item->email->message_codepage) ? codepage(item->email->message_codepage) : - (item->email->internet_cpid) ? codepage(item->email->internet_cpid) : + (item->body_charset) ? item->body_charset : + (item->message_codepage) ? codepage(item->message_codepage) : + (item->internet_cpid) ? codepage(item->internet_cpid) : "utf-8"); body_report[0] = '\0';