From: deraadt <deraadt@openbsd.org>
Date: Thu, 22 Jan 2015 05:48:17 +0000 (+0000)
Subject: delete annoying white space that annoy
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3334752f746bd3c2eb2b7b10646cdb63bb9cfb02;p=openbsd

delete annoying white space that annoy
---

diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c
index 16d8e8afb89..4b75563d0a6 100644
--- a/libexec/ld.so/dlfcn.c
+++ b/libexec/ld.so/dlfcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dlfcn.c,v 1.89 2013/11/13 05:41:41 deraadt Exp $ */
+/*	$OpenBSD: dlfcn.c,v 1.90 2015/01/22 05:48:17 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -149,7 +149,7 @@ dlsym(void *handle, const char *name)
 	elf_object_t	*object;
 	elf_object_t	*dynobj;
 	const elf_object_t	*pobj;
-	char 		*retval;
+	char		*retval;
 	const Elf_Sym	*sym = NULL;
 	int flags;
 
@@ -374,7 +374,7 @@ _dl_tracefmt(int fd, elf_object_t *object, const char *fmt1, const char *fmt2,
 	int i;
 
 	fmt = object->sod.sod_library ? fmt1 : fmt2;
-	
+
 	for (i = 0; fmt[i]; i++) {
 		if (fmt[i] != '%' && fmt[i] != '\\') {
 			_dl_fdprintf(fd, "%c", fmt[i]);
diff --git a/libexec/ld.so/library_mquery.c b/libexec/ld.so/library_mquery.c
index b331958c14f..c6cb11357cf 100644
--- a/libexec/ld.so/library_mquery.c
+++ b/libexec/ld.so/library_mquery.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: library_mquery.c,v 1.48 2015/01/16 16:18:07 deraadt Exp $ */
+/*	$OpenBSD: library_mquery.c,v 1.49 2015/01/22 05:48:17 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -280,7 +280,7 @@ retry:
 	_dl_close(libfile);
 
 	dynp = (Elf_Dyn *)((unsigned long)dynp + LOFF);
-	object = _dl_finalize_object(libname, dynp, 
+	object = _dl_finalize_object(libname, dynp,
 	    (Elf_Phdr *)((char *)lowld->start + ehdr->e_phoff), ehdr->e_phnum,
 	    type, (Elf_Addr)lowld->start, LOFF);
 	if (object) {
diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c
index d09c2bb8386..4d79ee2f5a5 100644
--- a/libexec/ld.so/loader.c
+++ b/libexec/ld.so/loader.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loader.c,v 1.152 2015/01/16 16:18:07 deraadt Exp $ */
+/*	$OpenBSD: loader.c,v 1.153 2015/01/22 05:48:17 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -139,7 +139,7 @@ _dl_run_all_dtors(void)
 		}
 
 		if (fini_complete && initfirst_skipped)
-                        fini_complete = initfirst_skipped = skip_initfirst = 0;
+			fini_complete = initfirst_skipped = skip_initfirst = 0;
 	}
 }
 
@@ -496,7 +496,7 @@ _dl_boot(const char **argv, char **envp, const long dyn_loff, long *dl_data)
 	 */
 	dynp = (Elf_Dyn *)((void *)_DYNAMIC);
 	ehdr = (Elf_Ehdr *)dl_data[AUX_base];
-        dyn_obj = _dl_finalize_object(us, dynp,
+	dyn_obj = _dl_finalize_object(us, dynp,
 	    (Elf_Phdr *)((char *)dl_data[AUX_base] + ehdr->e_phoff),
 	    ehdr->e_phnum, OBJTYPE_LDR, dl_data[AUX_base], dyn_loff);
 	_dl_add_object(dyn_obj);
diff --git a/libexec/ld.so/malloc.c b/libexec/ld.so/malloc.c
index 4e8626412d0..79f327b3162 100644
--- a/libexec/ld.so/malloc.c
+++ b/libexec/ld.so/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.6 2015/01/16 16:18:07 deraadt Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.7 2015/01/22 05:48:17 deraadt Exp $	*/
 /*
  * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
  * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -151,7 +151,7 @@ static u_char getrbyte(struct dir_info *d);
 /* low bits of r->p determine size: 0 means >= page size and p->size holding
  *  real size, otherwise r->size is a shift count, or 1 for malloc(0)
  */
-#define REALSIZE(sz, r) 					\
+#define REALSIZE(sz, r)						\
 	(sz) = (uintptr_t)(r)->p & MALLOC_PAGEMASK,		\
 	(sz) = ((sz) == 0 ? (r)->size : ((sz) == 1 ? 0 : (1 << ((sz)-1))))
 
@@ -429,9 +429,9 @@ omalloc_grow(struct dir_info *d)
 	p = MMAP_ERROR(p);
 	if (p == MAP_FAILED)
 		return 1;
-	
+
 	_dl_memset(p, 0, newsize);
-	for (i = 0; i < d->regions_total; i++) { 
+	for (i = 0; i < d->regions_total; i++) {
 		void *q = d->r[i].p;
 		if (q != NULL) {
 			size_t index = hash(q) & mask;
@@ -442,7 +442,7 @@ omalloc_grow(struct dir_info *d)
 		}
 	}
 	/* avoid pages containing meta info to end up in cache */
-	if (_dl_munmap(d->r, d->regions_total * sizeof(struct region_info))) 
+	if (_dl_munmap(d->r, d->regions_total * sizeof(struct region_info)))
 		wrterror("munmap");
 	d->regions_free = d->regions_free + d->regions_total;
 	d->regions_total = newtotal;
@@ -486,7 +486,7 @@ alloc_chunk_info(struct dir_info *d, int bits)
 }
 
 
-/* 
+/*
  * The hashtable uses the assumption that p is never NULL. This holds since
  * non-MAP_FIXED mappings with hint 0 start at BRKSIZ.
  */
@@ -566,7 +566,7 @@ delete(struct dir_info *d, struct region_info *ri)
 
 	}
 }
- 
+
 /*
  * Allocate a page of chunks
  */
@@ -683,7 +683,7 @@ malloc_bytes(struct dir_info *d, size_t size)
 			lp = &bp->bits[i / MALLOC_BITS];
 			if (!*lp) {
 				i += MALLOC_BITS;
-				i &= ~(MALLOC_BITS - 1); 
+				i &= ~(MALLOC_BITS - 1);
 				if (i >= bp->total)
 					i = 0;
 			} else
@@ -850,7 +850,7 @@ omalloc(size_t sz, int zero_fill)
  * print the error message once, to avoid making the problem
  * potentially worse.
  */
-static void  
+static void
 malloc_recurse(void)
 {
 	static int noprint;
@@ -971,7 +971,7 @@ _dl_free(void *ptr)
 	if (ptr == NULL)
 		return;
 
-	malloc_func = "free():";  
+	malloc_func = "free():";
 	if (g_pool == NULL) {
 		wrterror("free() called before allocation");
 		return;
@@ -996,7 +996,7 @@ _dl_calloc(size_t nmemb, size_t size)
 {
 	void *r;
 
-	malloc_func = "calloc():";  
+	malloc_func = "calloc():";
 	if (g_pool == NULL) {
 		if (malloc_init() != 0)
 			return NULL;
@@ -1013,7 +1013,7 @@ _dl_calloc(size_t nmemb, size_t size)
 
 	size *= nmemb;
 	r = omalloc(size, 1);
-  
+
 	malloc_active--;
 	return r;
 }
@@ -1032,7 +1032,7 @@ orealloc(void *p, size_t newsz)
 	r = find(g_pool, p);
 	if (r == NULL)
 		wrterror("bogus pointer (double free?)");
-	REALSIZE(oldsz, r);	
+	REALSIZE(oldsz, r);
 	if (oldsz > MALLOC_MAXCHUNK) {
 		if (oldsz < mopts.malloc_guard)
 			wrterror("guard size");
@@ -1048,8 +1048,8 @@ void *
 _dl_realloc(void *ptr, size_t size)
 {
 	void *r;
-  
-	malloc_func = "realloc():";  
+
+	malloc_func = "realloc():";
 	if (g_pool == NULL) {
 		if (malloc_init() != 0)
 			return NULL;
diff --git a/libexec/ld.so/path.c b/libexec/ld.so/path.c
index 37f9fcc4f47..4efd85b5485 100644
--- a/libexec/ld.so/path.c
+++ b/libexec/ld.so/path.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: path.c,v 1.4 2015/01/16 16:18:07 deraadt Exp $	*/
+/*	$OpenBSD: path.c,v 1.5 2015/01/22 05:48:17 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2013 Kurt Miller <kurt@intricatesoftware.com>
@@ -68,7 +68,7 @@ _dl_split_path(const char *searchpath)
 			retval[pos++][pp - p_begin] = '\0';
 		}
 
-		if (*pp)        /* Try curdir if ':' at end */
+		if (*pp)	/* Try curdir if ':' at end */
 			pp++;
 		else
 			pp = NULL;
diff --git a/libexec/ld.so/resolve.c b/libexec/ld.so/resolve.c
index bdcabe20024..4bc4f1e4c95 100644
--- a/libexec/ld.so/resolve.c
+++ b/libexec/ld.so/resolve.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolve.c,v 1.67 2014/07/10 09:03:01 otto Exp $ */
+/*	$OpenBSD: resolve.c,v 1.68 2015/01/22 05:48:17 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -41,7 +41,7 @@
 
 /* substitution types */
 typedef enum {
-        SUBST_UNKNOWN, SUBST_ORIGIN, SUBST_OSNAME, SUBST_OSREL, SUBST_PLATFORM
+	SUBST_UNKNOWN, SUBST_ORIGIN, SUBST_OSNAME, SUBST_OSREL, SUBST_PLATFORM
 } SUBST_TYPES;
 
 elf_object_t *_dl_objects;
@@ -180,7 +180,7 @@ _dl_origin_subst_path(elf_object_t *object, const char *origin_path,
 		return;
 
 	/* NULL terminate tmp_path */
-        *tp = '\0';
+	*tp = '\0';
 
 	if (_dl_strcmp(tmp_path, *path) == 0)
 		return;
@@ -691,5 +691,5 @@ found:
 void
 _dl_debug_state(void)
 {
-        /* Debugger stub */
+	/* Debugger stub */
 }
diff --git a/libexec/ld.so/resolve.h b/libexec/ld.so/resolve.h
index d99423e2ea0..77f8c2e6c5a 100644
--- a/libexec/ld.so/resolve.h
+++ b/libexec/ld.so/resolve.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolve.h,v 1.70 2013/11/13 05:41:42 deraadt Exp $ */
+/*	$OpenBSD: resolve.h,v 1.71 2015/01/22 05:48:17 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -141,7 +141,7 @@ struct elf_object {
 
 	/* object that caused this module to be loaded, used in symbol lookup */
 	elf_object_t	*load_object;
-	struct sod      sod;
+	struct sod	sod;
 
 	void *prebind_data;