|
@@ -335,20 +335,20 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
|
|
|
|
|
|
|
|
while (1) {
|
|
while (1) {
|
|
|
/* Strip any leading space */
|
|
/* Strip any leading space */
|
|
|
- for (varlist; isspace(varlist[0]); varlist++);
|
|
|
|
|
|
|
+ for (; isspace(varlist[0]); varlist++);
|
|
|
|
|
|
|
|
if (!strncmp(name, varlist, strlen(name))) {
|
|
if (!strncmp(name, varlist, strlen(name))) {
|
|
|
varlist += strlen(name);
|
|
varlist += strlen(name);
|
|
|
/* strip trailing spaces */
|
|
/* strip trailing spaces */
|
|
|
- for (varlist; isspace(varlist[0]); varlist++);
|
|
|
|
|
|
|
+ for (; isspace(varlist[0]); varlist++);
|
|
|
|
|
|
|
|
if (varlist[0] == '=') {
|
|
if (varlist[0] == '=') {
|
|
|
/* We matched the key, go past the = sign */
|
|
/* We matched the key, go past the = sign */
|
|
|
varlist++;
|
|
varlist++;
|
|
|
/* strip leading spaces */
|
|
/* strip leading spaces */
|
|
|
- for (varlist; isspace(varlist[0]); varlist++);
|
|
|
|
|
|
|
+ for (; isspace(varlist[0]); varlist++);
|
|
|
|
|
|
|
|
- if (tmp = index(varlist, sep)) {
|
|
|
|
|
|
|
+ if ((tmp = index(varlist, sep))) {
|
|
|
/* Value is delimited by a comma */
|
|
/* Value is delimited by a comma */
|
|
|
if (tmp-varlist == 0) continue;
|
|
if (tmp-varlist == 0) continue;
|
|
|
value = (char *)calloc(1, tmp-varlist+1);
|
|
value = (char *)calloc(1, tmp-varlist+1);
|
|
@@ -364,7 +364,7 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (tmp = index(varlist, sep)) {
|
|
|
|
|
|
|
+ if ((tmp = index(varlist, sep))) {
|
|
|
/* More keys, keep going... */
|
|
/* More keys, keep going... */
|
|
|
varlist = tmp + 1;
|
|
varlist = tmp + 1;
|
|
|
} else {
|
|
} else {
|