lftok(): Refactor, collapse and simplify a bit

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

src/lfile.c

@@ -92,23 +92,20 @@ char *lftok(lfile_t *lf)
 	}
 
 	token = strtok_r(NULL, lf->sep, &lf->save);
-	if (!token) {
+	if (token)
-		while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) {
+		return token;
-			if (lf->buf[0] == '#')
-				continue;
 
-			token = strtok_r(lf->buf, lf->sep, &lf->save);
+	while (fgets(lf->buf, sizeof(lf->buf), lf->fp)) {
-			if (!token)
+		if (lf->buf[0] == '#')
-				continue;
+			continue;
-			
+
+		token = strtok_r(lf->buf, lf->sep, &lf->save);
+		if (token)
 			return token;
-		}
-
-		errno = ENOENT;
-		return NULL;
 	}
 
-	return token;
+	errno = ENOENT;
+	return NULL;
 }
 
 /**