lftok(): Refactor, collapse and simplify a bit

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

src/lfile.c

@@ -92,15 +92,15 @@ char *lftok(lfile_t *lf)
 	}
 
 	token = strtok_r(NULL, lf->sep, &lf->save);
-	if (!token) {
+	if (token)
+		return token;
+
 	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)
+		if (token)
-				continue;
-			
 			return token;
 	}
 
@@ -108,9 +108,6 @@ char *lftok(lfile_t *lf)
 	return NULL;
 }
 
-	return token;
-}
-
 /**
  * lfgetkey - Find key in file
  * @lf:  Pointer to &lfile_t context from lfopen()