diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-05-18 17:00:07 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-05-18 17:00:07 +0000 |
commit | f7c00ef19038326f8c0c8a028b13e9d72016afe1 (patch) | |
tree | 68088758f5e2f082654ad409e1b69ea9d3e62b3f /libexec/ld.so | |
parent | eb8526929c2e188b7312e11896738ba3caf18dca (diff) |
spacing
Diffstat (limited to 'libexec/ld.so')
-rw-r--r-- | libexec/ld.so/ldconfig/debug.c | 4 | ||||
-rw-r--r-- | libexec/ld.so/ldconfig/ldconfig.c | 6 | ||||
-rw-r--r-- | libexec/ld.so/ldconfig/prebind.c | 28 |
3 files changed, 19 insertions, 19 deletions
diff --git a/libexec/ld.so/ldconfig/debug.c b/libexec/ld.so/ldconfig/debug.c index 76b20344433..9f16f95e624 100644 --- a/libexec/ld.so/ldconfig/debug.c +++ b/libexec/ld.so/ldconfig/debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: debug.c,v 1.3 2006/05/14 21:09:47 deraadt Exp $ */ +/* $OpenBSD: debug.c,v 1.4 2006/05/18 17:00:06 deraadt Exp $ */ /* * Copyright (c) 2006 Dale Rahn <drahn@dalerahn.com> * @@ -136,7 +136,7 @@ dump_symcachetab(struct symcachetab *symcachetab, int symcache_cnt, } void -elf_print_prog_list (prog_list_ty *prog_list) +elf_print_prog_list(prog_list_ty *prog_list) { struct elf_object *object; struct proglist *pl; diff --git a/libexec/ld.so/ldconfig/ldconfig.c b/libexec/ld.so/ldconfig/ldconfig.c index 9022349a0dc..7b91fd726b6 100644 --- a/libexec/ld.so/ldconfig/ldconfig.c +++ b/libexec/ld.so/ldconfig/ldconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldconfig.c,v 1.21 2006/05/13 16:33:40 deraadt Exp $ */ +/* $OpenBSD: ldconfig.c,v 1.22 2006/05/18 17:00:06 deraadt Exp $ */ /* * Copyright (c) 1993,1995 Paul Kranenburg @@ -155,11 +155,11 @@ main(int argc, char *argv[]) if (delete) { if (rescan || unconfig || merge || justread || nostd || doprebind) errx(1, "cannot mix -U -R -r -s -P options with -D"); - exit (prebind_delete(&argv[optind])); + exit(prebind_delete(&argv[optind])); } else if (doprebind) { if (rescan || unconfig || justread || nostd) errx(1, "cannot mix other options with -P"); - exit (prebind(&argv[optind])); + exit(prebind(&argv[optind])); } if (unconfig) { diff --git a/libexec/ld.so/ldconfig/prebind.c b/libexec/ld.so/ldconfig/prebind.c index 87af5fa02cb..ce08c3f36a3 100644 --- a/libexec/ld.so/ldconfig/prebind.c +++ b/libexec/ld.so/ldconfig/prebind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prebind.c,v 1.4 2006/05/14 21:09:47 deraadt Exp $ */ +/* $OpenBSD: prebind.c,v 1.5 2006/05/18 17:00:06 deraadt Exp $ */ /* * Copyright (c) 2006 Dale Rahn <drahn@dalerahn.com> * @@ -581,7 +581,7 @@ elf_load_object(void *pexe, const char *name) name); exit(10); } - bcopy (object->dyn.hash, hash, hashsz); + bcopy(object->dyn.hash, hash, hashsz); object->dyn.hash = hash; object->buckets = ((Elf_Word *)hash + 2); object->chains = object->buckets + object->nbuckets; @@ -941,7 +941,7 @@ add_fixup_prog(struct elf_object *prog, struct elf_object *obj, int idx, sizeof (struct fixup) * pl->fixupcntalloc[libidx]); if (pl->fixup[libidx] == NULL) { printf("realloc fixup, out of memory\n"); - exit (20); + exit(20); } } cnt = pl->fixupcnt[libidx]; @@ -1502,7 +1502,7 @@ elf_prep_lib_prebind(struct elf_object *object) nameidx[i].id0 = objarray[idxtolib[i]].id0; nameidx[i].id1 = objarray[idxtolib[i]].id1; nametablen += strlen(objarray[idxtolib[i]].obj->load_name) + 1; - strlcpy (&nametab[nameidx[i].name], + strlcpy(&nametab[nameidx[i].name], objarray[idxtolib[i]].obj->load_name, nametablen - nameidx[i].name); } @@ -1513,9 +1513,9 @@ elf_prep_lib_prebind(struct elf_object *object) numlibs, 0, NULL, NULL, NULL, NULL, symcachetab, symcache_cnt, pltsymcachetab, pltsymcache_cnt); - free (nameidx); - free (nametab); - free (libmap); + free(nameidx); + free(nametab); + free(libmap); free(pltsymcachetab); free(symcachetab); @@ -1617,7 +1617,7 @@ elf_prep_bin_prebind(struct proglist *pl) nameidx[i].id1 = objarray[idxtolib[i]].id1; nametablen += strlen(objarray[idxtolib[i]].obj->load_name) + 1; - strlcpy (&nametab[nameidx[i].name], + strlcpy(&nametab[nameidx[i].name], objarray[idxtolib[i]].obj->load_name, nametablen - nameidx[i].name); } @@ -1836,7 +1836,7 @@ elf_write_lib(struct elf_object *object, struct nameidx *nameidx, if (verbose > 1) elf_dump_footer(&footer); - close (fd); + close(fd); return 0; } void @@ -2032,7 +2032,7 @@ write_txtbusy_file(char *name) err = asprintf(&prebind_name, "%s%s", name, ".prebXXXXXXXXXX"); if (err == -1) { /* fail */ - exit (10); /* bail on memory failure */ + exit(10); /* bail on memory failure */ } mkstemp(prebind_name); @@ -2055,11 +2055,11 @@ write_txtbusy_file(char *name) } /* this mode is used above, but is modified by umask */ - chmod (prebind_name, sb.st_mode); + chmod(prebind_name, sb.st_mode); close(oldfd); unlink(name); - rename (prebind_name, name); - free (buf); + rename(prebind_name, name); + free(buf); return fd; } @@ -2159,6 +2159,6 @@ copy_oldsymcache(int objidx, void *prebind_map) symcache[i].sym_idx; } done: - free (idxtolib); + free(idxtolib); /* munmap(prebind_map, size);*/ } |