Mercurial > pidgin.yaz
comparison libpurple/util.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 | 7fbc99a1481d |
comparison
equal
deleted
inserted
replaced
23908:def8c164f557 | 23911:dd4df1a209b7 |
---|---|
765 int year = 0; | 765 int year = 0; |
766 long tzoff = PURPLE_NO_TZ_OFF; | 766 long tzoff = PURPLE_NO_TZ_OFF; |
767 | 767 |
768 time(&retval); | 768 time(&retval); |
769 localtime_r(&retval, &t); | 769 localtime_r(&retval, &t); |
770 | |
771 if (rest != NULL) | |
772 *rest = NULL; | |
770 | 773 |
771 /* 4 digit year */ | 774 /* 4 digit year */ |
772 if (sscanf(c, "%04d", &year) && year > 1900) | 775 if (sscanf(c, "%04d", &year) && year > 1900) |
773 { | 776 { |
774 c += 4; | 777 c += 4; |