From 1d21b11802df2becacddc4a80ec86ef54f7702e8 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Fri, 22 Dec 2017 10:56:32 +0100 Subject: [PATCH] lftok(): Refactor, collapse and simplify a bit Signed-off-by: Joachim Nilsson --- src/lfile.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/lfile.c b/src/lfile.c index 920c91c..7c0213a 100644 --- a/src/lfile.c +++ b/src/lfile.c @@ -92,23 +92,20 @@ char *lftok(lfile_t *lf) } token = strtok_r(NULL, lf->sep, &lf->save); - if (!token) { - while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) { - if (lf->buf[0] == '#') - continue; + if (token) + return token; - token = strtok_r(lf->buf, lf->sep, &lf->save); - if (!token) - continue; - + while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) { + if (lf->buf[0] == '#') + continue; + + token = strtok_r(lf->buf, lf->sep, &lf->save); + if (token) return token; - } - - errno = ENOENT; - return NULL; } - return token; + errno = ENOENT; + return NULL; } /**