X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fparsetime.c;h=4c0f089bac9bfdc9e21ac88a1780c1a7d03f67d9;hb=82336d4b8f2f2227e733cf3078378ed87fd6e79c;hp=71af06572a64b9d6183566c7cf52a287eec11ec4;hpb=657d850f957a2dd703e3aab2d7cde4b0f9711c15;p=rrdtool.git diff --git a/src/parsetime.c b/src/parsetime.c index 71af065..4c0f089 100644 --- a/src/parsetime.c +++ b/src/parsetime.c @@ -139,7 +139,7 @@ struct SpecialToken { char *name; /* token name */ int value; /* token id */ }; -static struct SpecialToken VariousWords[] = { +static const struct SpecialToken VariousWords[] = { {"midnight", MIDNIGHT}, /* 00:00:00 of today or tomorrow */ {"noon", NOON}, /* 12:00:00 of today or tomorrow */ {"teatime", TEATIME}, /* 16:00:00 of today or tomorrow */ @@ -196,7 +196,7 @@ static struct SpecialToken VariousWords[] = { {NULL, 0} /*** SENTINEL ***/ }; -static struct SpecialToken TimeMultipliers[] = { +static const struct SpecialToken TimeMultipliers[] = { {"second", SECONDS}, /* seconds multiplier */ {"seconds", SECONDS}, /* (pluralized) */ {"sec", SECONDS}, /* (generic) */ @@ -232,7 +232,7 @@ static 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 */ @@ -326,10 +326,8 @@ static char *e( greater than zero if S1 is lexicographically less than, equal to or greater than S2. -- copied from GNU libc*/ static int mystrcasecmp( - s1, - s2) - const char *s1; - const char *s2; + const char *s1, + const char *s2) { const unsigned char *p1 = (const unsigned char *) s1; const unsigned char *p2 = (const unsigned char *) s2; @@ -391,7 +389,7 @@ static char *init_scanner( * token() fetches a token from the input stream */ static int token( - ) + void) { int idx;