Merge branch 'u/fanf2/werror-maybe-uninitialized' into 'master'
Appease -Werror=maybe-uninitialized before calling strtok_r() See merge request isc-projects/bind9!198
This commit is contained in:
@@ -3122,10 +3122,12 @@ render_xsl(const char *url, isc_httpdurl_t *urlinfo,
|
||||
const char *if_modified_since = "If-Modified-Since: ";
|
||||
_headers = strdup(headers);
|
||||
|
||||
saveptr = NULL;
|
||||
for (line = strtok_r(_headers, "\n", &saveptr);
|
||||
line;
|
||||
line = strtok_r(NULL, "\n", &saveptr)) {
|
||||
if (strncasecmp(line, if_modified_since, strlen(if_modified_since)) == 0) {
|
||||
if (strncasecmp(line, if_modified_since,
|
||||
strlen(if_modified_since)) == 0) {
|
||||
time_t t1, t2;
|
||||
line += strlen(if_modified_since);
|
||||
result = isc_time_parsehttptimestamp(line, &when);
|
||||
|
||||
@@ -1070,6 +1070,7 @@ set_order(int family, int (**net_order)(const char *, int, struct addrinfo **,
|
||||
} else {
|
||||
order = getenv("NET_ORDER");
|
||||
found = 0;
|
||||
last = NULL;
|
||||
for (tok = strtok_r(order, ":", &last);
|
||||
tok;
|
||||
tok = strtok_r(NULL, ":", &last))
|
||||
|
||||
Reference in New Issue
Block a user