From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 28 Mar 2024 17:33:04 +0000 (-0400)
Subject: blkid: fix -Wunused-but-set-variable warning in blkid_read_cache()
X-Git-Tag: v1.47.1-rc1~52^2~3
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=33ee0c8b22d4fba069d0393847c84eba545ec01c;p=tools%2Fe2fsprogs.git

blkid: fix -Wunused-but-set-variable warning in blkid_read_cache()

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/lib/blkid/blkidP.h b/lib/blkid/blkidP.h
index 68ea572..dad8bfb 100644
--- a/lib/blkid/blkidP.h
+++ b/lib/blkid/blkidP.h
@@ -152,8 +152,10 @@ extern char *blkid_strndup(const char *s, const int length);
 #include <stdio.h>
 extern int	blkid_debug_mask;
 #define DBG(m,x)	if ((m) & blkid_debug_mask) x;
+#define INC_LINENO	lineno++
 #else
 #define DBG(m,x)
+#define INC_LINENO
 #endif
 
 #ifdef CONFIG_BLKID_DEBUG
diff --git a/lib/blkid/read.c b/lib/blkid/read.c
index b894856..ad4f44f 100644
--- a/lib/blkid/read.c
+++ b/lib/blkid/read.c
@@ -382,7 +382,10 @@ void blkid_read_cache(blkid_cache cache)
 {
 	FILE *file;
 	char buf[4096];
-	int fd, lineno = 0;
+	int fd;
+#ifdef CONFIG_BLKID_DEBUG
+	int lineno = 0;
+#endif
 	struct stat st;
 
 	if (!cache)
@@ -414,7 +417,7 @@ void blkid_read_cache(blkid_cache cache)
 		blkid_dev dev;
 		unsigned int end;
 
-		lineno++;
+		INC_LINENO;
 		if (buf[0] == 0)
 			continue;
 		end = strlen(buf) - 1;
@@ -422,7 +425,7 @@ void blkid_read_cache(blkid_cache cache)
 		while (buf[end] == '\\' && end < sizeof(buf) - 2 &&
 		       fgets(buf + end, sizeof(buf) - end, file)) {
 			end = strlen(buf) - 1;
-			lineno++;
+			INC_LINENO;
 		}
 
 		if (blkid_parse_line(cache, &dev, buf) < 0) {