summaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-27 16:49:31 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-27 16:49:31 +0000
commit079f8afa0a16112cbaf7012c82b38b7358b82141 (patch)
tree0d8cba8e45b1a8b975e0b8c7a8377703ab5547a6 /e2fsprogs
parent10d0d4eec7e3a292917f43f72afae20341d9ba11 (diff)
downloadbusybox-w32-079f8afa0a16112cbaf7012c82b38b7358b82141.tar.gz
busybox-w32-079f8afa0a16112cbaf7012c82b38b7358b82141.tar.bz2
busybox-w32-079f8afa0a16112cbaf7012c82b38b7358b82141.zip
style cleanup: return(a) -> return a, part 1
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/blkid/dev.c2
-rw-r--r--e2fsprogs/blkid/devname.c2
-rw-r--r--e2fsprogs/blkid/probe.c4
-rw-r--r--e2fsprogs/blkid/tag.c4
-rw-r--r--e2fsprogs/e2fsck.c8
-rw-r--r--e2fsprogs/ext2fs/icount.c2
-rw-r--r--e2fsprogs/fsck.c2
-rw-r--r--e2fsprogs/uuid/compare.c2
8 files changed, 13 insertions, 13 deletions
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)
209 209
210 210
211 blkid_put_cache(cache); 211 blkid_put_cache(cache);
212 return (0); 212 return 0;
213} 213}
214#endif 214#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)
363 printf("%s: error probing devices\n", argv[0]); 363 printf("%s: error probing devices\n", argv[0]);
364 364
365 blkid_put_cache(cache); 365 blkid_put_cache(cache);
366 return (0); 366 return 0;
367} 367}
368#endif 368#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)
706 dev = blkid_get_dev(cache, argv[1], BLKID_DEV_NORMAL); 706 dev = blkid_get_dev(cache, argv[1], BLKID_DEV_NORMAL);
707 if (!dev) { 707 if (!dev) {
708 printf("%s: %s has an unsupported type\n", argv[0], argv[1]); 708 printf("%s: %s has an unsupported type\n", argv[0], argv[1]);
709 return (1); 709 return 1;
710 } 710 }
711 printf("%s is type %s\n", argv[1], dev->bid_type ? 711 printf("%s is type %s\n", argv[1], dev->bid_type ?
712 dev->bid_type : "(null)"); 712 dev->bid_type : "(null)");
@@ -716,6 +716,6 @@ int main(int argc, char **argv)
716 printf("\tuuid is %s\n", dev->bid_uuid); 716 printf("\tuuid is %s\n", dev->bid_uuid);
717 717
718 blkid_free_dev(dev); 718 blkid_free_dev(dev);
719 return (0); 719 return 0;
720} 720}
721#endif 721#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)
416 printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev), 416 printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev),
417 search_type, search_value ? search_value : "NULL", 417 search_type, search_value ? search_value : "NULL",
418 found ? "FOUND" : "NOT FOUND"); 418 found ? "FOUND" : "NOT FOUND");
419 return(!found); 419 return !found;
420 } 420 }
421 printf("Device %s...\n", blkid_dev_devname(dev)); 421 printf("Device %s...\n", blkid_dev_devname(dev));
422 422
@@ -427,6 +427,6 @@ int main(int argc, char **argv)
427 blkid_tag_iterate_end(iter); 427 blkid_tag_iterate_end(iter);
428 428
429 blkid_put_cache(cache); 429 blkid_put_cache(cache);
430 return (0); 430 return 0;
431} 431}
432#endif 432#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)
739 if (*control >= ctx->dir_info_count) 739 if (*control >= ctx->dir_info_count)
740 return 0; 740 return 0;
741 741
742 return(ctx->dir_info + (*control)++); 742 return ctx->dir_info + (*control)++;
743} 743}
744 744
745/* 745/*
@@ -870,7 +870,7 @@ static struct dx_dir_info *e2fsck_dx_dir_info_iter(e2fsck_t ctx, int *control)
870 if (*control >= ctx->dx_dir_info_count) 870 if (*control >= ctx->dx_dir_info_count)
871 return 0; 871 return 0;
872 872
873 return(ctx->dx_dir_info + (*control)++); 873 return ctx->dx_dir_info + (*control)++;
874} 874}
875 875
876#endif /* ENABLE_HTREE */ 876#endif /* ENABLE_HTREE */
@@ -1055,7 +1055,7 @@ static errcode_t ea_refcount_create(int size, ext2_refcount_t *ret)
1055 1055
1056errout: 1056errout:
1057 ea_refcount_free(refcount); 1057 ea_refcount_free(refcount);
1058 return(retval); 1058 return retval;
1059} 1059}
1060 1060
1061/* 1061/*
@@ -4929,7 +4929,7 @@ static int search_dirent_proc(ext2_ino_t dir, int entry,
4929 p->dir = dir; 4929 p->dir = dir;
4930 sd->count--; 4930 sd->count--;
4931 4931
4932 return(sd->count ? 0 : DIRENT_ABORT); 4932 return sd->count ? 0 : DIRENT_ABORT;
4933} 4933}
4934 4934
4935 4935
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,
139 139
140errout: 140errout:
141 ext2fs_free_icount(icount); 141 ext2fs_free_icount(icount);
142 return(retval); 142 return retval;
143} 143}
144 144
145errcode_t ext2fs_create_icount(ext2_filsys fs, int flags, 145errcode_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)
549 free(s); 549 free(s);
550 } 550 }
551 free(p); 551 free(p);
552 return(s); 552 return s;
553} 553}
554 554
555static int progress_active(void) 555static 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 @@
38#include "uuidP.h" 38#include "uuidP.h"
39#include <string.h> 39#include <string.h>
40 40
41#define UUCMP(u1,u2) if (u1 != u2) return((u1 < u2) ? -1 : 1); 41#define UUCMP(u1,u2) if (u1 != u2) return (u1 < u2) ? -1 : 1;
42 42
43int uuid_compare(const uuid_t uu1, const uuid_t uu2) 43int uuid_compare(const uuid_t uu1, const uuid_t uu2)
44{ 44{