summaryrefslogtreecommitdiffstats
path: root/shlibs/mount/src/tab.c
diff options
context:
space:
mode:
authorKarel Zak2010-10-18 14:19:21 +0200
committerKarel Zak2011-01-03 12:28:45 +0100
commitc3b0d5b37b64fb7c259f92e103fd73bdea6807fe (patch)
treedb5422745f82d71123d37cac0321cc6c78ad0430 /shlibs/mount/src/tab.c
parenttests: add libmount optstr.c tests (diff)
downloadkernel-qcow2-util-linux-c3b0d5b37b64fb7c259f92e103fd73bdea6807fe.tar.gz
kernel-qcow2-util-linux-c3b0d5b37b64fb7c259f92e103fd73bdea6807fe.tar.xz
kernel-qcow2-util-linux-c3b0d5b37b64fb7c259f92e103fd73bdea6807fe.zip
libmount: cleanup fstab parser, improve mnt_tab errcb usage
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount/src/tab.c')
-rw-r--r--shlibs/mount/src/tab.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/shlibs/mount/src/tab.c b/shlibs/mount/src/tab.c
index 2b6802708..97e4d1661 100644
--- a/shlibs/mount/src/tab.c
+++ b/shlibs/mount/src/tab.c
@@ -691,10 +691,11 @@ mnt_fs *mnt_tab_find_pair(mnt_tab *tb, const char *source,
#ifdef TEST_PROGRAM
-static int parser_errcb(mnt_tab *tb, const char *filename, int line, int flag)
+static int parser_errcb(mnt_tab *tb, const char *filename, int line)
{
fprintf(stderr, "%s:%d: parse error\n", filename, line);
- return 0;
+
+ return 1; /* all errors are recoverable -- this is default */
}
mnt_tab *create_tab(const char *file)
@@ -713,6 +714,7 @@ mnt_tab *create_tab(const char *file)
goto err;
return tb;
err:
+ fprintf(stderr, "%s: parsing failed\n", file);
mnt_free_tab(tb);
return NULL;
}