Fix -Wunsequenced

Submitted by:	dt71@gmx.com
This commit is contained in:
Tim Kientzle 2013-06-29 15:58:03 +00:00
parent 1d47232e08
commit 8f95d0d822

View File

@ -1083,7 +1083,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
* at any time, etc).
*/
if (strcasecmp(DEBUG_MARKER, q) == 0) {
q = parse = missing_field(sob(++parse), errline);
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
if (!*parse)
warnx("debug line specifies no option:\n%s",
@ -1096,7 +1096,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
} else if (strcasecmp(INCLUDE_MARKER, q) == 0) {
if (verbose)
printf("Found: %s", errline);
q = parse = missing_field(sob(++parse), errline);
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
if (!*parse) {
warnx("include line missing argument:\n%s",
@ -1138,7 +1138,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
defconf_p = working;
}
q = parse = missing_field(sob(++parse), errline);
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
if (!*parse)
errx(1, "malformed line (missing fields):\n%s",
@ -1172,7 +1172,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
} else
working->gid = (gid_t)-1;
q = parse = missing_field(sob(++parse), errline);
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
if (!*parse)
errx(1, "malformed line (missing fields):\n%s",
@ -1187,7 +1187,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
errx(1, "error in config file; bad permissions:\n%s",
errline);
q = parse = missing_field(sob(++parse), errline);
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
if (!*parse)
errx(1, "malformed line (missing fields):\n%s",
@ -1197,7 +1197,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
errx(1, "error in config file; bad value for count of logs to save:\n%s",
errline);
q = parse = missing_field(sob(++parse), errline);
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
if (!*parse)
errx(1, "malformed line (missing fields):\n%s",
@ -1215,7 +1215,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
working->flags = 0;
working->compress = COMPRESS_NONE;
q = parse = missing_field(sob(++parse), errline);
q = parse = missing_field(sob(parse + 1), errline);
parse = son(parse);
eol = !*parse;
*parse = '\0';
@ -1257,7 +1257,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
if (eol)
q = NULL;
else {
q = parse = sob(++parse); /* Optional field */
q = parse = sob(parse + 1); /* Optional field */
parse = son(parse);
if (!*parse)
eol = 1;
@ -1327,7 +1327,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
if (eol)
q = NULL;
else {
q = parse = sob(++parse); /* Optional field */
q = parse = sob(parse + 1); /* Optional field */
parse = son(parse);
if (!*parse)
eol = 1;
@ -1348,7 +1348,7 @@ parse_file(FILE *cf, struct cflist *work_p, struct cflist *glob_p,
if (eol)
q = NULL;
else {
q = parse = sob(++parse); /* Optional field */
q = parse = sob(parse + 1); /* Optional field */
*(parse = son(parse)) = '\0';
}