mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
9720d23e8c
date_mode_from_type() modifies a static variable and returns a pointer to it. This is not thread-safe. Most callers of date_mode_from_type() use it via the macro DATE_MODE and pass its result on to functions like show_date(), which take a const pointer and don't modify the struct. Avoid the static storage by putting the variable on the stack and returning the whole struct date_mode. Change functions that take a constant pointer to expect the whole struct instead. Reduce the cost of passing struct date_mode around on 64-bit systems by reordering its members to close the hole between the 32-bit wide .type and the 64-bit aligned .strftime_fmt as well as the alignment hole at the end. sizeof reports 24 before and 16 with this change on x64. Keep .type at the top to still allow initialization without designator -- though that's only done in a single location, in builtin/blame.c. Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
2.1 KiB
C
74 lines
2.1 KiB
C
#ifndef DATE_H
|
|
#define DATE_H
|
|
|
|
/**
|
|
* The date mode type. This has DATE_NORMAL at an explicit "= 0" to
|
|
* accommodate a memset([...], 0, [...]) initialization when "struct
|
|
* date_mode" is used as an embedded struct member, as in the case of
|
|
* e.g. "struct pretty_print_context" and "struct rev_info".
|
|
*/
|
|
enum date_mode_type {
|
|
DATE_NORMAL = 0,
|
|
DATE_HUMAN,
|
|
DATE_RELATIVE,
|
|
DATE_SHORT,
|
|
DATE_ISO8601,
|
|
DATE_ISO8601_STRICT,
|
|
DATE_RFC2822,
|
|
DATE_STRFTIME,
|
|
DATE_RAW,
|
|
DATE_UNIX
|
|
};
|
|
|
|
struct date_mode {
|
|
enum date_mode_type type;
|
|
int local;
|
|
const char *strftime_fmt;
|
|
};
|
|
|
|
#define DATE_MODE_INIT { \
|
|
.type = DATE_NORMAL, \
|
|
}
|
|
|
|
/**
|
|
* Convenience helper for passing a constant type, like:
|
|
*
|
|
* show_date(t, tz, DATE_MODE(NORMAL));
|
|
*/
|
|
#define DATE_MODE(t) date_mode_from_type(DATE_##t)
|
|
struct date_mode date_mode_from_type(enum date_mode_type type);
|
|
|
|
/**
|
|
* Format <'time', 'timezone'> into static memory according to 'mode'
|
|
* and return it. The mode is an initialized "struct date_mode"
|
|
* (usually from the DATE_MODE() macro).
|
|
*/
|
|
const char *show_date(timestamp_t time, int timezone, struct date_mode mode);
|
|
|
|
/**
|
|
* Parse a date format for later use with show_date().
|
|
*
|
|
* When the "date_mode_type" is DATE_STRFTIME the "strftime_fmt"
|
|
* member of "struct date_mode" will be a malloc()'d format string to
|
|
* be used with strbuf_addftime(), in which case you'll need to call
|
|
* date_mode_release() later.
|
|
*/
|
|
void parse_date_format(const char *format, struct date_mode *mode);
|
|
|
|
/**
|
|
* Release a "struct date_mode", currently only required if
|
|
* parse_date_format() has parsed a "DATE_STRFTIME" format.
|
|
*/
|
|
void date_mode_release(struct date_mode *mode);
|
|
|
|
void show_date_relative(timestamp_t time, struct strbuf *timebuf);
|
|
int parse_date(const char *date, struct strbuf *out);
|
|
int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset);
|
|
int parse_expiry_date(const char *date, timestamp_t *timestamp);
|
|
void datestamp(struct strbuf *out);
|
|
#define approxidate(s) approxidate_careful((s), NULL)
|
|
timestamp_t approxidate_careful(const char *, int *);
|
|
int date_overflows(timestamp_t date);
|
|
time_t tm_to_time_t(const struct tm *tm);
|
|
#endif
|