summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko2006-11-27 16:49:55 +0000
committerDenis Vlasenko2006-11-27 16:49:55 +0000
commitd9e15f206840219bb0f39c912a42fdcf8cbcaed6 (patch)
treeffdef7f5ab4a33038d0a62c9355b48f362aa463e /libbb
parent079f8afa0a16112cbaf7012c82b38b7358b82141 (diff)
downloadbusybox-d9e15f206840219bb0f39c912a42fdcf8cbcaed6.zip
busybox-d9e15f206840219bb0f39c912a42fdcf8cbcaed6.tar.gz
style cleanup: return(a) -> return a, part 2
Diffstat (limited to 'libbb')
-rw-r--r--libbb/bb_pwd.c2
-rw-r--r--libbb/dump.c16
-rw-r--r--libbb/obscure.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index 1776fa4..48a5c15 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -47,7 +47,7 @@ long bb_xgetgrnam(const char *name)
if (mygroup==NULL)
bb_error_msg_and_die("unknown group name: %s", name);
- return (mygroup->gr_gid);
+ return mygroup->gr_gid;
}
/* returns a uid given a username */
diff --git a/libbb/dump.c b/libbb/dump.c
index 4e4c2e1..1071089 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -74,7 +74,7 @@ int bb_dump_size(FS * fs)
}
cur_size += bcnt * fu->reps;
}
- return (cur_size);
+ return cur_size;
}
static void rewrite(FS * fs)
@@ -374,17 +374,17 @@ static unsigned char *get(void)
*/
if (!bb_dump_length || (ateof && !next((char **) NULL))) {
if (need == bb_dump_blocksize) {
- return ((unsigned char *) NULL);
+ return NULL;
}
if (bb_dump_vflag != ALL && !memcmp(curp, savp, nread)) {
if (bb_dump_vflag != DUP) {
- printf("*\n");
+ puts("*");
}
- return ((unsigned char *) NULL);
+ return NULL;
}
memset((char *) curp + nread, 0, need);
eaddress = address + nread;
- return (curp);
+ return curp;
}
n = fread((char *) curp + nread, sizeof(unsigned char),
bb_dump_length == -1 ? need : MIN(bb_dump_length, need), stdin);
@@ -405,10 +405,10 @@ static unsigned char *get(void)
if (bb_dump_vflag == DUP || bb_dump_vflag == FIRST) {
bb_dump_vflag = WAIT;
}
- return (curp);
+ return curp;
}
if (bb_dump_vflag == WAIT) {
- printf("*\n");
+ puts("*");
}
bb_dump_vflag = DUP;
address = savaddress += bb_dump_blocksize;
@@ -665,7 +665,7 @@ int bb_dump_dump(char **argv)
next(argv);
display();
- return (exitval);
+ return exitval;
}
void bb_dump_add(const char *fmt)
diff --git a/libbb/obscure.c b/libbb/obscure.c
index 56aacc9..7d839d6 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)
if ((msg = obscure_msg(old, newval, pwdp))) {
printf("Bad password: %s.\n", msg);
/* If user is root warn only */
- return (getuid())? 1 : 0;
+ return getuid() ? 1 : 0;
}
return 0;
}