Mercurial > libpst
diff src/pst2dii.cpp.in @ 172:6954d315aaa8
move version-info into main configure.in, and set it properly.
prefix all external symbols in the shared library with pst_ to avoid symbol clashes with other shared libraries.
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Sat, 04 Apr 2009 16:00:48 -0700 |
| parents | 0e1e048716e4 |
| children | b65e8d0a088a |
line wrap: on
line diff
--- a/src/pst2dii.cpp.in Sun Mar 29 08:51:13 2009 -0700 +++ b/src/pst2dii.cpp.in Sat Apr 04 16:00:48 2009 -0700 @@ -184,11 +184,11 @@ int len = strlen(output_directory) + 1 + strlen(f_name) + 15; if (!attach_filename) { // generate our own (dummy) filename for the attachement - temp = (char*)xmalloc(len); + temp = (char*)pst_malloc(len); sprintf(temp, "%s/%s_attach%i", output_directory, f_name, attach_num); } else { // have an attachment name, make sure it's unique - temp = (char*)xmalloc(len+strlen(attach_filename)); + temp = (char*)pst_malloc(len+strlen(attach_filename)); do { if (fp) fclose(fp); if (x == 0) @@ -480,7 +480,7 @@ if (mybcc.empty()) write_simple("BCC", item->email->bcc_address.str); else write_simple("BCC", mybcc); if (item->email->sent_date) { - time_t t = fileTimeToUnixTime(item->email->sent_date, NULL); + time_t t = pst_fileTimeToUnixTime(item->email->sent_date, NULL); char c_time[C_TIME_SIZE]; strftime(c_time, C_TIME_SIZE, "%F", gmtime(&t)); write_simple("DATESENT", c_time); @@ -488,7 +488,7 @@ write_simple("TIMESENT", c_time); } if (item->email->arrival_date) { - time_t t = fileTimeToUnixTime(item->email->arrival_date, NULL); + time_t t = pst_fileTimeToUnixTime(item->email->arrival_date, NULL); char c_time[C_TIME_SIZE]; strftime(c_time, C_TIME_SIZE, "%F", gmtime(&t)); write_simple("DATERCVD", c_time); @@ -540,7 +540,7 @@ } if (item->email->sent_date) { - time_t em_time = fileTimeToUnixTime(item->email->sent_date, 0); + time_t em_time = pst_fileTimeToUnixTime(item->email->sent_date, 0); char c_time[C_TIME_SIZE]; strftime(c_time, C_TIME_SIZE, "%a, %d %b %Y %H:%M:%S %z", gmtime(&em_time)); snprintf(line, sizeof(line), "Date: %s\n", c_time);