diff options
| author | peter <peter@FreeBSD.org> | 2002-02-07 22:36:19 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-02-07 22:36:19 +0000 |
| commit | 7562301aac635a34bd1a7da0a9fc756f1f095536 (patch) | |
| tree | 11fd71fc29712bbd02f8bde64f8f5c3eef07a205 | |
| parent | 1470f0dc9784aba869bb4da1436c91c3b25ab84f (diff) | |
| download | FreeBSD-src-7562301aac635a34bd1a7da0a9fc756f1f095536.zip FreeBSD-src-7562301aac635a34bd1a7da0a9fc756f1f095536.tar.gz | |
Attempt to unmangle some code touched in the previous commit.
| -rw-r--r-- | sys/compat/pecoff/imgact_pecoff.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c index c7f7b28..ac608f5 100644 --- a/sys/compat/pecoff/imgact_pecoff.c +++ b/sys/compat/pecoff/imgact_pecoff.c @@ -459,9 +459,8 @@ exec_pecoff_coff_prep_zmagic(struct image_params * imgp, sh = malloc(scnsiz, M_TEMP, M_WAITOK); wp = (void *) ((char *) ap + sizeof(struct coff_aouthdr)); - error = pecoff_read_from(FIRST_THREAD_IN_PROC(imgp->proc), - imgp->vp, peofs + PECOFF_HDR_SIZE, - (caddr_t) sh, scnsiz); + error = pecoff_read_from(FIRST_THREAD_IN_PROC(imgp->proc), imgp->vp, + peofs + PECOFF_HDR_SIZE, (caddr_t) sh, scnsiz); if ((error = exec_extract_strings(imgp)) != 0) goto fail; exec_new_vmspace(imgp); @@ -478,9 +477,9 @@ exec_pecoff_coff_prep_zmagic(struct image_params * imgp, error = pecoff_load_section( FIRST_THREAD_IN_PROC(imgp->proc), - vmspace, imgp->vp, sh[i].s_scnptr - ,(caddr_t) sh[i].s_vaddr, sh[i].s_paddr, sh[i].s_size - ,prot); + vmspace, imgp->vp, sh[i].s_scnptr, + (caddr_t) sh[i].s_vaddr, sh[i].s_paddr, + sh[i].s_size ,prot); DPRINTF(("ERROR%d\n", error)); if (error) goto fail; @@ -490,11 +489,9 @@ exec_pecoff_coff_prep_zmagic(struct image_params * imgp, } if ((sh[i].s_flags & (COFF_STYP_DATA|COFF_STYP_BSS)) != 0) { if (pecoff_load_section( - FIRST_THREAD_IN_PROC(imgp->proc), - vmspace, imgp->vp, sh[i].s_scnptr, - (caddr_t) sh[i].s_vaddr, - sh[i].s_paddr, sh[i].s_size, - prot) != 0) + FIRST_THREAD_IN_PROC(imgp->proc), vmspace, + imgp->vp, sh[i].s_scnptr, (caddr_t) sh[i].s_vaddr, + sh[i].s_paddr, sh[i].s_size, prot) != 0) goto fail; data_addr = min(trunc_page(sh[i].s_vaddr), data_addr); dsize = round_page(sh[i].s_vaddr + sh[i].s_paddr) |
