Commit cb914ab53fd474fd5cf92ae8c783a838a51f147f
2013-08-30T16:26:00
Change ok testing logic in breakdown() in bflsc and return if not ok at any stage.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/driver-bflsc.c b/driver-bflsc.c
index abbe809..423832e 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -142,7 +142,7 @@ enum breakmode {
static bool breakdown(enum breakmode mode, char *buf, int *count, char **firstname, char ***fields, char **lf)
{
char *ptr, *colon, *comma;
- bool ok;
+ bool ok = false;
#define p_count (*count)
#define p_firstname (*firstname)
@@ -155,7 +155,7 @@ static bool breakdown(enum breakmode mode, char *buf, int *count, char **firstna
p_lf = NULL;
if (!buf || !(*buf))
- return false;
+ return ok;
ptr = p_firstname = strdup(buf);
p_lf = strchr(p_firstname, '\n');
@@ -165,20 +165,19 @@ static bool breakdown(enum breakmode mode, char *buf, int *count, char **firstna
ptr = colon;
*(ptr++) = '\0';
} else
- ok = false;
+ return ok;
}
while (*ptr == ' ')
ptr++;
- ok = true;
while (ptr && *ptr) {
if (mode == ALLCOLON) {
colon = strchr(ptr, ':');
if (colon)
ptr = colon + 1;
else
- ok = false;
+ return ok;
}
while (*ptr == ' ')
ptr++;
@@ -192,6 +191,7 @@ static bool breakdown(enum breakmode mode, char *buf, int *count, char **firstna
ptr = comma;
}
+ ok = true;
return ok;
}