summaryrefslogtreecommitdiffstats
path: root/lib/blkid/read.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-21 04:59:34 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-21 04:59:34 +0000
commit6187d406bede6461086d6e5263f42ae4826675c4 (patch)
tree32a35120c4385929cfd5a7b9c584b9dd8396b108 /lib/blkid/read.c
parentReleasing progress-linux version 1.47.0-2.4~progress7.99u1. (diff)
downloade2fsprogs-6187d406bede6461086d6e5263f42ae4826675c4.tar.xz
e2fsprogs-6187d406bede6461086d6e5263f42ae4826675c4.zip
Merging upstream version 1.47.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/blkid/read.c')
-rw-r--r--lib/blkid/read.c9
1 files changed, 6 insertions, 3 deletions
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) {