X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fparsetime.c;h=8818f1cbe2cb8732d6476f6040bd9c41bbb3cd7d;hb=9cd66f2d7fbf16ca07e1709cd156ae78cd0da278;hp=a2b76eda6a7d67c2e9c5ad133e47bcca9717f47e;hpb=7d0d6b07c9f5bd5dfd99aa7fe9826eebf2181f1f;p=rrdtool.git diff --git a/src/parsetime.c b/src/parsetime.c index a2b76ed..8818f1c 100644 --- a/src/parsetime.c +++ b/src/parsetime.c @@ -232,7 +232,7 @@ static const struct SpecialToken TimeMultipliers[] = { * required for us to be able distinguish between 'mon' as 'month' * and 'mon' as 'monday' */ -static struct SpecialToken *Specials; +static const struct SpecialToken *Specials; static const char **scp; /* scanner - pointer at arglist */ static char scc; /* scanner - count of remaining arguments */ @@ -848,7 +848,7 @@ char *parsetime( ptv->type = ABSOLUTE_TIME; ptv->offset = 0; ptv->tm = *localtime(&now); - ptv->tm. tm_isdst = -1; /* mk time can figure this out for us ... */ + ptv->tm. tm_isdst = -1; /* mk time can figure dst by default ... */ token(); switch (sc_tokid) { @@ -978,8 +978,6 @@ char *parsetime( panic(e("unparsable trailing text: '...%s%s'", sc_token, sct)); } - ptv->tm. tm_isdst = -1; /* for mktime to guess DST status */ - if (ptv->type == ABSOLUTE_TIME) if (mktime(&ptv->tm) == -1) { /* normalize & check */ /* can happen for "nonexistent" times, e.g. around 3am */