Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/libexec/ld.elf_so Trailing whitespace
details: https://anonhg.NetBSD.org/src/rev/7e0d5410a4b7
branches: trunk
changeset: 786659:7e0d5410a4b7
user: skrll <skrll%NetBSD.org@localhost>
date: Mon May 06 08:02:20 2013 +0000
description:
Trailing whitespace
diffstat:
libexec/ld.elf_so/debug.h | 6 +++---
libexec/ld.elf_so/expand.c | 8 ++++----
libexec/ld.elf_so/headers.c | 10 +++++-----
libexec/ld.elf_so/load.c | 12 ++++++------
libexec/ld.elf_so/map_object.c | 6 +++---
libexec/ld.elf_so/paths.c | 10 +++++-----
libexec/ld.elf_so/rtld.c | 26 +++++++++++++-------------
libexec/ld.elf_so/rtld.h | 10 +++++-----
libexec/ld.elf_so/rtldenv.h | 4 ++--
libexec/ld.elf_so/search.c | 6 +++---
libexec/ld.elf_so/sysident.h | 8 ++++----
11 files changed, 53 insertions(+), 53 deletions(-)
diffs (truncated from 462 to 300 lines):
diff -r acdf78d33ac2 -r 7e0d5410a4b7 libexec/ld.elf_so/debug.h
--- a/libexec/ld.elf_so/debug.h Mon May 06 07:58:43 2013 +0000
+++ b/libexec/ld.elf_so/debug.h Mon May 06 08:02:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.h,v 1.5 2002/09/12 22:56:28 mycroft Exp $ */
+/* $NetBSD: debug.h,v 1.6 2013/05/06 08:02:20 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -35,7 +35,7 @@
* Support for printing debugging messages.
*/
-#ifndef DEBUG_H
+#ifndef DEBUG_H
#define DEBUG_H
@@ -46,7 +46,7 @@
extern int debug;
# define dbg(a) debug_printf a
-#else
+#else
# define dbg(a) ((void) 0)
#endif
#ifdef RTLD_DEBUG_RELOC
diff -r acdf78d33ac2 -r 7e0d5410a4b7 libexec/ld.elf_so/expand.c
--- a/libexec/ld.elf_so/expand.c Mon May 06 07:58:43 2013 +0000
+++ b/libexec/ld.elf_so/expand.c Mon May 06 08:02:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.5 2008/04/28 20:23:03 martin Exp $ */
+/* $NetBSD: expand.c,v 1.6 2013/05/06 08:02:20 skrll Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: expand.c,v 1.5 2008/04/28 20:23:03 martin Exp $");
+__RCSID("$NetBSD: expand.c,v 1.6 2013/05/06 08:02:20 skrll Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -91,7 +91,7 @@
case 3: /* OSNAME */
case 4: /* OSREL */
case 5: /* PLATFORM */
- len = sizeof(name);
+ len = sizeof(name);
if (sysctl(mib[what - 3], 2, name, &len, NULL, 0) == -1) {
xwarn("sysctl");
return 0;
@@ -107,7 +107,7 @@
return bp - buf;
}
-
+
size_t
_rtld_expand_path(char *buf, size_t bufsize, const char *execname,
diff -r acdf78d33ac2 -r 7e0d5410a4b7 libexec/ld.elf_so/headers.c
--- a/libexec/ld.elf_so/headers.c Mon May 06 07:58:43 2013 +0000
+++ b/libexec/ld.elf_so/headers.c Mon May 06 08:02:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.49 2013/05/06 07:54:04 skrll Exp $ */
+/* $NetBSD: headers.c,v 1.50 2013/05/06 08:02:20 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.49 2013/05/06 07:54:04 skrll Exp $");
+__RCSID("$NetBSD: headers.c,v 1.50 2013/05/06 08:02:20 skrll Exp $");
#endif /* not lint */
#include <err.h>
@@ -257,7 +257,7 @@
break;
case DT_FINI_ARRAYSZ:
- obj->fini_arraysz = dynp->d_un.d_val / sizeof(fptr_t);
+ obj->fini_arraysz = dynp->d_un.d_val / sizeof(fptr_t);
dbg(("headers: DT_FINI_ARRAYZ %zu",
obj->fini_arraysz));
break;
@@ -380,7 +380,7 @@
for (ph = phdr; ph < phlimit; ++ph) {
if (ph->p_type != PT_PHDR)
continue;
-
+
obj->phdr = (void *)(uintptr_t)ph->p_vaddr;
obj->phsize = ph->p_memsz;
obj->relocbase = (caddr_t)((uintptr_t)phdr - (uintptr_t)ph->p_vaddr);
@@ -388,7 +388,7 @@
obj->phdr, phdr, obj->phsize, obj->relocbase));
break;
}
-
+
for (ph = phdr; ph < phlimit; ++ph) {
vaddr = (Elf_Addr)(uintptr_t)(obj->relocbase + ph->p_vaddr);
switch (ph->p_type) {
diff -r acdf78d33ac2 -r 7e0d5410a4b7 libexec/ld.elf_so/load.c
--- a/libexec/ld.elf_so/load.c Mon May 06 07:58:43 2013 +0000
+++ b/libexec/ld.elf_so/load.c Mon May 06 08:02:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: load.c,v 1.42 2010/12/24 12:41:43 skrll Exp $ */
+/* $NetBSD: load.c,v 1.43 2013/05/06 08:02:20 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: load.c,v 1.42 2010/12/24 12:41:43 skrll Exp $");
+__RCSID("$NetBSD: load.c,v 1.43 2013/05/06 08:02:20 skrll Exp $");
#endif /* not lint */
#include <err.h>
@@ -68,7 +68,7 @@
SIMPLEQ_HEAD_INITIALIZER(_rtld_list_main);
Objlist _rtld_list_global = /* Objects dlopened with RTLD_GLOBAL */
SIMPLEQ_HEAD_INITIALIZER(_rtld_list_global);
-
+
void
_rtld_objlist_push_head(Objlist *list, Obj_Entry *obj)
{
@@ -117,7 +117,7 @@
size_t pathlen = strlen(filepath);
for (obj = _rtld_objlist->next; obj != NULL; obj = obj->next)
- if (pathlen == obj->pathlen && !strcmp(obj->path, filepath))
+ if (pathlen == obj->pathlen && !strcmp(obj->path, filepath))
break;
/*
@@ -271,9 +271,9 @@
(*needed)->next = ne;
*needed = ne;
}
-
+
}
-
+
}
if (got)
diff -r acdf78d33ac2 -r 7e0d5410a4b7 libexec/ld.elf_so/map_object.c
--- a/libexec/ld.elf_so/map_object.c Mon May 06 07:58:43 2013 +0000
+++ b/libexec/ld.elf_so/map_object.c Mon May 06 08:02:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: map_object.c,v 1.47 2013/04/25 12:28:59 skrll Exp $ */
+/* $NetBSD: map_object.c,v 1.48 2013/05/06 08:02:20 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.47 2013/04/25 12:28:59 skrll Exp $");
+__RCSID("$NetBSD: map_object.c,v 1.48 2013/05/06 08:02:20 skrll Exp $");
#endif /* not lint */
#include <errno.h>
@@ -204,7 +204,7 @@
dbg(("%s: %s %p phsize %" PRImemsz, obj->path, "PT_PHDR",
(void *)(uintptr_t)phdr->p_vaddr, phdr->p_memsz));
break;
-
+
case PT_DYNAMIC:
obj->dynamic = (void *)(uintptr_t)phdr->p_vaddr;
dbg(("%s: %s %p phsize %" PRImemsz, obj->path, "PT_DYNAMIC",
diff -r acdf78d33ac2 -r 7e0d5410a4b7 libexec/ld.elf_so/paths.c
--- a/libexec/ld.elf_so/paths.c Mon May 06 07:58:43 2013 +0000
+++ b/libexec/ld.elf_so/paths.c Mon May 06 08:02:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: paths.c,v 1.40 2009/05/19 20:44:52 christos Exp $ */
+/* $NetBSD: paths.c,v 1.41 2013/05/06 08:02:20 skrll Exp $ */
/*
* Copyright 1996 Matt Thomas <matt%3am-software.com@localhost>
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: paths.c,v 1.40 2009/05/19 20:44:52 christos Exp $");
+__RCSID("$NetBSD: paths.c,v 1.41 2013/05/06 08:02:20 skrll Exp $");
#endif /* not lint */
#include <err.h>
@@ -228,7 +228,7 @@
/*
* Process library mappings of the form:
- * <library_name> <machdep_variable> <value,...:library_name,...> ...
+ * <library_name> <machdep_variable> <value,...:library_name,...> ...
*/
static void
_rtld_process_mapping(Library_Xform **lib_p, const char *bp, const char *ep)
@@ -236,7 +236,7 @@
Library_Xform *hwptr = NULL;
const char *ptr, *key, *ekey, *lib, *elib, *l;
int i, j;
-
+
dbg((" processing mapping \"%.*s\"", (int)(ep - bp), bp));
if ((ptr = getword(&bp, ep, WS)) == NULL || ptr == bp)
@@ -309,7 +309,7 @@
if (i == RTLD_MAX_ENTRY)
goto no_more;
if (i != j)
- (void)memcpy(hwptr->entry[i].library,
+ (void)memcpy(hwptr->entry[i].library,
hwptr->entry[j].library,
sizeof(hwptr->entry[j].library));
hwptr->entry[i].value = exstrdup(l, key);
diff -r acdf78d33ac2 -r 7e0d5410a4b7 libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c Mon May 06 07:58:43 2013 +0000
+++ b/libexec/ld.elf_so/rtld.c Mon May 06 08:02:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.164 2013/05/06 07:58:43 skrll Exp $ */
+/* $NetBSD: rtld.c,v 1.165 2013/05/06 08:02:20 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.164 2013/05/06 07:58:43 skrll Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.165 2013/05/06 08:02:20 skrll Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -153,7 +153,7 @@
dbg (("calling fini function %s at %p%s", obj->path,
(void *)obj->fini,
obj->z_initfirst ? " (DF_1_INITFIRST)" : ""));
- obj->fini_called = 1;
+ obj->fini_called = 1;
_rtld_call_initfini_function(obj->fini, mask);
}
#ifdef HAVE_INITFINI_ARRAY
@@ -633,7 +633,7 @@
}
_rtld_objmain->mainprog = true;
-
+
/*
* Get the actual dynamic linker pathname from the executable if
* possible. (It should always be possible.) That ensures that
@@ -644,7 +644,7 @@
strcmp(_rtld_objmain->interp, _rtld_objself.path) != 0)
_rtld_objself.path = xstrdup(_rtld_objmain->interp);
dbg(("actual dynamic linker is %s", _rtld_objself.path));
-
+
_rtld_digest_dynamic(execname, _rtld_objmain);
/* Link the main program into the list of objects. */
@@ -992,7 +992,7 @@
flags |= (mode & RTLD_GLOBAL) ? _RTLD_GLOBAL : 0;
flags |= (mode & RTLD_NOLOAD) ? _RTLD_NOLOAD : 0;
-
+
nodelete = (mode & RTLD_NODELETE) ? true : false;
now = ((mode & RTLD_MODEMASK) == RTLD_NOW) ? true : false;
@@ -1103,7 +1103,7 @@
hash = _rtld_elf_hash(name);
def = NULL;
defobj = NULL;
-
+
switch ((intptr_t)handle) {
case (intptr_t)NULL:
case (intptr_t)RTLD_NEXT:
@@ -1173,7 +1173,7 @@
break;
}
-
+
if (def != NULL) {
void *p;
#ifdef __HAVE_FUNCTION_DESCRIPTORS
Home |
Main Index |
Thread Index |
Old Index