From: Karel Zak Date: Thu, 3 Jun 2010 14:59:20 +0000 (+0200) Subject: libmount: fix some gtkdoc warnings X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6fead1e31aa1b76fc8fd701681a29a8bac58f96;p=util-linux libmount: fix some gtkdoc warnings Signed-off-by: Karel Zak --- diff --git a/shlibs/mount/docs/Makefile.am b/shlibs/mount/docs/Makefile.am index a50390b0..13e1c655 100644 --- a/shlibs/mount/docs/Makefile.am +++ b/shlibs/mount/docs/Makefile.am @@ -59,7 +59,7 @@ EXTRA_HFILES= # Header files to ignore when scanning. Use base file name, no paths # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES=mountP.h list.h partitions.h superblocks.h topology.h aix.h dos.h +IGNORE_HFILES=mountP.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/shlibs/mount/docs/libmount-sections.txt b/shlibs/mount/docs/libmount-sections.txt index b791c9aa..59cdf47d 100644 --- a/shlibs/mount/docs/libmount-sections.txt +++ b/shlibs/mount/docs/libmount-sections.txt @@ -133,8 +133,8 @@ mnt_fs_get_fstype mnt_fs_set_fstype mnt_fs_get_optstr mnt_fs_set_optstr -mnt_fs_get_optfs -mnt_fs_get_optvfs +mnt_fs_get_fs_optstr +mnt_fs_get_vfs_optstr mnt_fs_get_freq mnt_fs_set_freq mnt_fs_get_passno diff --git a/shlibs/mount/src/fs.c b/shlibs/mount/src/fs.c index 56a3b977..851c5f9b 100644 --- a/shlibs/mount/src/fs.c +++ b/shlibs/mount/src/fs.c @@ -353,6 +353,10 @@ int mnt_fs_set_optstr(mnt_fs *fs, const char *optstr) free(fs->vfs_optstr); fs->fs_optstr = fs->vfs_optstr = NULL; + /* TODO: it would be possible to use built-in maps of options + * and differentiate between VFS and FS options, then we can + * set fs_optstr and vfs_optstr */ + fs->optstr = p; return 0;