Mercurial > pidgin.yaz
comparison libpurple/log.c @ 23911:dd4df1a209b7
merge of '44b23c8bda2576a9bfcd3eaa90f9188c455df575'
and '7f16ff52262dcf6e66b6fd7796fca4bdd5de76bb'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Wed, 27 Aug 2008 01:43:09 +0000 |
parents | b789b54c5bb2 |
children | 5ebfa814b9e8 |
comparison
equal
deleted
inserted
replaced
23908:def8c164f557 | 23911:dd4df1a209b7 |
---|---|
885 PurpleLog *log; | 885 PurpleLog *log; |
886 PurpleLogCommonLoggerData *data; | 886 PurpleLogCommonLoggerData *data; |
887 struct tm tm; | 887 struct tm tm; |
888 #if defined (HAVE_TM_GMTOFF) && defined (HAVE_STRUCT_TM_TM_ZONE) | 888 #if defined (HAVE_TM_GMTOFF) && defined (HAVE_STRUCT_TM_TM_ZONE) |
889 long tz_off; | 889 long tz_off; |
890 const char *rest; | 890 const char *rest, *end; |
891 time_t stamp = purple_str_to_time(purple_unescape_filename(filename), FALSE, &tm, &tz_off, &rest); | 891 time_t stamp = purple_str_to_time(purple_unescape_filename(filename), FALSE, &tm, &tz_off, &rest); |
892 char *end; | |
893 | 892 |
894 /* As zero is a valid offset, PURPLE_NO_TZ_OFF means no offset was | 893 /* As zero is a valid offset, PURPLE_NO_TZ_OFF means no offset was |
895 * provided. See util.h. Yes, it's kinda ugly. */ | 894 * provided. See util.h. Yes, it's kinda ugly. */ |
896 if (tz_off != PURPLE_NO_TZ_OFF) | 895 if (tz_off != PURPLE_NO_TZ_OFF) |
897 tm.tm_gmtoff = tz_off - tm.tm_gmtoff; | 896 tm.tm_gmtoff = tz_off - tm.tm_gmtoff; |