diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-27 16:49:55 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-27 16:49:55 +0000 |
commit | db172fe425634b7d784ae1d5af6d88b96b4e747e (patch) | |
tree | ffdef7f5ab4a33038d0a62c9355b48f362aa463e /libbb | |
parent | bb89b301143fe9deb962bb2d48264b27a945fcf4 (diff) | |
download | busybox-w32-db172fe425634b7d784ae1d5af6d88b96b4e747e.tar.gz busybox-w32-db172fe425634b7d784ae1d5af6d88b96b4e747e.tar.bz2 busybox-w32-db172fe425634b7d784ae1d5af6d88b96b4e747e.zip |
style cleanup: return(a) -> return a, part 2
git-svn-id: svn://busybox.net/trunk/busybox@16691 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/bb_pwd.c | 2 | ||||
-rw-r--r-- | libbb/dump.c | 16 | ||||
-rw-r--r-- | libbb/obscure.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c index 1776fa4f6..48a5c1539 100644 --- a/libbb/bb_pwd.c +++ b/libbb/bb_pwd.c | |||
@@ -47,7 +47,7 @@ long bb_xgetgrnam(const char *name) | |||
47 | if (mygroup==NULL) | 47 | if (mygroup==NULL) |
48 | bb_error_msg_and_die("unknown group name: %s", name); | 48 | bb_error_msg_and_die("unknown group name: %s", name); |
49 | 49 | ||
50 | return (mygroup->gr_gid); | 50 | return mygroup->gr_gid; |
51 | } | 51 | } |
52 | 52 | ||
53 | /* returns a uid given a username */ | 53 | /* returns a uid given a username */ |
diff --git a/libbb/dump.c b/libbb/dump.c index 4e4c2e12c..10710894e 100644 --- a/libbb/dump.c +++ b/libbb/dump.c | |||
@@ -74,7 +74,7 @@ int bb_dump_size(FS * fs) | |||
74 | } | 74 | } |
75 | cur_size += bcnt * fu->reps; | 75 | cur_size += bcnt * fu->reps; |
76 | } | 76 | } |
77 | return (cur_size); | 77 | return cur_size; |
78 | } | 78 | } |
79 | 79 | ||
80 | static void rewrite(FS * fs) | 80 | static void rewrite(FS * fs) |
@@ -374,17 +374,17 @@ static unsigned char *get(void) | |||
374 | */ | 374 | */ |
375 | if (!bb_dump_length || (ateof && !next((char **) NULL))) { | 375 | if (!bb_dump_length || (ateof && !next((char **) NULL))) { |
376 | if (need == bb_dump_blocksize) { | 376 | if (need == bb_dump_blocksize) { |
377 | return ((unsigned char *) NULL); | 377 | return NULL; |
378 | } | 378 | } |
379 | if (bb_dump_vflag != ALL && !memcmp(curp, savp, nread)) { | 379 | if (bb_dump_vflag != ALL && !memcmp(curp, savp, nread)) { |
380 | if (bb_dump_vflag != DUP) { | 380 | if (bb_dump_vflag != DUP) { |
381 | printf("*\n"); | 381 | puts("*"); |
382 | } | 382 | } |
383 | return ((unsigned char *) NULL); | 383 | return NULL; |
384 | } | 384 | } |
385 | memset((char *) curp + nread, 0, need); | 385 | memset((char *) curp + nread, 0, need); |
386 | eaddress = address + nread; | 386 | eaddress = address + nread; |
387 | return (curp); | 387 | return curp; |
388 | } | 388 | } |
389 | n = fread((char *) curp + nread, sizeof(unsigned char), | 389 | n = fread((char *) curp + nread, sizeof(unsigned char), |
390 | bb_dump_length == -1 ? need : MIN(bb_dump_length, need), stdin); | 390 | bb_dump_length == -1 ? need : MIN(bb_dump_length, need), stdin); |
@@ -405,10 +405,10 @@ static unsigned char *get(void) | |||
405 | if (bb_dump_vflag == DUP || bb_dump_vflag == FIRST) { | 405 | if (bb_dump_vflag == DUP || bb_dump_vflag == FIRST) { |
406 | bb_dump_vflag = WAIT; | 406 | bb_dump_vflag = WAIT; |
407 | } | 407 | } |
408 | return (curp); | 408 | return curp; |
409 | } | 409 | } |
410 | if (bb_dump_vflag == WAIT) { | 410 | if (bb_dump_vflag == WAIT) { |
411 | printf("*\n"); | 411 | puts("*"); |
412 | } | 412 | } |
413 | bb_dump_vflag = DUP; | 413 | bb_dump_vflag = DUP; |
414 | address = savaddress += bb_dump_blocksize; | 414 | address = savaddress += bb_dump_blocksize; |
@@ -665,7 +665,7 @@ int bb_dump_dump(char **argv) | |||
665 | next(argv); | 665 | next(argv); |
666 | display(); | 666 | display(); |
667 | 667 | ||
668 | return (exitval); | 668 | return exitval; |
669 | } | 669 | } |
670 | 670 | ||
671 | void bb_dump_add(const char *fmt) | 671 | void bb_dump_add(const char *fmt) |
diff --git a/libbb/obscure.c b/libbb/obscure.c index 56aacc910..7d839d624 100644 --- a/libbb/obscure.c +++ b/libbb/obscure.c | |||
@@ -164,7 +164,7 @@ int obscure(const char *old, const char *newval, const struct passwd *pwdp) | |||
164 | if ((msg = obscure_msg(old, newval, pwdp))) { | 164 | if ((msg = obscure_msg(old, newval, pwdp))) { |
165 | printf("Bad password: %s.\n", msg); | 165 | printf("Bad password: %s.\n", msg); |
166 | /* If user is root warn only */ | 166 | /* If user is root warn only */ |
167 | return (getuid())? 1 : 0; | 167 | return getuid() ? 1 : 0; |
168 | } | 168 | } |
169 | return 0; | 169 | return 0; |
170 | } | 170 | } |