diff options
| author | simonb <simonb@NetBSD.org> | 2003-06-05 10:41:32 +0000 |
|---|---|---|
| committer | simonb <simonb@NetBSD.org> | 2003-06-05 10:41:32 +0000 |
| commit | a9f5b3f871edce65d2db476fc1ca00ee38d885c8 (patch) | |
| tree | 3c97b80775223e5a26222c46c31b08981af8ea9d /libexec | |
| parent | 85cee2b43abb23a93fe857b1604fc9b2caead793 (diff) | |
KNF- blank lines before code at start of functions.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.elf_so/debug.c | 3 | ||||
| -rw-r--r-- | libexec/ld.elf_so/map_object.c | 3 | ||||
| -rw-r--r-- | libexec/ld.elf_so/paths.c | 3 | ||||
| -rw-r--r-- | libexec/ld.elf_so/rtld.c | 10 | ||||
| -rw-r--r-- | libexec/ld.elf_so/xmalloc.c | 5 | ||||
| -rw-r--r-- | libexec/ld.elf_so/xprintf.c | 5 |
6 files changed, 23 insertions, 6 deletions
diff --git a/libexec/ld.elf_so/debug.c b/libexec/ld.elf_so/debug.c index dc22c1e8cfc..5513aee7827 100644 --- a/libexec/ld.elf_so/debug.c +++ b/libexec/ld.elf_so/debug.c @@ -1,4 +1,4 @@ -/* $NetBSD: debug.c,v 1.3 2002/05/26 00:02:07 wiz Exp $ */ +/* $NetBSD: debug.c,v 1.4 2003/06/05 10:41:32 simonb Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -47,6 +47,7 @@ int debug = 0; void debug_printf(const char *format, ...) { + if(debug) { va_list ap; diff --git a/libexec/ld.elf_so/map_object.c b/libexec/ld.elf_so/map_object.c index d063aa10a44..c6f8f80df8e 100644 --- a/libexec/ld.elf_so/map_object.c +++ b/libexec/ld.elf_so/map_object.c @@ -1,4 +1,4 @@ -/* $NetBSD: map_object.c,v 1.28 2003/03/06 17:01:27 taca Exp $ */ +/* $NetBSD: map_object.c,v 1.29 2003/06/05 10:41:32 simonb Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -342,6 +342,7 @@ protflags(elfflags) int elfflags; { int prot = 0; + if (elfflags & PF_R) prot |= PROT_READ; #ifdef RTLD_LOADER diff --git a/libexec/ld.elf_so/paths.c b/libexec/ld.elf_so/paths.c index 3fd101435a1..c057c6b9a81 100644 --- a/libexec/ld.elf_so/paths.c +++ b/libexec/ld.elf_so/paths.c @@ -1,4 +1,4 @@ -/* $NetBSD: paths.c,v 1.25 2002/10/06 01:36:36 junyoung Exp $ */ +/* $NetBSD: paths.c,v 1.26 2003/06/05 10:41:32 simonb Exp $ */ /* * Copyright 1996 Matt Thomas <matt@3am-software.com> @@ -63,6 +63,7 @@ _rtld_find_path(path, pathstr, pathlen) const char *pathstr; size_t pathlen; { + for (; path != NULL; path = path->sp_next) { if (pathlen == path->sp_pathlen && memcmp(path->sp_path, pathstr, pathlen) == 0) diff --git a/libexec/ld.elf_so/rtld.c b/libexec/ld.elf_so/rtld.c index 3dc5b8f0bcf..67908cb8edf 100644 --- a/libexec/ld.elf_so/rtld.c +++ b/libexec/ld.elf_so/rtld.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.c,v 1.93 2003/05/30 15:43:33 christos Exp $ */ +/* $NetBSD: rtld.c,v 1.94 2003/06/05 10:41:33 simonb Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -123,6 +123,7 @@ static void _rtld_call_init_functions(first) Obj_Entry *first; { + if (first != NULL) { _rtld_call_init_functions(first->next); if (first->init != NULL) @@ -139,6 +140,7 @@ static void _rtld_init(mapbase, relocbase) caddr_t mapbase, relocbase; { + /* Conjure up an Obj_Entry structure for the dynamic linker. */ _rtld_objself.path = _rtld_path; _rtld_objself.pathlen = strlen(_rtld_path); @@ -181,6 +183,7 @@ _rtld_init(mapbase, relocbase) static void _rtld_exit() { + dbg(("rtld_exit()")); _rtld_call_fini_functions(_rtld_objlist->next); @@ -488,6 +491,7 @@ static void _rtld_init_dag(root) Obj_Entry *root; { + _rtld_init_dag1(root, root); } @@ -519,6 +523,7 @@ _rtld_unload_object(root, do_fini_funcs) Obj_Entry *root; bool do_fini_funcs; { + _rtld_unref_dag(root); if (root->refcount == 0) { /* We are finished with some objects. */ Obj_Entry *obj; @@ -564,6 +569,7 @@ static void _rtld_unref_dag(root) Obj_Entry *root; { + assert(root); assert(root->refcount != 0); --root->refcount; @@ -603,6 +609,7 @@ char * _rtld_dlerror() { char *msg = error_message; + error_message = NULL; return msg; } @@ -842,6 +849,7 @@ _rtld_error(const char *fmt,...) void _rtld_debug_state() { + /* do nothing */ } diff --git a/libexec/ld.elf_so/xmalloc.c b/libexec/ld.elf_so/xmalloc.c index d16a693da60..52bf073dbb2 100644 --- a/libexec/ld.elf_so/xmalloc.c +++ b/libexec/ld.elf_so/xmalloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: xmalloc.c,v 1.2 1999/03/01 16:40:08 christos Exp $ */ +/* $NetBSD: xmalloc.c,v 1.3 2003/06/05 10:41:33 simonb Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -42,6 +42,7 @@ void * xcalloc(size) size_t size; { + return memset(xmalloc(size), 0, size); } @@ -50,6 +51,7 @@ xmalloc(size) size_t size; { void *p = malloc(size); + if (p == NULL) xerr(1, "%s", xstrerror(errno)); return p; @@ -60,6 +62,7 @@ xstrdup(s) const char *s; { char *p = strdup(s); + if (p == NULL) xerr(1, "%s", xstrerror(errno)); return p; diff --git a/libexec/ld.elf_so/xprintf.c b/libexec/ld.elf_so/xprintf.c index a77af361d25..17d55a6f94e 100644 --- a/libexec/ld.elf_so/xprintf.c +++ b/libexec/ld.elf_so/xprintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: xprintf.c,v 1.13 2002/09/24 14:09:43 mycroft Exp $ */ +/* $NetBSD: xprintf.c,v 1.14 2003/06/05 10:41:33 simonb Exp $ */ /* * Copyright 1996 Matt Thomas <matt@3am-software.com> @@ -189,6 +189,7 @@ xvprintf(fmt, ap) va_list ap; { char buf[256]; + (void) write(2, buf, xvsnprintf(buf, sizeof(buf), fmt, ap)); } @@ -220,6 +221,7 @@ const char * xstrerror(error) int error; { + if (error >= sys_nerr || error < 0) { static char buf[128]; xsnprintf(buf, sizeof(buf), "Unknown error: %d", error); @@ -287,6 +289,7 @@ xassert(file, line, failedexpr) int line; const char *failedexpr; { + xprintf("assertion \"%s\" failed: file \"%s\", line %d\n", failedexpr, file, line); abort(); |
