From 68164f6c308af1f53567b627876cd1bc8afe8817 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Sat, 22 Jan 2011 00:09:34 +0100
Subject: 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>
---
 shlibs/mount/src/iter.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'shlibs/mount/src/iter.c')

diff --git a/shlibs/mount/src/iter.c b/shlibs/mount/src/iter.c
index cb74eecad..99fedd17b 100644
--- a/shlibs/mount/src/iter.c
+++ b/shlibs/mount/src/iter.c
@@ -25,9 +25,9 @@
  *
  * Returns: newly allocated generic libmount iterator.
  */
-mnt_iter *mnt_new_iter(int direction)
+struct libmnt_iter *mnt_new_iter(int direction)
 {
-	mnt_iter *itr = calloc(1, sizeof(struct _mnt_iter));
+	struct libmnt_iter *itr = calloc(1, sizeof(*itr));
 	if (!itr)
 		return NULL;
 	itr->direction = direction;
@@ -40,7 +40,7 @@ mnt_iter *mnt_new_iter(int direction)
  *
  * Deallocates iterator.
  */
-void mnt_free_iter(mnt_iter *itr)
+void mnt_free_iter(struct libmnt_iter *itr)
 {
 	free(itr);
 }
@@ -52,7 +52,7 @@ void mnt_free_iter(mnt_iter *itr)
  *
  * Resets iterator.
  */
-void mnt_reset_iter(mnt_iter *itr, int direction)
+void mnt_reset_iter(struct libmnt_iter *itr, int direction)
 {
 	assert(itr);
 
@@ -60,7 +60,7 @@ void mnt_reset_iter(mnt_iter *itr, int direction)
 		direction = itr->direction;
 
 	if (itr) {
-		memset(itr, 0, sizeof(struct _mnt_iter));
+		memset(itr, 0, sizeof(*itr));
 		itr->direction = direction;
 	}
 }
@@ -71,7 +71,7 @@ void mnt_reset_iter(mnt_iter *itr, int direction)
  *
  * Returns: MNT_INTER_{FOR,BACK}WARD or negative number in case of error.
  */
-int mnt_iter_get_direction(mnt_iter *itr)
+int mnt_iter_get_direction(struct libmnt_iter *itr)
 {
 	assert(itr);
 	return itr ? itr->direction : -EINVAL;
-- 
cgit v1.2.3-55-g7522