parse_timestamp(): specify explicitly where we parse timestamps

Currently, Git's source code represents all timestamps as `unsigned
long`. In preparation for using a more appropriate data type, let's
introduce a symbol `parse_timestamp` (currently being defined to
`strtoul`) where appropriate, so that we can later easily switch to,
say, use `strtoull()` instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/am.c b/builtin/am.c
index f7a7a971fbe762a4fb691e786e86f681f2bbd7c1..2c93adc69c381a58157c60df91de5b019c961f5e 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -882,7 +882,7 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
                        char *end;
 
                        errno = 0;
                        char *end;
 
                        errno = 0;

-                       timestamp = strtoul(str, &end, 10);
+                       timestamp = parse_timestamp(str, &end, 10);

                        if (errno)
                                return error(_("invalid timestamp"));
 
                        if (errno)
                                return error(_("invalid timestamp"));
 

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 3cba3fd278fb05f86ec2e23483261d22bc4c04cd..9a4c2a7ade4486ba5ef4762c7f10ba158e9b7c4b 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -534,7 +534,7 @@ static const char *check_nonce(const char *buf, size_t len)
                retval = NONCE_BAD;
                goto leave;
        }
                retval = NONCE_BAD;
                goto leave;
        }

-       stamp = strtoul(nonce, &bohmac, 10);
+       stamp = parse_timestamp(nonce, &bohmac, 10);

        if (bohmac == nonce || bohmac[0] != '-') {
                retval = NONCE_BAD;
                goto leave;
        if (bohmac == nonce || bohmac[0] != '-') {
                retval = NONCE_BAD;
                goto leave;


@@ -552,7 +552,7 @@ static const char *check_nonce(const char *buf, size_t len)
         * would mean it was issued by another server with its clock
         * skewed in the future.
         */
         * would mean it was issued by another server with its clock
         * skewed in the future.
         */

-       ostamp = strtoul(push_cert_nonce, NULL, 10);
+       ostamp = parse_timestamp(push_cert_nonce, NULL, 10);

        nonce_stamp_slop = (long)ostamp - (long)stamp;
 
        if (nonce_stamp_slop_limit &&
        nonce_stamp_slop = (long)ostamp - (long)stamp;
 
        if (nonce_stamp_slop_limit &&

diff --git a/bundle.c b/bundle.c
index bbf4efa0a0a38ac8f13ee1c2178eff1d2127c802..f43bfcf5ff3a4a4b758b5b50bdc2eb43543aa274 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -227,7 +227,7 @@ static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
        line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
        if (!line++)
                goto out;
        line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
        if (!line++)
                goto out;

-       date = strtoul(line, NULL, 10);
+       date = parse_timestamp(line, NULL, 10);

        result = (revs->max_age == -1 || revs->max_age < date) &&
                (revs->min_age == -1 || revs->min_age > date);
 out:
        result = (revs->max_age == -1 || revs->max_age < date) &&
                (revs->min_age == -1 || revs->min_age > date);
 out:

diff --git a/commit.c b/commit.c
index 73c78c2b80c1a21e83f1942347a76fb76511a0d3..0d2d0fa1984683655b64aa7cf6637631f5e922f8 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -89,8 +89,8 @@ static unsigned long parse_commit_date(const char *buf, const char *tail)
                /* nada */;
        if (buf >= tail)
                return 0;
                /* nada */;
        if (buf >= tail)
                return 0;

-       /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
-       return strtoul(dateptr, NULL, 10);
+       /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
+       return parse_timestamp(dateptr, NULL, 10);

 }
 
 static struct commit_graft **commit_graft;
 }
 
 static struct commit_graft **commit_graft;


@@ -607,7 +607,7 @@ static void record_author_date(struct author_date_slab *author_date,
            !ident.date_begin || !ident.date_end)
                goto fail_exit; /* malformed "author" line */
 
            !ident.date_begin || !ident.date_end)
                goto fail_exit; /* malformed "author" line */
 

-       date = strtoul(ident.date_begin, &date_end, 10);
+       date = parse_timestamp(ident.date_begin, &date_end, 10);

        if (date_end != ident.date_end)
                goto fail_exit; /* malformed date */
        *(author_date_slab_at(author_date, commit)) = date;
        if (date_end != ident.date_end)
                goto fail_exit; /* malformed date */
        *(author_date_slab_at(author_date, commit)) = date;

diff --git a/date.c b/date.c
index a996331f5b33703c9f70844c6b49453ec39d16a7..495c207c64f5bced30661991d4c46edeadfa1184 100644 (file)
--- a/date.c
+++ b/date.c
@@ -510,7 +510,7 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
        char *end;
        unsigned long num;
 
        char *end;
        unsigned long num;
 

-       num = strtoul(date, &end, 10);
+       num = parse_timestamp(date, &end, 10);

 
        /*
         * Seconds since 1970? We trigger on that for any numbers with
 
        /*
         * Seconds since 1970? We trigger on that for any numbers with


@@ -658,7 +658,7 @@ static int match_object_header_date(const char *date, unsigned long *timestamp,
 
        if (*date < '0' || '9' < *date)
                return -1;
 
        if (*date < '0' || '9' < *date)
                return -1;

-       stamp = strtoul(date, &end, 10);
+       stamp = parse_timestamp(date, &end, 10);

        if (*end != ' ' || stamp == ULONG_MAX || (end[1] != '+' && end[1] != '-'))
                return -1;
        date = end + 2;
        if (*end != ' ' || stamp == ULONG_MAX || (end[1] != '+' && end[1] != '-'))
                return -1;
        date = end + 2;


@@ -1066,7 +1066,7 @@ static const char *approxidate_digit(const char *date, struct tm *tm, int *num,
                                     time_t now)
 {
        char *end;
                                     time_t now)
 {
        char *end;

-       unsigned long number = strtoul(date, &end, 10);
+       unsigned long number = parse_timestamp(date, &end, 10);

 
        switch (*end) {
        case ':':
 
        switch (*end) {
        case ':':

diff --git a/fsck.c b/fsck.c
index e6152e4e6d426bd92ae7ae063346f25f85ddd8de..d589341cddfa2b76bc8c5ee0f66a6b745883126b 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -691,7 +691,7 @@ static int fsck_ident(const char **ident, struct object *obj, struct fsck_option
        p++;
        if (*p == '0' && p[1] != ' ')
                return report(options, obj, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date");
        p++;
        if (*p == '0' && p[1] != ' ')
                return report(options, obj, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date");

-       if (date_overflows(strtoul(p, &end, 10)))
+       if (date_overflows(parse_timestamp(p, &end, 10)))

                return report(options, obj, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow");
        if ((end == p || *end != ' '))
                return report(options, obj, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date");
                return report(options, obj, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow");
        if ((end == p || *end != ' '))
                return report(options, obj, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date");

diff --git a/git-compat-util.h b/git-compat-util.h
index 8a4a3f85e7ba0a658420c477e1af82e804d7fd36..fc1b5fe1a6c89be9415fa5688fa23dde53eedbf7 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -319,6 +319,8 @@ extern char *gitdirname(char *);
 #define PRIo32 "o"
 #endif
 
 #define PRIo32 "o"
 #endif
 

+#define parse_timestamp strtoul
+

 #ifndef PATH_SEP
 #define PATH_SEP ':'
 #endif
 #ifndef PATH_SEP
 #define PATH_SEP ':'
 #endif

diff --git a/pretty.c b/pretty.c
index d0f86f5d85cab6c470871cdd6e5ead526259bf6a..24fb0c790626e61ee3b0c6680c91d06c5d0b00df 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -409,7 +409,7 @@ const char *show_ident_date(const struct ident_split *ident,
        long tz = 0;
 
        if (ident->date_begin && ident->date_end)
        long tz = 0;
 
        if (ident->date_begin && ident->date_end)

-               date = strtoul(ident->date_begin, NULL, 10);
+               date = parse_timestamp(ident->date_begin, NULL, 10);

        if (date_overflows(date))
                date = 0;
        else {
        if (date_overflows(date))
                date = 0;
        else {

diff --git a/ref-filter.c b/ref-filter.c
index 9287126600168c07e3b73e21b9222c4b017caede..c7836ae07bd7a5197905b897a43a0f0161923a39 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -868,7 +868,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam
 
        if (!eoemail)
                goto bad;
 
        if (!eoemail)
                goto bad;

-       timestamp = strtoul(eoemail + 2, &zone, 10);
+       timestamp = parse_timestamp(eoemail + 2, &zone, 10);

        if (timestamp == ULONG_MAX)
                goto bad;
        tz = strtol(zone, NULL, 10);
        if (timestamp == ULONG_MAX)
                goto bad;
        tz = strtol(zone, NULL, 10);

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 4d705b4037e6c1c0c1f2e277e9a5ef5bce695e61..dae0522673b9eebb34a60b3b346c0f7dac4b9083 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3247,7 +3247,7 @@ static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *c
            parse_oid_hex(p, &noid, &p) || *p++ != ' ' ||
            !(email_end = strchr(p, '>')) ||
            email_end[1] != ' ' ||
            parse_oid_hex(p, &noid, &p) || *p++ != ' ' ||
            !(email_end = strchr(p, '>')) ||
            email_end[1] != ' ' ||

-           !(timestamp = strtoul(email_end + 2, &message, 10)) ||
+           !(timestamp = parse_timestamp(email_end + 2, &message, 10)) ||

            !message || message[0] != ' ' ||
            (message[1] != '+' && message[1] != '-') ||
            !isdigit(message[2]) || !isdigit(message[3]) ||
            !message || message[0] != ' ' ||
            (message[1] != '+' && message[1] != '-') ||
            !isdigit(message[2]) || !isdigit(message[3]) ||

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index ac7c66c733b5294249873e40a4491cb4ce1e4306..52d1fc344541bcff48b532a22abc33884261d058 100644 (file)
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -34,7 +34,7 @@ static void show_dates(const char **argv, const char *format)
                 * Do not use our normal timestamp parsing here, as the point
                 * is to test the formatting code in isolation.
                 */
                 * Do not use our normal timestamp parsing here, as the point
                 * is to test the formatting code in isolation.
                 */

-               t = strtol(*argv, &arg, 10);
+               t = parse_timestamp(*argv, &arg, 10);

                while (*arg == ' ')
                        arg++;
                tz = atoi(arg);
                while (*arg == ' ')
                        arg++;
                tz = atoi(arg);

diff --git a/tag.c b/tag.c
index 243d1fdbbcb1424b0082e1c999920f6a50b32d68..9b6725e02c9c84d34d5806746d705cb5ca32b479 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -110,8 +110,8 @@ static unsigned long parse_tag_date(const char *buf, const char *tail)
                /* nada */;
        if (buf >= tail)
                return 0;
                /* nada */;
        if (buf >= tail)
                return 0;

-       /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
-       return strtoul(dateptr, NULL, 10);
+       /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
+       return parse_timestamp(dateptr, NULL, 10);

 }
 
 int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
 }
 
 int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)

diff --git a/upload-pack.c b/upload-pack.c
index ffb028d6231e24877b5b6af616d0c3de59516d95..f17f4dd1233c6d0a3625d782098dbcef3e3e7667 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -775,7 +775,7 @@ static void receive_needs(void)
                }
                if (skip_prefix(line, "deepen-since ", &arg)) {
                        char *end = NULL;
                }
                if (skip_prefix(line, "deepen-since ", &arg)) {
                        char *end = NULL;

-                       deepen_since = strtoul(arg, &end, 0);
+                       deepen_since = parse_timestamp(arg, &end, 0);

                        if (!end || *end || !deepen_since ||
                            /* revisions.c's max_age -1 is special */
                            deepen_since == -1)
                        if (!end || *end || !deepen_since ||
                            /* revisions.c's max_age -1 is special */
                            deepen_since == -1)