aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@bsdimp.com>2021-04-23 16:22:19 -0600
committerWarner Losh <imp@bsdimp.com>2021-04-30 09:11:45 -0600
commitfa0546370d6d13016687854c341d057520672aec (patch)
tree27ca3182ab8a4667693711be614238c66b18c8f9
parentcefbade1739fe18da295f6cf1d3d6f1acab280bb (diff)
bsd-user: style tweak: return is not a function, eliminate ()
Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Warner Losh <imp@bsdimp.com>
-rw-r--r--bsd-user/bsdload.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c
index 546946b91d..fd14ffa4cd 100644
--- a/bsd-user/bsdload.c
+++ b/bsd-user/bsdload.c
@@ -28,7 +28,7 @@ static int count(char **vec)
vec++;
}
- return(i);
+ return i;
}
static int prepare_binprm(struct linux_binprm *bprm)
@@ -38,15 +38,15 @@ static int prepare_binprm(struct linux_binprm *bprm)
int retval;
if (fstat(bprm->fd, &st) < 0) {
- return(-errno);
+ return -errno;
}
mode = st.st_mode;
if (!S_ISREG(mode)) { /* Must be regular file */
- return(-EACCES);
+ return -EACCES;
}
if (!(mode & 0111)) { /* Must have at least one execute bit set */
- return(-EACCES);
+ return -EACCES;
}
bprm->e_uid = geteuid();
@@ -75,10 +75,9 @@ static int prepare_binprm(struct linux_binprm *bprm)
if (retval < 0) {
perror("prepare_binprm");
exit(-1);
- /* return(-errno); */
}
else {
- return(retval);
+ return retval;
}
}
@@ -169,5 +168,5 @@ int loader_exec(const char *filename, char **argv, char **envp,
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
g_free(bprm.page[i]);
}
- return(retval);
+ return retval;
}