* mu-str: fix bug in mu_str_date_parse_hdwmy

This commit is contained in:
Dirk-Jan C. Binnema
2011-06-30 23:46:21 +03:00
parent 2d1f8366d5
commit eb7b7e4ea0

View File

@ -310,23 +310,23 @@ is_xapian_prefix (const char *q, const char *colon)
} }
time_t time_t
mu_str_date_parse_hdwmy (const char* str) mu_str_date_parse_hdwmy (const char *nptr)
{ {
long int num; long int num;
char *end; char *endptr;
time_t now, delta; time_t now, delta;
time_t never = (time_t)-1; time_t never = (time_t)-1;
g_return_val_if_fail (str, never); g_return_val_if_fail (nptr, never);
num = strtol (str, &end, 10); num = strtol (nptr, &endptr, 10);
if (num <= 0 || num > 9999) if (num <= 0 || num > 9999)
return never; return never;
if (end == NULL || *end != '\0') if (endptr == NULL || *endptr == '\0')
return never; return never;
switch (end[0]) { switch (endptr[0]) {
case 'h': /* hour */ case 'h': /* hour */
delta = num * 60 * 60; break; delta = num * 60 * 60; break;
case 'd': /* day */ case 'd': /* day */