@matheusbsbs / matheus-bagliano / commits / 2a39064c65
Fork 0

[PATCH] Return proper error valud from "parse_date()"

Right now we don't return any error value at all from parse_date(), and if we can't parse it, we just silently leave the result buffer unchanged. That's fine for the current user, which will always default to the current date, but it's a crappy interface, and we might well be better off with an error message rather than just the default date. So let's change the thing to return a negative value if an error occurs, and the length of the result otherwise (snprintf behaviour: if the buffer is too small, it returns how big it _would_ have been). [ I started looking at this in case we could support date-based revision names. Looks ugly. Would have to parse relative dates.. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Sep 19, 2005 at 15:53 UTC 2a39064c65e70a3e763c4dff5553cd2af3d10211
2 files changed +4 -4
cache.h
+1 -1
@@ -242,7 +242,7 @@ extern void *read_object_with_reference(const unsigned char *sha1,
242 unsigned char *sha1_ret);
243
244 const char *show_date(unsigned long time, int timezone);
245 -void parse_date(const char *date, char *buf, int bufsize);
245 +int parse_date(const char *date, char *buf, int bufsize);
246 void datestamp(char *buf, int bufsize);
247
248 extern int setup_ident(void);
date.c
+3 -3
@@ -388,7 +388,7 @@ static int match_tz(const char *date, int *offp)
388
389 /* Gr. strptime is crap for this; it doesn't have a way to require RFC2822
390 (i.e. English) day/month names, and it doesn't work correctly with %z. */
391 -void parse_date(const char *date, char *result, int maxlen)
391 +int parse_date(const char *date, char *result, int maxlen)
392 {
393 struct tm tm;
394 int offset, sign, tm_gmt;
@@ -431,7 +431,7 @@ void parse_date(const char *date, char *result, int maxlen)
431 offset = (then - mktime(&tm)) / 60;
432
433 if (then == -1)
434 - return;
434 + return -1;
435
436 if (!tm_gmt)
437 then -= offset * 60;
@@ -442,7 +442,7 @@ void parse_date(const char *date, char *result, int maxlen)
442 sign = '-';
443 }
444
445 - snprintf(result, maxlen, "%lu %c%02d%02d", then, sign, offset/60, offset % 60);
445 + return snprintf(result, maxlen, "%lu %c%02d%02d", then, sign, offset/60, offset % 60);
446 }
447
448 void datestamp(char *buf, int bufsize)