summaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-27 16:49:55 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-27 16:49:55 +0000
commitd9e15f206840219bb0f39c912a42fdcf8cbcaed6 (patch)
treeffdef7f5ab4a33038d0a62c9355b48f362aa463e /e2fsprogs
parent079f8afa0a16112cbaf7012c82b38b7358b82141 (diff)
downloadbusybox-w32-d9e15f206840219bb0f39c912a42fdcf8cbcaed6.tar.gz
busybox-w32-d9e15f206840219bb0f39c912a42fdcf8cbcaed6.tar.bz2
busybox-w32-d9e15f206840219bb0f39c912a42fdcf8cbcaed6.zip
style cleanup: return(a) -> return a, part 2
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/blkid/dev.c2
-rw-r--r--e2fsprogs/blkid/resolve.c2
-rw-r--r--e2fsprogs/blkid/tag.c2
-rw-r--r--e2fsprogs/e2fsck.c2
-rw-r--r--e2fsprogs/ext2fs/closefs.c2
-rw-r--r--e2fsprogs/ext2fs/dirblock.c2
-rw-r--r--e2fsprogs/ext2fs/imager.c4
-rw-r--r--e2fsprogs/tune2fs.c4
8 files changed, 10 insertions, 10 deletions
diff --git a/e2fsprogs/blkid/dev.c b/e2fsprogs/blkid/dev.c
index f9f8c63bb..eddbd02b7 100644
--- a/e2fsprogs/blkid/dev.c
+++ b/e2fsprogs/blkid/dev.c
@@ -117,7 +117,7 @@ blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache)
117 iter->magic = DEV_ITERATE_MAGIC; 117 iter->magic = DEV_ITERATE_MAGIC;
118 iter->cache = cache; 118 iter->cache = cache;
119 iter->p = cache->bic_devs.next; 119 iter->p = cache->bic_devs.next;
120 return (iter); 120 return iter;
121} 121}
122 122
123/* 123/*
diff --git a/e2fsprogs/blkid/resolve.c b/e2fsprogs/blkid/resolve.c
index 2bbcaf31d..7942de2cd 100644
--- a/e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/blkid/resolve.c
@@ -102,7 +102,7 @@ errout:
102 if (!cache) { 102 if (!cache) {
103 blkid_put_cache(c); 103 blkid_put_cache(c);
104 } 104 }
105 return (ret); 105 return ret;
106} 106}
107 107
108#ifdef TEST_PROGRAM 108#ifdef TEST_PROGRAM
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c
index 7cf30b45f..9e862a50a 100644
--- a/e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/blkid/tag.c
@@ -257,7 +257,7 @@ blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev)
257 iter->magic = TAG_ITERATE_MAGIC; 257 iter->magic = TAG_ITERATE_MAGIC;
258 iter->dev = dev; 258 iter->dev = dev;
259 iter->p = dev->bid_tags.next; 259 iter->p = dev->bid_tags.next;
260 return (iter); 260 return iter;
261} 261}
262 262
263/* 263/*
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index c48244121..efaec7d8f 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -1422,7 +1422,7 @@ static int journal_bmap(journal_t *journal, blk_t block, unsigned long *phys)
1422 retval= ext2fs_bmap(inode->i_ctx->fs, inode->i_ino, 1422 retval= ext2fs_bmap(inode->i_ctx->fs, inode->i_ino,
1423 &inode->i_ext2, NULL, 0, block, &pblk); 1423 &inode->i_ext2, NULL, 0, block, &pblk);
1424 *phys = pblk; 1424 *phys = pblk;
1425 return (retval); 1425 return retval;
1426#endif 1426#endif
1427} 1427}
1428 1428
diff --git a/e2fsprogs/ext2fs/closefs.c b/e2fsprogs/ext2fs/closefs.c
index 3531cdce7..008d5f36e 100644
--- a/e2fsprogs/ext2fs/closefs.c
+++ b/e2fsprogs/ext2fs/closefs.c
@@ -112,7 +112,7 @@ int ext2fs_super_and_bgd_loc(ext2_filsys fs,
112 *ret_new_desc_blk = new_desc_blk; 112 *ret_new_desc_blk = new_desc_blk;
113 if (ret_meta_bg) 113 if (ret_meta_bg)
114 *ret_meta_bg = meta_bg; 114 *ret_meta_bg = meta_bg;
115 return (numblocks); 115 return numblocks;
116} 116}
117 117
118 118
diff --git a/e2fsprogs/ext2fs/dirblock.c b/e2fsprogs/ext2fs/dirblock.c
index 43e8e6eb0..5d3f6a1bc 100644
--- a/e2fsprogs/ext2fs/dirblock.c
+++ b/e2fsprogs/ext2fs/dirblock.c
@@ -103,7 +103,7 @@ errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block,
103 if ((dirent->rec_len < 8) || 103 if ((dirent->rec_len < 8) ||
104 (dirent->rec_len % 4)) { 104 (dirent->rec_len % 4)) {
105 ext2fs_free_mem(&buf); 105 ext2fs_free_mem(&buf);
106 return (EXT2_ET_DIR_CORRUPTED); 106 return EXT2_ET_DIR_CORRUPTED;
107 } 107 }
108 p += dirent->rec_len; 108 p += dirent->rec_len;
109 if (do_swap) { 109 if (do_swap) {
diff --git a/e2fsprogs/ext2fs/imager.c b/e2fsprogs/ext2fs/imager.c
index 2f93cb417..e82321efa 100644
--- a/e2fsprogs/ext2fs/imager.c
+++ b/e2fsprogs/ext2fs/imager.c
@@ -324,7 +324,7 @@ errcode_t ext2fs_image_bitmap_write(ext2_filsys fs, int fd, int flags)
324 } 324 }
325 retval = 0; 325 retval = 0;
326errout: 326errout:
327 return (retval); 327 return retval;
328} 328}
329 329
330 330
@@ -373,5 +373,5 @@ errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags)
373 retval = 0; 373 retval = 0;
374errout: 374errout:
375 free(buf); 375 free(buf);
376 return (retval); 376 return retval;
377} 377}
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index c8dfc6927..a2ca1ba09 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -380,7 +380,7 @@ static time_t parse_time(char *str)
380 struct tm ts; 380 struct tm ts;
381 381
382 if (strcmp(str, "now") == 0) { 382 if (strcmp(str, "now") == 0) {
383 return (time(0)); 383 return time(0);
384 } 384 }
385 memset(&ts, 0, sizeof(ts)); 385 memset(&ts, 0, sizeof(ts));
386#ifdef HAVE_STRPTIME 386#ifdef HAVE_STRPTIME
@@ -398,7 +398,7 @@ static time_t parse_time(char *str)
398 if (ts.tm_mday == 0) { 398 if (ts.tm_mday == 0) {
399 bb_error_msg_and_die("Cannot parse date/time specifier: %s", str); 399 bb_error_msg_and_die("Cannot parse date/time specifier: %s", str);
400 } 400 }
401 return (mktime(&ts)); 401 return mktime(&ts);
402} 402}
403 403
404static void parse_tune2fs_options(int argc, char **argv) 404static void parse_tune2fs_options(int argc, char **argv)