Make show_rfc2822_date() just another date output format.
These days, show_date() takes a date_mode parameter to specify the output format, and a separate specialized function for dates in E-mails does not make much sense anymore. This retires show_rfc2822_date() function and make it just another date output format. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ee8f838e03
commit
73013afd14
11
cache.h
11
cache.h
@ -409,9 +409,16 @@ extern void *read_object_with_reference(const unsigned char *sha1,
|
||||
unsigned long *size,
|
||||
unsigned char *sha1_ret);
|
||||
|
||||
enum date_mode { DATE_NORMAL = 0, DATE_RELATIVE, DATE_SHORT, DATE_LOCAL, DATE_ISO8601 };
|
||||
enum date_mode {
|
||||
DATE_NORMAL = 0,
|
||||
DATE_RELATIVE,
|
||||
DATE_SHORT,
|
||||
DATE_LOCAL,
|
||||
DATE_ISO8601,
|
||||
DATE_RFC2822
|
||||
};
|
||||
|
||||
const char *show_date(unsigned long time, int timezone, enum date_mode mode);
|
||||
const char *show_rfc2822_date(unsigned long time, int timezone);
|
||||
int parse_date(const char *date, char *buf, int bufsize);
|
||||
void datestamp(char *buf, int bufsize);
|
||||
unsigned long approxidate(const char *);
|
||||
|
8
commit.c
8
commit.c
@ -585,7 +585,7 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
|
||||
break;
|
||||
case CMIT_FMT_EMAIL:
|
||||
ret += sprintf(buf + ret, "Date: %s\n",
|
||||
show_rfc2822_date(time, tz));
|
||||
show_date(time, tz, DATE_RFC2822));
|
||||
break;
|
||||
case CMIT_FMT_FULLER:
|
||||
ret += sprintf(buf + ret, "%sDate: %s\n", what,
|
||||
@ -778,9 +778,9 @@ static void fill_person(struct interp *table, const char *msg, int len)
|
||||
tz = -tz;
|
||||
}
|
||||
|
||||
interp_set_entry(table, 2, show_date(date, tz, 0));
|
||||
interp_set_entry(table, 3, show_rfc2822_date(date, tz));
|
||||
interp_set_entry(table, 4, show_date(date, tz, 1));
|
||||
interp_set_entry(table, 2, show_date(date, tz, DATE_NORMAL));
|
||||
interp_set_entry(table, 3, show_date(date, tz, DATE_RFC2822));
|
||||
interp_set_entry(table, 4, show_date(date, tz, DATE_RELATIVE));
|
||||
interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601));
|
||||
}
|
||||
|
||||
|
20
date.c
20
date.c
@ -144,6 +144,11 @@ const char *show_date(unsigned long time, int tz, enum date_mode mode)
|
||||
tm->tm_mday,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec,
|
||||
tz);
|
||||
else if (mode == DATE_RFC2822)
|
||||
sprintf(timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
|
||||
weekday_names[tm->tm_wday], tm->tm_mday,
|
||||
month_names[tm->tm_mon], tm->tm_year + 1900,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec, tz);
|
||||
else
|
||||
sprintf(timebuf, "%.3s %.3s %d %02d:%02d:%02d %d%c%+05d",
|
||||
weekday_names[tm->tm_wday],
|
||||
@ -156,21 +161,6 @@ const char *show_date(unsigned long time, int tz, enum date_mode mode)
|
||||
return timebuf;
|
||||
}
|
||||
|
||||
const char *show_rfc2822_date(unsigned long time, int tz)
|
||||
{
|
||||
struct tm *tm;
|
||||
static char timebuf[200];
|
||||
|
||||
tm = time_to_tm(time, tz);
|
||||
if (!tm)
|
||||
return NULL;
|
||||
sprintf(timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
|
||||
weekday_names[tm->tm_wday], tm->tm_mday,
|
||||
month_names[tm->tm_mon], tm->tm_year + 1900,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec, tz);
|
||||
return timebuf;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check these. And note how it doesn't do the summer-time conversion.
|
||||
*
|
||||
|
4
refs.c
4
refs.c
@ -1300,7 +1300,7 @@ int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *
|
||||
if (hashcmp(logged_sha1, sha1)) {
|
||||
fprintf(stderr,
|
||||
"warning: Log %s has gap after %s.\n",
|
||||
logfile, show_rfc2822_date(date, tz));
|
||||
logfile, show_date(date, tz, DATE_RFC2822));
|
||||
}
|
||||
}
|
||||
else if (date == at_time) {
|
||||
@ -1313,7 +1313,7 @@ int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *
|
||||
if (hashcmp(logged_sha1, sha1)) {
|
||||
fprintf(stderr,
|
||||
"warning: Log %s unexpectedly ended on %s.\n",
|
||||
logfile, show_rfc2822_date(date, tz));
|
||||
logfile, show_date(date, tz, DATE_RFC2822));
|
||||
}
|
||||
}
|
||||
munmap(log_mapped, mapsz);
|
||||
|
@ -370,7 +370,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
|
||||
fprintf(stderr,
|
||||
"warning: Log for '%.*s' only goes "
|
||||
"back to %s.\n", len, str,
|
||||
show_rfc2822_date(co_time, co_tz));
|
||||
show_date(co_time, co_tz, DATE_RFC2822));
|
||||
else
|
||||
fprintf(stderr,
|
||||
"warning: Log for '%.*s' only has "
|
||||
|
Loading…
Reference in New Issue
Block a user