From 079f8afa0a16112cbaf7012c82b38b7358b82141 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Mon, 27 Nov 2006 16:49:31 +0000
Subject: style cleanup: return(a) -> return a, part 1

---
 e2fsprogs/blkid/dev.c     | 2 +-
 e2fsprogs/blkid/devname.c | 2 +-
 e2fsprogs/blkid/probe.c   | 4 ++--
 e2fsprogs/blkid/tag.c     | 4 ++--
 e2fsprogs/e2fsck.c        | 8 ++++----
 e2fsprogs/ext2fs/icount.c | 2 +-
 e2fsprogs/fsck.c          | 2 +-
 e2fsprogs/uuid/compare.c  | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'e2fsprogs')

diff --git a/e2fsprogs/blkid/dev.c b/e2fsprogs/blkid/dev.c
index b34d4a965..f9f8c63bb 100644
--- a/e2fsprogs/blkid/dev.c
+++ b/e2fsprogs/blkid/dev.c
@@ -209,6 +209,6 @@ int main(int argc, char **argv)
 
 
 	blkid_put_cache(cache);
-	return (0);
+	return 0;
 }
 #endif
diff --git a/e2fsprogs/blkid/devname.c b/e2fsprogs/blkid/devname.c
index 532aeeaab..d69000be7 100644
--- a/e2fsprogs/blkid/devname.c
+++ b/e2fsprogs/blkid/devname.c
@@ -363,6 +363,6 @@ int main(int argc, char **argv)
 		printf("%s: error probing devices\n", argv[0]);
 
 	blkid_put_cache(cache);
-	return (0);
+	return 0;
 }
 #endif
diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c
index a2165efee..ea9a619ee 100644
--- a/e2fsprogs/blkid/probe.c
+++ b/e2fsprogs/blkid/probe.c
@@ -706,7 +706,7 @@ int main(int argc, char **argv)
 	dev = blkid_get_dev(cache, argv[1], BLKID_DEV_NORMAL);
 	if (!dev) {
 		printf("%s: %s has an unsupported type\n", argv[0], argv[1]);
-		return (1);
+		return 1;
 	}
 	printf("%s is type %s\n", argv[1], dev->bid_type ?
 		dev->bid_type : "(null)");
@@ -716,6 +716,6 @@ int main(int argc, char **argv)
 		printf("\tuuid is %s\n", dev->bid_uuid);
 
 	blkid_free_dev(dev);
-	return (0);
+	return 0;
 }
 #endif
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c
index 3bbd4c1f4..7cf30b45f 100644
--- a/e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/blkid/tag.c
@@ -416,7 +416,7 @@ int main(int argc, char **argv)
 		printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev),
 		       search_type, search_value ? search_value : "NULL",
 		       found ? "FOUND" : "NOT FOUND");
-		return(!found);
+		return !found;
 	}
 	printf("Device %s...\n", blkid_dev_devname(dev));
 
@@ -427,6 +427,6 @@ int main(int argc, char **argv)
 	blkid_tag_iterate_end(iter);
 
 	blkid_put_cache(cache);
-	return (0);
+	return 0;
 }
 #endif
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index ea5b08ccc..c48244121 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -739,7 +739,7 @@ static struct dir_info *e2fsck_dir_info_iter(e2fsck_t ctx, int *control)
 	if (*control >= ctx->dir_info_count)
 		return 0;
 
-	return(ctx->dir_info + (*control)++);
+	return ctx->dir_info + (*control)++;
 }
 
 /*
@@ -870,7 +870,7 @@ static struct dx_dir_info *e2fsck_dx_dir_info_iter(e2fsck_t ctx, int *control)
 	if (*control >= ctx->dx_dir_info_count)
 		return 0;
 
-	return(ctx->dx_dir_info + (*control)++);
+	return ctx->dx_dir_info + (*control)++;
 }
 
 #endif /* ENABLE_HTREE */
@@ -1055,7 +1055,7 @@ static errcode_t ea_refcount_create(int size, ext2_refcount_t *ret)
 
 errout:
 	ea_refcount_free(refcount);
-	return(retval);
+	return retval;
 }
 
 /*
@@ -4929,7 +4929,7 @@ static int search_dirent_proc(ext2_ino_t dir, int entry,
 	p->dir = dir;
 	sd->count--;
 
-	return(sd->count ? 0 : DIRENT_ABORT);
+	return sd->count ? 0 : DIRENT_ABORT;
 }
 
 
diff --git a/e2fsprogs/ext2fs/icount.c b/e2fsprogs/ext2fs/icount.c
index 521e00bb7..7ab5f51f4 100644
--- a/e2fsprogs/ext2fs/icount.c
+++ b/e2fsprogs/ext2fs/icount.c
@@ -139,7 +139,7 @@ errcode_t ext2fs_create_icount2(ext2_filsys fs, int flags, unsigned int size,
 
 errout:
 	ext2fs_free_icount(icount);
-	return(retval);
+	return retval;
 }
 
 errcode_t ext2fs_create_icount(ext2_filsys fs, int flags,
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index 66b78b624..f0c1316a9 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -549,7 +549,7 @@ static char *find_fsck(char *type)
 	free(s);
   }
   free(p);
-  return(s);
+  return s;
 }
 
 static int progress_active(void)
diff --git a/e2fsprogs/uuid/compare.c b/e2fsprogs/uuid/compare.c
index 2be9e90a3..348ea7c1f 100644
--- a/e2fsprogs/uuid/compare.c
+++ b/e2fsprogs/uuid/compare.c
@@ -38,7 +38,7 @@
 #include "uuidP.h"
 #include <string.h>
 
-#define UUCMP(u1,u2) if (u1 != u2) return((u1 < u2) ? -1 : 1);
+#define UUCMP(u1,u2) if (u1 != u2) return (u1 < u2) ? -1 : 1;
 
 int uuid_compare(const uuid_t uu1, const uuid_t uu2)
 {
-- 
cgit v1.2.3