hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified the code in parse_time.

Browse Source
This commit is contained in:
Markus Makela
2015-09-22 20:57:37 +03:00
parent f021d42820
commit abab715a21
1 changed files with 26 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
server/modules/filter/dbfwfilter.c
View File

@ -472,6 +472,7 @@ bool check_time(char* str)
#endif #endif
#define IS_RVRS_TIME(tr) (mktime(&tr->end) < mktime(&tr->start)) #define IS_RVRS_TIME(tr) (mktime(&tr->end) < mktime(&tr->start))
/** /**
* Parses a null-terminated string into a timerange defined by two ISO-8601 compliant * Parses a null-terminated string into a timerange defined by two ISO-8601 compliant
* times separated by a single dash. The times are interpreted at one second precision * times separated by a single dash. The times are interpreted at one second precision
@ -485,83 +486,40 @@ bool check_time(char* str)
TIMERANGE* parse_time(char* str, FW_INSTANCE* instance) TIMERANGE* parse_time(char* str, FW_INSTANCE* instance)
{ {
assert(str != NULL && instance != NULL); assert(str != NULL && instance != NULL);
char strbuf[strlen(str) + 1]; char strbuf[strlen(str) + 1];
char *tok, *saved, *numend; char *separator;
struct tm start, end; struct tm start, end;
TIMERANGE* tr = NULL;
memset(&start,0,sizeof(struct tm));
memset(&end,0,sizeof(struct tm));
strncpy(strbuf, str, sizeof(strbuf)); strncpy(strbuf, str, sizeof(strbuf));
/** Process the start of the timerange */ if ((separator = strchr(strbuf, '-')))
if((tok = strtok_r(strbuf, "-: ", &saved)) == NULL) {
return NULL; *separator++ = '\0';
if (strptime(strbuf, "%H:%M:%S", &start) &&
strptime(separator, "%H:%M:%S", &end))
{
CHK_TIMES((&start));
CHK_TIMES((&end));
start.tm_hour = strtol(tok, &numend, 10); /** The time string was valid */
if(*numend != '\0') tr = (TIMERANGE*) malloc(sizeof(TIMERANGE));
return NULL;
if((tok = strtok_r(NULL, "-: ", &saved)) == NULL) if (tr == NULL)
return NULL; {
skygw_log_write(LOGFILE_ERROR, "dbfwfilter: malloc returned NULL.");
return NULL;
}
start.tm_min = strtol(tok, &numend, 10); memcpy(&tr->start, &start, sizeof(start));
memcpy(&tr->end, &end, sizeof(end));
if(*numend != '\0') tr->next = NULL;
return NULL; }
}
if((tok = strtok_r(NULL, "-: ", &saved)) == NULL) return tr;
return NULL;
start.tm_sec = strtol(tok, &numend, 10);
if(*numend != '\0')
return NULL;
/** Process the end of the timerange */
if((tok = strtok_r(NULL, "-: ", &saved)) == NULL)
return NULL;
start.tm_hour = strtol(tok, &numend, 10);
if(*numend != '\0')
return NULL;
if((tok = strtok_r(NULL, "-: ", &saved)) == NULL)
return NULL;
start.tm_min = strtol(tok, &numend, 10);
if(*numend != '\0')
return NULL;
if((tok = strtok_r(NULL, "-: ", &saved)) == NULL)
return NULL;
start.tm_sec = strtol(tok, &numend, 10);
if(*numend != '\0')
return NULL;
CHK_TIMES((&start));
CHK_TIMES((&end));
/** The time string was valid */
TIMERANGE* tr = (TIMERANGE*)malloc(sizeof(TIMERANGE));
if(tr == NULL){
skygw_log_write(LOGFILE_ERROR, "dbfwfilter: malloc returned NULL.");
return NULL;
}
memcpy(&tr->start, &start, sizeof(start));
memcpy(&tr->end, &end, sizeof(end));
tr->next = NULL;
return tr;
} }
/** /**