libmount: cleanup API, remove typedef

 - replace mnt_ with libmnt_ prefix for types (the old prefix was too generic)
 - remove typedef, use struct everywhere
 - use shorter functions names (s/userspace/user/; s/mountflags/mflags/)

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 226 insertions, 198 deletions

diff --git a/shlibs/mount/src/libmount.h.in b/shlibs/mount/src/libmount.h.in
index 819bdddff..86a618850 100644
--- a/shlibs/mount/src/libmount.h.in
+++ b/shlibs/mount/src/libmount.h.in
@@ -36,32 +36,32 @@ extern "C" {
 #define LIBMOUNT_VERSION   "@LIBMOUNT_VERSION@"
 
 /**
- * mnt_cache:
+ * libmnt_cache:
  *
  * Stores canonicalized paths and evaluated tags
  */
-typedef struct _mnt_cache mnt_cache;
+struct libmnt_cache;
 
 /**
- * mnt_lock:
+ * libmnt_lock:
  *
  * Stores information about locked file (e.g. /etc/mtab)
  */
-typedef struct _mnt_lock mnt_lock;
+struct libmnt_lock;
 
 /**
- * mnt_iter:
+ * libmnt_iter:
  *
  * Generic iterator (stores state about lists)
  */
-typedef struct _mnt_iter mnt_iter;
+struct libmnt_iter;
 
 /**
- * mnt_optmap:
+ * libmnt_optmap:
  *
  * Mount options description (map)
  */
-struct mnt_optmap
+struct libmnt_optmap
 {
 	const char	*name;	 /* option name[=%<type>] (e.g. "loop[=%s]") */
 	int		id;	 /* option ID or MS_* flags (e.g MS_RDONLY) */
@@ -75,32 +75,32 @@ struct mnt_optmap
 #define MNT_NOMTAB	(1 << 2) /* skip in the mtab option string */
 
 /**
- * mnt_fs:
+ * libmnt_fs:
  *
  * Parsed fstab/mtab/mountinfo entry
  */
-typedef struct _mnt_fs mnt_fs;
+struct libmnt_fs;
 
 /**
- * mnt_tab:
+ * libmnt_table:
  *
- * List of mnt_fs entries (parsed fstab/mtab/mountinfo)
+ * List of struct libmnt_fs entries (parsed fstab/mtab/mountinfo)
  */
-typedef struct _mnt_tab mnt_tab;
+struct libmnt_table;
 
 /**
- * mnt_update
+ * libmnt_update
  *
  * /etc/mtab or /dev/.mount/utab update description
  */
-typedef struct _mnt_update mnt_update;
+struct libmnt_update;
 
 /**
- * mnt_context
+ * libmnt_context
  *
  * Mount/umount status
  */
-typedef struct _mnt_context mnt_context;
+struct libmnt_context;
 
 /*
  * Actions
@@ -129,19 +129,23 @@ extern const char *mnt_get_mtab_path(void);
 extern int mnt_has_regular_mtab(const char **mtab, int *writable);
 
 /* cache.c */
-extern mnt_cache *mnt_new_cache(void);
-extern void mnt_free_cache(mnt_cache *cache);
-extern int mnt_cache_read_tags(mnt_cache *cache, const char *devname);
-extern int mnt_cache_device_has_tag(mnt_cache *cache, const char *devname,
-                                const char *token, const char *value);
+extern struct libmnt_cache *mnt_new_cache(void);
+extern void mnt_free_cache(struct libmnt_cache *cache);
+extern int mnt_cache_read_tags(struct libmnt_cache *cache, const char *devname);
+extern int mnt_cache_device_has_tag(struct libmnt_cache *cache,
+				const char *devname,
+                                const char *token,
+				const char *value);
 
-extern char *mnt_cache_find_tag_value(mnt_cache *cache,
+extern char *mnt_cache_find_tag_value(struct libmnt_cache *cache,
 				const char *devname, const char *token);
 
-extern char *mnt_get_fstype(const char *devname, int *ambi, mnt_cache *cache);
-extern char *mnt_resolve_path(const char *path, mnt_cache *cache);
-extern char *mnt_resolve_tag(const char *token, const char *value, mnt_cache *cache);
-extern char *mnt_resolve_spec(const char *spec, mnt_cache *cache);
+extern char *mnt_get_fstype(const char *devname, int *ambi,
+			    struct libmnt_cache *cache);
+extern char *mnt_resolve_path(const char *path, struct libmnt_cache *cache);
+extern char *mnt_resolve_tag(const char *token, const char *value,
+			     struct libmnt_cache *cache);
+extern char *mnt_resolve_spec(const char *spec, struct libmnt_cache *cache);
 
 /* optstr.c */
 extern int mnt_optstr_next_option(char **optstr, char **name, size_t *namesz,
@@ -161,12 +165,12 @@ extern int mnt_split_optstr(const char *optstr,
 			    int ignore_user, int ignore_vfs);
 
 extern int mnt_optstr_get_options(const char *optstr, char **subset,
-                            const struct mnt_optmap *map, int ignore);
+                            const struct libmnt_optmap *map, int ignore);
 
 extern int mnt_optstr_get_flags(const char *optstr, unsigned long *flags,
-				const struct mnt_optmap *map);
+				const struct libmnt_optmap *map);
 extern int mnt_optstr_apply_flags(char **optstr, unsigned long flags,
-                                const struct mnt_optmap *map);
+                                const struct libmnt_optmap *map);
 
 /* iter.c */
 enum {
@@ -174,139 +178,150 @@ enum {
 	MNT_ITER_FORWARD = 0,
 	MNT_ITER_BACKWARD
 };
-extern mnt_iter *mnt_new_iter(int direction);
-extern void mnt_free_iter(mnt_iter *itr);
-extern void mnt_reset_iter(mnt_iter *itr, int direction);
-extern int mnt_iter_get_direction(mnt_iter *itr);
+extern struct libmnt_iter *mnt_new_iter(int direction);
+extern void mnt_free_iter(struct libmnt_iter *itr);
+extern void mnt_reset_iter(struct libmnt_iter *itr, int direction);
+extern int mnt_iter_get_direction(struct libmnt_iter *itr);
 
 /* optmap.c */
 enum {
 	MNT_LINUX_MAP = 1,
 	MNT_USERSPACE_MAP
 };
-extern const struct mnt_optmap *mnt_get_builtin_optmap(int id);
+extern const struct libmnt_optmap *mnt_get_builtin_optmap(int id);
 
 /* lock.c */
-extern mnt_lock *mnt_new_lock(const char *datafile, pid_t id);
-extern void mnt_free_lock(mnt_lock *ml);
-extern void mnt_unlock_file(mnt_lock *ml);
-extern int mnt_lock_file(mnt_lock *ml);
+extern struct libmnt_lock *mnt_new_lock(const char *datafile, pid_t id);
+extern void mnt_free_lock(struct libmnt_lock *ml);
+extern void mnt_unlock_file(struct libmnt_lock *ml);
+extern int mnt_lock_file(struct libmnt_lock *ml);
 
 /* fs.c */
-extern mnt_fs *mnt_new_fs(void);
-extern void mnt_free_fs(mnt_fs *fs);
-extern mnt_fs *mnt_copy_fs(const mnt_fs *fs);
-extern void *mnt_fs_get_userdata(mnt_fs *fs);
-extern int mnt_fs_set_userdata(mnt_fs *fs, void *data);
-extern const char *mnt_fs_get_source(mnt_fs *fs);
-extern int mnt_fs_set_source(mnt_fs *fs, const char *source);
-extern const char *mnt_fs_get_srcpath(mnt_fs *fs);
-extern int mnt_fs_get_tag(mnt_fs *fs, const char **name, const char **value);
-extern const char *mnt_fs_get_target(mnt_fs *fs);
-extern int mnt_fs_set_target(mnt_fs *fs, const char *target);
-extern const char *mnt_fs_get_fstype(mnt_fs *fs);
-extern int mnt_fs_set_fstype(mnt_fs *fs, const char *fstype);
-
-extern char *mnt_fs_strdup_options(mnt_fs *fs);
-extern int mnt_fs_set_options(mnt_fs *fs, const char *optstr);
-
-extern int mnt_fs_get_option(mnt_fs *fs, const char *name,
+extern struct libmnt_fs *mnt_new_fs(void);
+extern void mnt_free_fs(struct libmnt_fs *fs);
+extern struct libmnt_fs *mnt_copy_fs(const struct libmnt_fs *fs);
+extern void *mnt_fs_get_userdata(struct libmnt_fs *fs);
+extern int mnt_fs_set_userdata(struct libmnt_fs *fs, void *data);
+extern const char *mnt_fs_get_source(struct libmnt_fs *fs);
+extern int mnt_fs_set_source(struct libmnt_fs *fs, const char *source);
+extern const char *mnt_fs_get_srcpath(struct libmnt_fs *fs);
+extern int mnt_fs_get_tag(struct libmnt_fs *fs, const char **name,
+			  const char **value);
+extern const char *mnt_fs_get_target(struct libmnt_fs *fs);
+extern int mnt_fs_set_target(struct libmnt_fs *fs, const char *target);
+extern const char *mnt_fs_get_fstype(struct libmnt_fs *fs);
+extern int mnt_fs_set_fstype(struct libmnt_fs *fs, const char *fstype);
+
+extern char *mnt_fs_strdup_options(struct libmnt_fs *fs);
+extern int mnt_fs_set_options(struct libmnt_fs *fs, const char *optstr);
+
+extern int mnt_fs_get_option(struct libmnt_fs *fs, const char *name,
 				char **value, size_t *valsz);
 
-extern int mnt_fs_append_options(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_prepend_options(mnt_fs *fs, const char *optstr);
+extern int mnt_fs_append_options(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_prepend_options(struct libmnt_fs *fs, const char *optstr);
 
-extern const char *mnt_fs_get_fs_options(mnt_fs *fs);
-extern int mnt_fs_set_fs_options(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_append_fs_options(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_prepend_fs_options(mnt_fs *fs, const char *optstr);
+extern const char *mnt_fs_get_fs_options(struct libmnt_fs *fs);
+extern int mnt_fs_set_fs_options(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_append_fs_options(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_prepend_fs_options(struct libmnt_fs *fs, const char *optstr);
 
-extern const char *mnt_fs_get_vfs_options(mnt_fs *fs);
-extern int mnt_fs_set_vfs_options(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_append_vfs_options(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_prepend_vfs_options(mnt_fs *fs, const char *optstr);
+extern const char *mnt_fs_get_vfs_options(struct libmnt_fs *fs);
+extern int mnt_fs_set_vfs_options(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_append_vfs_options(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_prepend_vfs_options(struct libmnt_fs *fs, const char *optstr);
 
-extern const char *mnt_fs_get_userspace_options(mnt_fs *fs);
-extern int mnt_fs_set_userspace_options(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_append_userspace_options(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_prepend_userspace_options(mnt_fs *fs, const char *optstr);
+extern const char *mnt_fs_get_user_options(struct libmnt_fs *fs);
+extern int mnt_fs_set_user_options(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_append_user_options(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_prepend_user_options(struct libmnt_fs *fs, const char *optstr);
 
-extern const char *mnt_fs_get_attributes(mnt_fs *fs);
-extern int mnt_fs_set_attributes(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_get_attribute(mnt_fs *fs, const char *name,
+extern const char *mnt_fs_get_attributes(struct libmnt_fs *fs);
+extern int mnt_fs_set_attributes(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_get_attribute(struct libmnt_fs *fs, const char *name,
 				char **value, size_t *valsz);
-extern int mnt_fs_append_attributes(mnt_fs *fs, const char *optstr);
-extern int mnt_fs_prepend_attributes(mnt_fs *fs, const char *optstr);
-
-extern int mnt_fs_get_freq(mnt_fs *fs);
-extern int mnt_fs_set_freq(mnt_fs *fs, int freq);
-extern int mnt_fs_get_passno(mnt_fs *fs);
-extern int mnt_fs_set_passno(mnt_fs *fs, int passno);
-extern const char *mnt_fs_get_root(mnt_fs *fs);
-extern int mnt_fs_set_root(mnt_fs *fs, const char *root);
-extern const char *mnt_fs_get_bindsrc(mnt_fs *fs);
-extern int mnt_fs_set_bindsrc(mnt_fs *fs, const char *src);
-extern int mnt_fs_get_id(mnt_fs *fs);
-extern int mnt_fs_get_parent_id(mnt_fs *fs);
-extern dev_t mnt_fs_get_devno(mnt_fs *fs);
-
-extern int mnt_fs_match_target(mnt_fs *fs, const char *target, mnt_cache *cache);
-extern int mnt_fs_match_source(mnt_fs *fs, const char *source, mnt_cache *cache);
-extern int mnt_fs_match_fstype(mnt_fs *fs, const char *types);
-extern int mnt_fs_match_options(mnt_fs *fs, const char *options);
-extern int mnt_fs_print_debug(mnt_fs *fs, FILE *file);
+extern int mnt_fs_append_attributes(struct libmnt_fs *fs, const char *optstr);
+extern int mnt_fs_prepend_attributes(struct libmnt_fs *fs, const char *optstr);
+
+extern int mnt_fs_get_freq(struct libmnt_fs *fs);
+extern int mnt_fs_set_freq(struct libmnt_fs *fs, int freq);
+extern int mnt_fs_get_passno(struct libmnt_fs *fs);
+extern int mnt_fs_set_passno(struct libmnt_fs *fs, int passno);
+extern const char *mnt_fs_get_root(struct libmnt_fs *fs);
+extern int mnt_fs_set_root(struct libmnt_fs *fs, const char *root);
+extern const char *mnt_fs_get_bindsrc(struct libmnt_fs *fs);
+extern int mnt_fs_set_bindsrc(struct libmnt_fs *fs, const char *src);
+extern int mnt_fs_get_id(struct libmnt_fs *fs);
+extern int mnt_fs_get_parent_id(struct libmnt_fs *fs);
+extern dev_t mnt_fs_get_devno(struct libmnt_fs *fs);
+
+extern int mnt_fs_match_target(struct libmnt_fs *fs, const char *target,
+			       struct libmnt_cache *cache);
+extern int mnt_fs_match_source(struct libmnt_fs *fs, const char *source,
+			       struct libmnt_cache *cache);
+extern int mnt_fs_match_fstype(struct libmnt_fs *fs, const char *types);
+extern int mnt_fs_match_options(struct libmnt_fs *fs, const char *options);
+extern int mnt_fs_print_debug(struct libmnt_fs *fs, FILE *file);
 
 extern void mnt_free_mntent(struct mntent *mnt);
-extern int mnt_fs_to_mntent(mnt_fs *fs, struct mntent **mnt);
+extern int mnt_fs_to_mntent(struct libmnt_fs *fs, struct mntent **mnt);
 
 /* tab-parse.c */
-extern mnt_tab *mnt_new_tab_from_file(const char *filename);
-extern mnt_tab *mnt_new_tab_from_dir(const char *dirname);
-extern int mnt_tab_parse_stream(mnt_tab *tb, FILE *f, const char *filename);
-extern int mnt_tab_parse_file(mnt_tab *tb, const char *filename);
-extern int mnt_tab_parse_fstab(mnt_tab *tb, const char *filename);
-extern int mnt_tab_parse_mtab(mnt_tab *tb, const char *filename);
-extern int mnt_tab_set_parser_errcb(mnt_tab *tb,
-                int (*cb)(mnt_tab *tb, const char *filename, int line));
+extern struct libmnt_table *mnt_new_table_from_file(const char *filename);
+extern struct libmnt_table *mnt_new_table_from_dir(const char *dirname);
+extern int mnt_table_parse_stream(struct libmnt_table *tb, FILE *f,
+				  const char *filename);
+extern int mnt_table_parse_file(struct libmnt_table *tb, const char *filename);
+extern int mnt_table_parse_fstab(struct libmnt_table *tb, const char *filename);
+extern int mnt_table_parse_mtab(struct libmnt_table *tb, const char *filename);
+extern int mnt_table_set_parser_errcb(struct libmnt_table *tb,
+                int (*cb)(struct libmnt_table *tb, const char *filename, int line));
 
 /* tab.c */
-extern mnt_tab *mnt_new_tab(void);
-extern void mnt_free_tab(mnt_tab *tb);
-extern int mnt_tab_get_nents(mnt_tab *tb);
-extern int mnt_tab_set_cache(mnt_tab *tb, mnt_cache *mpc);
-extern mnt_cache *mnt_tab_get_cache(mnt_tab *tb);
-extern const char *mnt_tab_get_name(mnt_tab *tb);
-extern int mnt_tab_add_fs(mnt_tab *tb, mnt_fs *fs);
-extern int mnt_tab_remove_fs(mnt_tab *tb, mnt_fs *fs);
-extern int mnt_tab_next_fs(mnt_tab *tb, mnt_iter *itr, mnt_fs **fs);
-extern int mnt_tab_next_child_fs(mnt_tab *tb, mnt_iter *itr,
-	                        mnt_fs *parent, mnt_fs **chld);
-extern int mnt_tab_get_root_fs(mnt_tab *tb, mnt_fs **root);
-extern int mnt_tab_set_iter(mnt_tab *tb, mnt_iter *itr, mnt_fs *fs);
-
-extern mnt_fs *mnt_tab_find_target(mnt_tab *tb, const char *path, int direction);
-extern mnt_fs *mnt_tab_find_srcpath(mnt_tab *tb, const char *path, int direction);
-extern mnt_fs *mnt_tab_find_tag(mnt_tab *tb, const char *tag,
+extern struct libmnt_table *mnt_new_table(void);
+extern void mnt_free_table(struct libmnt_table *tb);
+extern int mnt_table_get_nents(struct libmnt_table *tb);
+extern int mnt_table_set_cache(struct libmnt_table *tb, struct libmnt_cache *mpc);
+extern struct libmnt_cache *mnt_table_get_cache(struct libmnt_table *tb);
+extern const char *mnt_table_get_name(struct libmnt_table *tb);
+extern int mnt_table_add_fs(struct libmnt_table *tb, struct libmnt_fs *fs);
+extern int mnt_table_remove_fs(struct libmnt_table *tb, struct libmnt_fs *fs);
+extern int mnt_table_next_fs(struct libmnt_table *tb, struct libmnt_iter *itr,
+			     struct libmnt_fs **fs);
+extern int mnt_table_next_child_fs(struct libmnt_table *tb, struct libmnt_iter *itr,
+	                        struct libmnt_fs *parent, struct libmnt_fs **chld);
+extern int mnt_table_get_root_fs(struct libmnt_table *tb, struct libmnt_fs **root);
+extern int mnt_table_set_iter(struct libmnt_table *tb, struct libmnt_iter *itr,
+			      struct libmnt_fs *fs);
+
+extern struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb,
+				const char *path, int direction);
+extern struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb,
+				const char *path, int direction);
+extern struct libmnt_fs *mnt_table_find_tag(struct libmnt_table *tb, const char *tag,
 				const char *val, int direction);
-extern mnt_fs *mnt_tab_find_source(mnt_tab *tb, const char *source, int direction);
-extern mnt_fs *mnt_tab_find_pair(mnt_tab *tb, const char *source,
+extern struct libmnt_fs *mnt_table_find_source(struct libmnt_table *tb,
+				const char *source, int direction);
+extern struct libmnt_fs *mnt_table_find_pair(struct libmnt_table *tb,
+				const char *source,
 				const char *target, int direction);
 
-extern int mnt_tab_find_next_fs(mnt_tab *tb, mnt_iter *itr,
-			int (*match_func)(mnt_fs *, void *), void *userdata,
-		        mnt_fs **fs);
+extern int mnt_table_find_next_fs(struct libmnt_table *tb,
+			struct libmnt_iter *itr,
+			int (*match_func)(struct libmnt_fs *, void *), void *userdata,
+		        struct libmnt_fs **fs);
 
 /* tab_update.c */
-extern mnt_update *mnt_new_update(void);
-extern void mnt_free_update(mnt_update *upd);
-extern int mnt_update_is_ready(mnt_update *upd);
-extern int mnt_update_set_fs(mnt_update *upd, unsigned long mountflags,
-	                      const char *target, mnt_fs *fs);
-extern int mnt_update_tab(mnt_update *upd, mnt_lock *lc);
-extern unsigned long mnt_update_get_mountflags(mnt_update *upd);
-extern int mnt_update_force_rdonly(mnt_update *upd, int rdonly);
-extern const char *mnt_update_get_filename(mnt_update *upd);
-extern mnt_fs *mnt_update_get_fs(mnt_update *upd);
+extern struct libmnt_update *mnt_new_update(void);
+extern void mnt_free_update(struct libmnt_update *upd);
+extern int mnt_update_is_ready(struct libmnt_update *upd);
+extern int mnt_update_set_fs(struct libmnt_update *upd, unsigned long mflags,
+	                      const char *target, struct libmnt_fs *fs);
+extern int mnt_update_table(struct libmnt_update *upd, struct libmnt_lock *lc);
+extern unsigned long mnt_update_get_mflags(struct libmnt_update *upd);
+extern int mnt_update_force_rdonly(struct libmnt_update *upd, int rdonly);
+extern const char *mnt_update_get_filename(struct libmnt_update *upd);
+extern struct libmnt_fs *mnt_update_get_fs(struct libmnt_update *upd);
 
 /* context.c */
 
@@ -328,69 +343,82 @@ enum {
 	MNT_OMODE_USER   = (MNT_OMODE_REPLACE | MNT_OMODE_FORCE | MNT_OMODE_FSTAB)
 };
 
-extern mnt_context *mnt_new_context(void);
-extern void mnt_free_context(mnt_context *cxt);
-extern int mnt_reset_context(mnt_context *cxt);
-extern int mnt_context_is_restricted(mnt_context *cxt);
-
-extern int mnt_context_init_helper(mnt_context *cxt, int flags)
-extern int mnt_context_mounthelper_setopt(mnt_context *cxt, int c, char *arg);
-
-extern int mnt_context_set_optsmode(mnt_context *cxt, int mode);
-extern int mnt_context_disable_canonicalize(mnt_context *cxt, int disable);
-extern int mnt_context_enable_lazy(mnt_context *cxt, int enable);
-extern int mnt_context_enable_rdonly_umount(mnt_context *cxt, int enable);
-extern int mnt_context_disable_helpers(mnt_context *cxt, int disable);
-extern int mnt_context_enable_sloppy(mnt_context *cxt, int enable);
-extern int mnt_context_enable_fake(mnt_context *cxt, int enable);
-extern int mnt_context_disable_mtab(mnt_context *cxt, int disable);
-extern int mnt_context_enable_force(mnt_context *cxt, int enable);
-extern int mnt_context_enable_verbose(mnt_context *cxt, int enable);
-extern int mnt_context_enable_loopdel(mnt_context *cxt, int enable);
-
-extern int mnt_context_get_optsmode(mnt_context *cxt);
-extern int mnt_context_is_lazy(mnt_context *cxt);
-extern int mnt_context_is_rdonly_umount(mnt_context *cxt);
-extern int mnt_context_is_sloppy(mnt_context *cxt);
-extern int mnt_context_is_fake(mnt_context *cxt);
-extern int mnt_context_is_nomtab(mnt_context *cxt);
-extern int mnt_context_is_force(mnt_context *cxt);
-extern int mnt_context_is_verbose(mnt_context *cxt);
-
-extern int mnt_context_set_fs(mnt_context *cxt, mnt_fs *fs);
-extern mnt_fs *mnt_context_get_fs(mnt_context *cxt);
-extern int mnt_context_set_source(mnt_context *cxt, const char *source);
-extern int mnt_context_set_target(mnt_context *cxt, const char *target);
-extern int mnt_context_set_fstype(mnt_context *cxt, const char *fstype);
-extern int mnt_context_set_options(mnt_context *cxt, const char *optstr);
-extern int mnt_context_append_options(mnt_context *cxt, const char *optstr);
-extern int mnt_context_set_fstype_pattern(mnt_context *cxt, const char *pattern);
-extern int mnt_context_set_options_pattern(mnt_context *cxt, const char *pattern);
-
-extern int mnt_context_set_fstab(mnt_context *cxt, mnt_tab *tb);
-extern int mnt_context_get_fstab(mnt_context *cxt, mnt_tab **tb);
-extern int mnt_context_get_mtab(mnt_context *cxt, mnt_tab **tb);
-extern int mnt_context_set_cache(mnt_context *cxt, mnt_cache *cache);
-extern mnt_cache *mnt_context_get_cache(mnt_context *cxt);
-extern mnt_lock *mnt_context_get_lock(mnt_context *cxt);
-
-extern int mnt_context_set_mountflags(mnt_context *cxt, unsigned long flags);
-extern int mnt_context_get_mountflags(mnt_context *cxt, unsigned long *flags);
-extern int mnt_context_set_userspace_mountflags(mnt_context *cxt, unsigned long flags);
-extern int mnt_context_get_userspace_mountflags(mnt_context *cxt, unsigned long *flags);
-
-extern int mnt_context_set_mountdata(mnt_context *cxt, void *data);
-extern int mnt_context_apply_fstab(mnt_context *cxt);
-extern int mnt_context_get_status(mnt_context *cxt);
-extern int mnt_context_strerror(mnt_context *cxt, char *buf, size_t bufsiz);
-
-extern int mnt_mount_context(mnt_context *cxt);
-
-extern int mnt_context_prepare_mount(mnt_context *cxt);
-extern int mnt_context_do_mount(mnt_context *cxt);
-extern int mnt_context_finalize_mount(mnt_context *cxt);
-
-extern int mnt_context_do_umount(mnt_context *cxt);
+extern struct libmnt_context *mnt_new_context(void);
+extern void mnt_free_context(struct libmnt_context *cxt);
+extern int mnt_reset_context(struct libmnt_context *cxt);
+extern int mnt_context_is_restricted(struct libmnt_context *cxt);
+
+extern int mnt_context_init_helper(struct libmnt_context *cxt, int flags);
+extern int mnt_context_mounthelper_setopt(struct libmnt_context *cxt, int c,
+					  char *arg);
+
+extern int mnt_context_set_optsmode(struct libmnt_context *cxt, int mode);
+extern int mnt_context_disable_canonicalize(struct libmnt_context *cxt, int disable);
+extern int mnt_context_enable_lazy(struct libmnt_context *cxt, int enable);
+extern int mnt_context_enable_rdonly_umount(struct libmnt_context *cxt, int enable);
+extern int mnt_context_disable_helpers(struct libmnt_context *cxt, int disable);
+extern int mnt_context_enable_sloppy(struct libmnt_context *cxt, int enable);
+extern int mnt_context_enable_fake(struct libmnt_context *cxt, int enable);
+extern int mnt_context_disable_mtab(struct libmnt_context *cxt, int disable);
+extern int mnt_context_enable_force(struct libmnt_context *cxt, int enable);
+extern int mnt_context_enable_verbose(struct libmnt_context *cxt, int enable);
+extern int mnt_context_enable_loopdel(struct libmnt_context *cxt, int enable);
+
+extern int mnt_context_get_optsmode(struct libmnt_context *cxt);
+extern int mnt_context_is_lazy(struct libmnt_context *cxt);
+extern int mnt_context_is_rdonly_umount(struct libmnt_context *cxt);
+extern int mnt_context_is_sloppy(struct libmnt_context *cxt);
+extern int mnt_context_is_fake(struct libmnt_context *cxt);
+extern int mnt_context_is_nomtab(struct libmnt_context *cxt);
+extern int mnt_context_is_force(struct libmnt_context *cxt);
+extern int mnt_context_is_verbose(struct libmnt_context *cxt);
+
+extern int mnt_context_set_fs(struct libmnt_context *cxt, struct libmnt_fs *fs);
+extern struct libmnt_fs *mnt_context_get_fs(struct libmnt_context *cxt);
+extern int mnt_context_set_source(struct libmnt_context *cxt, const char *source);
+extern int mnt_context_set_target(struct libmnt_context *cxt, const char *target);
+extern int mnt_context_set_fstype(struct libmnt_context *cxt, const char *fstype);
+extern int mnt_context_set_options(struct libmnt_context *cxt, const char *optstr);
+extern int mnt_context_append_options(struct libmnt_context *cxt,
+				      const char *optstr);
+extern int mnt_context_set_fstype_pattern(struct libmnt_context *cxt,
+				      const char *pattern);
+extern int mnt_context_set_options_pattern(struct libmnt_context *cxt,
+				      const char *pattern);
+
+extern int mnt_context_set_fstab(struct libmnt_context *cxt,
+				 struct libmnt_table *tb);
+extern int mnt_context_get_fstab(struct libmnt_context *cxt,
+				 struct libmnt_table **tb);
+extern int mnt_context_get_mtab(struct libmnt_context *cxt,
+				struct libmnt_table **tb);
+extern int mnt_context_set_cache(struct libmnt_context *cxt,
+				 struct libmnt_cache *cache);
+extern struct libmnt_cache *mnt_context_get_cache(struct libmnt_context *cxt);
+extern struct libmnt_lock *mnt_context_get_lock(struct libmnt_context *cxt);
+
+extern int mnt_context_set_mflags(struct libmnt_context *cxt,
+				      unsigned long flags);
+extern int mnt_context_get_mflags(struct libmnt_context *cxt,
+				      unsigned long *flags);
+extern int mnt_context_set_user_mflags(struct libmnt_context *cxt,
+						unsigned long flags);
+extern int mnt_context_get_user_mflags(struct libmnt_context *cxt,
+						unsigned long *flags);
+
+extern int mnt_context_set_mountdata(struct libmnt_context *cxt, void *data);
+extern int mnt_context_apply_fstab(struct libmnt_context *cxt);
+extern int mnt_context_get_status(struct libmnt_context *cxt);
+extern int mnt_context_strerror(struct libmnt_context *cxt, char *buf,
+				size_t bufsiz);
+
+extern int mnt_mount_context(struct libmnt_context *cxt);
+
+extern int mnt_context_prepare_mount(struct libmnt_context *cxt);
+extern int mnt_context_do_mount(struct libmnt_context *cxt);
+extern int mnt_context_finalize_mount(struct libmnt_context *cxt);
+
+extern int mnt_context_do_umount(struct libmnt_context *cxt);
 
 /*
  * mount(8) userspace options masks (MNT_MAP_USERSPACE map)