undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Export parse_date_basic() to convert a date string to timestamp

Browse Source 
approxidate() is not appropriate for reading machine-written dates
because it guesses instead of erroring out on malformed dates.
parse_date() is less convenient since it returns its output as a
string.  So export the underlying function that writes a timestamp.

While at it, change the return value to match the usual convention:
return 0 for success and -1 for failure.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-07-15 18:22:57 +02:00 committed by Junio C Hamano
parent 53b304224a
commit 9644c06163
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -811,6 +811,7 @@ const char *show_date_relative(unsigned long time, int tz,
char *timebuf,
size_t timebuf_size);
int parse_date(const char *date, char *buf, int bufsize);
int parse_date_basic(const char *date, unsigned long *timestamp, int *offset);
void datestamp(char *buf, int bufsize);
#define approxidate(s) approxidate_careful((s), NULL)
unsigned long approxidate_careful(const char *, int *);

14
date.c
View File

@ -586,7 +586,7 @@ static int date_string(unsigned long date, int offset, char *buf, int len)
/* Gr. strptime is crap for this; it doesn't have a way to require RFC2822
(i.e. English) day/month names, and it doesn't work correctly with %z. */
int parse_date_toffset(const char *date, unsigned long *timestamp, int *offset)
int parse_date_basic(const char *date, unsigned long *timestamp, int *offset)
{
struct tm tm;
int tm_gmt;
@ -642,17 +642,16 @@ int parse_date_toffset(const char *date, unsigned long *timestamp, int *offset)
if (!tm_gmt)
*timestamp -= *offset * 60;
return 1; /* success */
return 0; /* success */
}
int parse_date(const char *date, char *result, int maxlen)
{
unsigned long timestamp;
int offset;
if (parse_date_toffset(date, &timestamp, &offset) > 0)
return date_string(timestamp, offset, result, maxlen);
else
if (parse_date_basic(date, &timestamp, &offset))
return -1;
return date_string(timestamp, offset, result, maxlen);
}
enum date_mode parse_date_format(const char *format)
@ -1004,9 +1003,8 @@ unsigned long approxidate_relative(const char *date, const struct timeval *tv)
int offset;
int errors = 0;
if (parse_date_toffset(date, &timestamp, &offset) > 0)
if (!parse_date_basic(date, &timestamp, &offset))
return timestamp;
return approxidate_str(date, tv, &errors);
}
@ -1019,7 +1017,7 @@ unsigned long approxidate_careful(const char *date, int *error_ret)
if (!error_ret)
error_ret = &dummy;
if (parse_date_toffset(date, &timestamp, &offset) > 0) {
if (!parse_date_basic(date, &timestamp, &offset)) {
*error_ret = 0;
return timestamp;
}