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, 35 insertions, 43 deletions

diff --git a/shlibs/mount/docs/libmount-sections.txt b/shlibs/mount/docs/libmount-sections.txt
index a7ff4c7b4..956fe8a5d 100644
--- a/shlibs/mount/docs/libmount-sections.txt
+++ b/shlibs/mount/docs/libmount-sections.txt
@@ -24,7 +24,6 @@ mnt_unmangle
 
 <SECTION>
 <FILE>cache</FILE>
-mnt_cache
 mnt_cache_device_has_tag
 mnt_cache_find_tag_value
 mnt_cache_read_tags
@@ -52,7 +51,6 @@ mnt_split_optstr
 
 <SECTION>
 <FILE>iter</FILE>
-mnt_iter
 mnt_free_iter
 mnt_iter_get_direction
 mnt_new_iter
@@ -61,13 +59,11 @@ mnt_reset_iter
 
 <SECTION>
 <FILE>optmap</FILE>
-struct mnt_optmap
 mnt_get_builtin_optmap
 </SECTION>
 
 <SECTION>
 <FILE>lock</FILE>
-mnt_lock
 mnt_free_lock
 mnt_lock_file
 mnt_new_lock
@@ -76,14 +72,13 @@ mnt_unlock_file
 
 <SECTION>
 <FILE>fs</FILE>
-mnt_fs
 mnt_copy_fs
 mnt_free_fs
 mnt_free_mntent
 mnt_fs_append_attributes
 mnt_fs_append_fs_options
 mnt_fs_append_options
-mnt_fs_append_userspace_options
+mnt_fs_append_user_options
 mnt_fs_append_vfs_options
 mnt_fs_get_attribute
 mnt_fs_get_attributes
@@ -102,7 +97,7 @@ mnt_fs_get_srcpath
 mnt_fs_get_tag
 mnt_fs_get_target
 mnt_fs_get_userdata
-mnt_fs_get_userspace_options
+mnt_fs_get_user_options
 mnt_fs_get_vfs_options
 mnt_fs_match_fstype
 mnt_fs_match_options
@@ -111,7 +106,7 @@ mnt_fs_match_target
 mnt_fs_prepend_attributes
 mnt_fs_prepend_fs_options
 mnt_fs_prepend_options
-mnt_fs_prepend_userspace_options
+mnt_fs_prepend_user_options
 mnt_fs_prepend_vfs_options
 mnt_fs_print_debug
 mnt_fs_set_attributes
@@ -125,7 +120,7 @@ mnt_fs_set_root
 mnt_fs_set_source
 mnt_fs_set_target
 mnt_fs_set_userdata
-mnt_fs_set_userspace_options
+mnt_fs_set_user_options
 mnt_fs_set_vfs_options
 mnt_fs_strdup_options
 mnt_new_fs
@@ -134,51 +129,48 @@ mnt_fs_to_mntent
 
 <SECTION>
 <FILE>tab</FILE>
-mnt_tab
-mnt_free_tab
-mnt_new_tab
-mnt_new_tab_from_dir
-mnt_new_tab_from_file
-mnt_tab_add_fs
-mnt_tab_find_next_fs
-mnt_tab_find_pair
-mnt_tab_find_source
-mnt_tab_find_srcpath
-mnt_tab_find_tag
-mnt_tab_find_target
-mnt_tab_get_cache
-mnt_tab_get_name
-mnt_tab_get_nents
-mnt_tab_get_root_fs
-mnt_tab_next_child_fs
-mnt_tab_next_fs
-mnt_tab_parse_file
-mnt_tab_parse_fstab
-mnt_tab_parse_mtab
-mnt_tab_parse_stream
-mnt_tab_remove_fs
-mnt_tab_set_cache
-mnt_tab_set_iter
-mnt_tab_set_parser_errcb
+mnt_free_table
+mnt_new_table
+mnt_new_table_from_dir
+mnt_new_table_from_file
+mnt_table_add_fs
+mnt_table_find_next_fs
+mnt_table_find_pair
+mnt_table_find_source
+mnt_table_find_srcpath
+mnt_table_find_tag
+mnt_table_find_target
+mnt_table_get_cache
+mnt_table_get_name
+mnt_table_get_nents
+mnt_table_get_root_fs
+mnt_table_next_child_fs
+mnt_table_next_fs
+mnt_table_parse_file
+mnt_table_parse_fstab
+mnt_table_parse_mtab
+mnt_table_parse_stream
+mnt_table_remove_fs
+mnt_table_set_cache
+mnt_table_set_iter
+mnt_table_set_parser_errcb
 </SECTION>
 
 <SECTION>
 <FILE>update</FILE>
-mnt_update
 mnt_free_update
 mnt_new_update
 mnt_update_force_rdonly
 mnt_update_get_filename
 mnt_update_get_fs
-mnt_update_get_mountflags
+mnt_update_get_mflags
 mnt_update_is_ready
 mnt_update_set_fs
-mnt_update_tab
+mnt_update_table
 </SECTION>
 
 <SECTION>
 <FILE>context</FILE>
-mnt_context
 mnt_context_append_options
 mnt_context_apply_fstab
 mnt_context_disable_canonicalize
@@ -197,10 +189,10 @@ mnt_context_get_cache
 mnt_context_get_fs
 mnt_context_get_fstab
 mnt_context_get_lock
-mnt_context_get_mountflags
+mnt_context_get_mflags
 mnt_context_get_mtab
 mnt_context_get_status
-mnt_context_get_userspace_mountflags
+mnt_context_get_user_mflags
 mnt_context_is_restricted
 mnt_context_set_cache
 mnt_context_set_fs
@@ -208,13 +200,13 @@ mnt_context_set_fstab
 mnt_context_set_fstype
 mnt_context_set_fstype_pattern
 mnt_context_set_mountdata
-mnt_context_set_mountflags
+mnt_context_set_mflags
 mnt_context_set_options
 mnt_context_set_options_pattern
 mnt_context_set_optsmode
 mnt_context_set_source
 mnt_context_set_target
-mnt_context_set_userspace_mountflags
+mnt_context_set_user_mflags
 mnt_context_strerror
 mnt_free_context
 mnt_new_context