summaryrefslogtreecommitdiffstats
path: root/bsd-user
diff options
context:
space:
mode:
authorWarner Losh2021-04-23 17:05:14 +0200
committerWarner Losh2021-04-30 17:09:18 +0200
commitca0fd2e345033e14f1d3358304243e8606ced14f (patch)
tree733e38d36a1327b5d4b77f77faad9da53cd00b35 /bsd-user
parenttarget/s390x: fix s390_probe_access to check PAGE_WRITE_ORG for writeability (diff)
downloadqemu-ca0fd2e345033e14f1d3358304243e8606ced14f.tar.gz
qemu-ca0fd2e345033e14f1d3358304243e8606ced14f.tar.xz
qemu-ca0fd2e345033e14f1d3358304243e8606ced14f.zip
bsd-user: whitespace changes
keyword space paren, no space before ( in function calls, spaces around operators. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Warner Losh <imp@bsdimp.com>
Diffstat (limited to 'bsd-user')
-rw-r--r--bsd-user/bsdload.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c
index f38c4faacf..546946b91d 100644
--- a/bsd-user/bsdload.c
+++ b/bsd-user/bsdload.c
@@ -20,11 +20,11 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
return 0;
}
-static int count(char ** vec)
+static int count(char **vec)
{
int i;
- for(i = 0; *vec; i++) {
+ for (i = 0; *vec; i++) {
vec++;
}
@@ -37,15 +37,15 @@ static int prepare_binprm(struct linux_binprm *bprm)
int mode;
int retval;
- if(fstat(bprm->fd, &st) < 0) {
+ if (fstat(bprm->fd, &st) < 0) {
return(-errno);
}
mode = st.st_mode;
- if(!S_ISREG(mode)) { /* Must be regular file */
+ if (!S_ISREG(mode)) { /* Must be regular file */
return(-EACCES);
}
- if(!(mode & 0111)) { /* Must have at least one execute bit set */
+ if (!(mode & 0111)) { /* Must have at least one execute bit set */
return(-EACCES);
}
@@ -53,7 +53,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
bprm->e_gid = getegid();
/* Set-uid? */
- if(mode & S_ISUID) {
+ if (mode & S_ISUID) {
bprm->e_uid = st.st_uid;
}
@@ -69,10 +69,10 @@ static int prepare_binprm(struct linux_binprm *bprm)
memset(bprm->buf, 0, sizeof(bprm->buf));
retval = lseek(bprm->fd, 0L, SEEK_SET);
- if(retval >= 0) {
+ if (retval >= 0) {
retval = read(bprm->fd, bprm->buf, 128);
}
- if(retval < 0) {
+ if (retval < 0) {
perror("prepare_binprm");
exit(-1);
/* return(-errno); */
@@ -125,15 +125,15 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
return sp;
}
-int loader_exec(const char * filename, char ** argv, char ** envp,
- struct target_pt_regs * regs, struct image_info *infop)
+int loader_exec(const char *filename, char **argv, char **envp,
+ struct target_pt_regs *regs, struct image_info *infop)
{
struct linux_binprm bprm;
int retval;
int i;
- bprm.p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int);
- for (i=0 ; i<MAX_ARG_PAGES ; i++) /* clear page-table */
+ bprm.p = TARGET_PAGE_SIZE * MAX_ARG_PAGES - sizeof(unsigned int);
+ for (i = 0 ; i < MAX_ARG_PAGES ; i++) /* clear page-table */
bprm.page[i] = NULL;
retval = open(filename, O_RDONLY);
if (retval < 0)
@@ -147,26 +147,26 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
retval = prepare_binprm(&bprm);
- if(retval>=0) {
+ if (retval >= 0) {
if (bprm.buf[0] == 0x7f
&& bprm.buf[1] == 'E'
&& bprm.buf[2] == 'L'
&& bprm.buf[3] == 'F') {
- retval = load_elf_binary(&bprm,regs,infop);
+ retval = load_elf_binary(&bprm, regs, infop);
} else {
fprintf(stderr, "Unknown binary format\n");
return -1;
}
}
- if(retval>=0) {
+ if (retval >= 0) {
/* success. Initialize important registers */
do_init_thread(regs, infop);
return retval;
}
/* Something went wrong, return the inode and free the argument pages*/
- for (i=0 ; i<MAX_ARG_PAGES ; i++) {
+ for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
g_free(bprm.page[i]);
}
return(retval);