diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 05:05:38 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 05:05:38 +0000 |
commit | 2ad6f3dee6bc54535003f4ab26bbc587b7efa38c (patch) | |
tree | a3959baf797787918878bec6d58d6a0fb743ad0a /gnu/usr.bin/ld | |
parent | 4f960dd75f181e9fa2edc44324f15f0ab5c64b37 (diff) | |
download | FreeBSD-src-2ad6f3dee6bc54535003f4ab26bbc587b7efa38c.zip FreeBSD-src-2ad6f3dee6bc54535003f4ab26bbc587b7efa38c.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'gnu/usr.bin/ld')
-rw-r--r-- | gnu/usr.bin/ld/cplus-dem.c | 26 | ||||
-rw-r--r-- | gnu/usr.bin/ld/ld.c | 28 | ||||
-rw-r--r-- | gnu/usr.bin/ld/ld.h | 8 | ||||
-rw-r--r-- | gnu/usr.bin/ld/lib.c | 4 | ||||
-rw-r--r-- | gnu/usr.bin/ld/rtld/malloc.c | 14 | ||||
-rw-r--r-- | gnu/usr.bin/ld/rtld/rtld.c | 12 | ||||
-rw-r--r-- | gnu/usr.bin/ld/symseg.h | 6 |
7 files changed, 49 insertions, 49 deletions
diff --git a/gnu/usr.bin/ld/cplus-dem.c b/gnu/usr.bin/ld/cplus-dem.c index 808db5e..27f56ef 100644 --- a/gnu/usr.bin/ld/cplus-dem.c +++ b/gnu/usr.bin/ld/cplus-dem.c @@ -5,13 +5,13 @@ #ifndef lint /*static char sccsid[] = "from: @(#)cplus-dem.c 5.4 (Berkeley) 4/30/91";*/ -static char rcsid[] = "$Id: cplus-dem.c,v 1.2 1993/08/01 18:46:58 mycroft Exp $"; +static char rcsid[] = "$Id: cplus-dem.c,v 1.3 1993/11/09 04:18:51 paul Exp $"; #endif /* not lint */ -/* Demangler for GNU C++ +/* Demangler for GNU C++ Copyright (C) 1989 Free Software Foundation, Inc. written by James Clark (jjc@jclark.uucp) - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) @@ -34,7 +34,7 @@ static char rcsid[] = "$Id: cplus-dem.c,v 1.2 1993/08/01 18:46:58 mycroft Exp $" /* This file exports one function char *cplus_demangle (const char *name) - + If `name' is a mangled function name produced by g++, then a pointer to a malloced string giving a C++ representation of the name will be returned; otherwise NULL will be returned. @@ -42,9 +42,9 @@ static char rcsid[] = "$Id: cplus-dem.c,v 1.2 1993/08/01 18:46:58 mycroft Exp $" is returned. For example, - + cplus_demangle ("_foo__1Ai") - + returns "A::foo(int)" @@ -65,7 +65,7 @@ static char rcsid[] = "$Id: cplus-dem.c,v 1.2 1993/08/01 18:46:58 mycroft Exp $" #include <strings.h> #define memcpy(s1, s2, n) bcopy ((s2), (s1), (n)) #define memcmp(s1, s2, n) bcmp ((s2), (s1), (n)) -#define strchr index +#define strchr index #define strrchr rindex #endif @@ -358,12 +358,12 @@ get_count (type, count) { const char *p = *type; int n = *count; - do + do { n *= 10; n += *p - '0'; p += 1; - } + } while (isdigit (*p)); if (*p == '_') { @@ -451,7 +451,7 @@ do_type (type, result) n *= 10; n += **type - '0'; *type += 1; - } + } while (isdigit (**type)); if (strlen (*type) < n) { @@ -783,7 +783,7 @@ static void munge_function_name (name) string *name; { - if (!string_empty (name) && name->p - name->b >= 3 + if (!string_empty (name) && name->p - name->b >= 3 && name->b[0] == 'o' && name->b[1] == 'p' && name->b[2] == '$') { int i; @@ -810,7 +810,7 @@ munge_function_name (name) for (i = 0; i < sizeof (optable)/sizeof (optable[0]); i++) { int len = name->p - name->b - 3; - if (strlen (optable[i].in) == len + if (strlen (optable[i].in) == len && memcmp (optable[i].in, name->b + 3, len) == 0) { string_clear (name); @@ -882,7 +882,7 @@ string_init (s) s->b = s->p = s->e = NULL; } -static void +static void string_clear (s) string *s; { diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c index 7570ee1..a1f81ad 100644 --- a/gnu/usr.bin/ld/ld.c +++ b/gnu/usr.bin/ld/ld.c @@ -32,9 +32,9 @@ static char sccsid[] = "@(#)ld.c 6.10 (Berkeley) 5/22/91"; Set, indirect, and warning symbol features added by Randy Smith. */ /* - * $Id: ld.c,v 1.25 1995/03/06 08:00:23 phk Exp $ + * $Id: ld.c,v 1.26 1995/03/10 19:41:50 davidg Exp $ */ - + /* Define how to initialize system-dependent header fields. */ #include <sys/param.h> @@ -75,7 +75,7 @@ int force_executable; /* 1 => assign space to common symbols even if `relocatable_output'. */ int force_common_definition; - + /* 1 => assign jmp slots to text symbols in shared objects even if non-PIC */ int force_alias_definition; @@ -214,7 +214,7 @@ int text_start_alignment; * This prevents text_start from being set later to default values. */ int T_flag_specified; - + /* * Nonzero if -Tdata was specified in the command line. * This prevents data_start from being set later to default values. @@ -404,7 +404,7 @@ main(argc, argv) * Analyze a command line argument. Return 0 if the argument is a filename. * Return 1 if the argument is a option complete in itself. Return 2 if the * argument is a option which uses an argument. - * + * * Thus, the value is the number of consecutive arguments that are part of * options. */ @@ -606,7 +606,7 @@ set_element_prefixed_p(name) /* * Record an option and arrange to act on it later. ARG should be the * following command argument, which may or may not be used by this option. - * + * * The `l' and `A' options are ignored here since they actually specify input * files. */ @@ -792,7 +792,7 @@ decode_option(swt, arg) * Call FUNCTION on each input file entry. Do not call for entries for * libraries; instead, call once for each library member that is being * loaded. - * + * * FUNCTION receives two arguments: the entry, and ARG. */ @@ -844,7 +844,7 @@ each_file(function, arg) * Call FUNCTION on each input file entry until it returns a non-zero value. * Return this value. Do not call for entries for libraries; instead, call * once for each library member that is being loaded. - * + * * FUNCTION receives two arguments: the entry, and ARG. It must be a function * returning unsigned long (though this can probably be fudged). */ @@ -1233,7 +1233,7 @@ read_file_symbols(entry) if (SARMAG != read(fd, armag, SARMAG) || strncmp (armag, ARMAG, SARMAG)) errx(1, - "%s: malformed input file (not rel or archive)", + "%s: malformed input file (not rel or archive)", get_file_name(entry)); entry->flags |= E_IS_LIBRARY; search_library(fd, entry); @@ -1320,7 +1320,7 @@ enter_file_symbols(entry) * Enter one global symbol in the hash table. LSP points to the `struct * localsymbol' from the file that describes the global symbol. NAME is the * symbol's name. ENTRY is the file entry for the file the symbol comes from. - * + * * LSP is put on the chain of all such structs that refer to the same symbol. * This chain starts in the `refs' for symbols from relocatable objects. A * backpointer to the global symbol is kept in LSP. @@ -1430,7 +1430,7 @@ enter_global_ref(lsp, name, entry) if (sp == dynamic_symbol || sp == got_symbol) { if (type != (N_UNDF | N_EXT) && !(entry->flags & E_JUST_SYMS)) - errx(1,"Linker reserved symbol %s defined as type %x ", + errx(1,"Linker reserved symbol %s defined as type %x ", name, type); return; } @@ -1608,11 +1608,11 @@ contains_symbol(entry, np) /* * Having entered all the global symbols and found the sizes of sections of * all files to be linked, make all appropriate deductions from this data. - * + * * We propagate global symbol values from definitions to references. We compute * the layout of the output file and where each input file's contents fit * into it. - * + * * This is now done in several stages. * * 1) All global symbols are examined for definitions in relocatable (.o) @@ -2062,7 +2062,7 @@ consider_relocation(entry, dataseg) * pass2() and during actual relocation. We convert * the type back to something real again when writing * out the symbols. - * + * */ lsp = &entry->symbols[reloc->r_symbolnum]; sp = lsp->symbol; diff --git a/gnu/usr.bin/ld/ld.h b/gnu/usr.bin/ld/ld.h index 6b4b7f5..82f88e8 100644 --- a/gnu/usr.bin/ld/ld.h +++ b/gnu/usr.bin/ld/ld.h @@ -1,5 +1,5 @@ /* - * $Id: ld.h,v 1.12 1994/12/23 22:30:42 nate Exp $ + * $Id: ld.h,v 1.13 1995/03/04 17:46:07 nate Exp $ */ /*- * This code is derived from software copyrighted by the Free Software @@ -446,7 +446,7 @@ extern int list_warning_symbols; * Define a linked list of strings which define symbols which should be * treated as set elements even though they aren't. Any symbol with a prefix * matching one of these should be treated as a set element. - * + * * This is to make up for deficiencies in many assemblers which aren't willing * to pass any stabs through to the loader which they don't understand. */ @@ -465,10 +465,10 @@ extern symbol *dynamic_symbol; /* the symbol __DYNAMIC */ /* * Each input file, and each library member ("subfile") being loaded, has a * `file_entry' structure for it. - * + * * For files specified by command args, these are contained in the vector which * `file_table' points to. - * + * * For library members, they are dynamically allocated, and chained through the * `chain' field. The chain is found in the `subfiles' field of the * `file_entry'. The `file_entry' objects for the members have `superfile' diff --git a/gnu/usr.bin/ld/lib.c b/gnu/usr.bin/ld/lib.c index 43953de..78d6926 100644 --- a/gnu/usr.bin/ld/lib.c +++ b/gnu/usr.bin/ld/lib.c @@ -1,5 +1,5 @@ /* - * $Id: lib.c,v 1.12 1995/03/04 17:46:08 nate Exp $ - library routines + * $Id: lib.c,v 1.14 1995/04/07 05:08:28 nate Exp $ - library routines */ #include <sys/param.h> @@ -129,7 +129,7 @@ decode_library_subfile(fd, library_entry, subfile_offset, length_loc) name[namelen] = 0; content_length -= namelen; starting_offset += namelen; - } else + } else #endif { diff --git a/gnu/usr.bin/ld/rtld/malloc.c b/gnu/usr.bin/ld/rtld/malloc.c index 0d94200..60e6ec3 100644 --- a/gnu/usr.bin/ld/rtld/malloc.c +++ b/gnu/usr.bin/ld/rtld/malloc.c @@ -33,16 +33,16 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: malloc.c,v 1.2 1994/06/15 22:41:13 rich Exp $"; +static char *rcsid = "$Id: malloc.c,v 1.3 1995/03/04 17:46:24 nate Exp $"; #endif /* LIBC_SCCS and not lint */ /* * malloc.c (Caltech) 2/21/82 * Chris Kingsley, kingsley@cit-20. * - * This is a very fast storage allocator. It allocates blocks of a small + * This is a very fast storage allocator. It allocates blocks of a small * number of different sizes, and keeps free lists of each size. Blocks that - * don't exactly fit are passed up to the next larger size. In this + * don't exactly fit are passed up to the next larger size. In this * implementation, the available sizes are 2^n-4 (or 2^n-10) bytes long. * This is designed for use in a virtual memory environment. */ @@ -280,7 +280,7 @@ morecore(bucket) void free(cp) void *cp; -{ +{ register int size; register union overhead *op; @@ -321,9 +321,9 @@ int realloc_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */ void * realloc(cp, nbytes) - void *cp; + void *cp; size_t nbytes; -{ +{ register u_int onb; register int i; union overhead *op; @@ -412,7 +412,7 @@ findbucket(freep, srchlen) #ifdef MSTATS /* * mstats - print out statistics about malloc - * + * * Prints two lines of numbers, one showing the length of the free list * for each size category, the second showing the number of mallocs - * frees for each size category. diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c index 547d51d..e0547af 100644 --- a/gnu/usr.bin/ld/rtld/rtld.c +++ b/gnu/usr.bin/ld/rtld/rtld.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: rtld.c,v 1.23 1995/03/03 06:37:36 nate Exp $ + * $Id: rtld.c,v 1.23 1995/04/21 04:57:50 nate Exp $ */ #include <sys/param.h> @@ -232,7 +232,7 @@ struct _dynamic *dp; n > 0; n -= sizeof(struct relocation_info) ) nreloc++; - + /* Relocate ourselves */ for (reloc = (struct relocation_info *)(LD_REL(dp) + crtp->crt_ba); nreloc; @@ -562,7 +562,7 @@ again: (long)dp->d_un.d_sdt += (long)addr; p = alloc_link_map(path, sodp, smp, addr, dp); - + /* save segment sizes for unmap. */ smpp = LM_PRIVATE(p); smpp->a_text = hdr.a_text; @@ -584,7 +584,7 @@ unmap_object(smp) /* Find the object in the list and unlink it */ for (prev = NULL, p = link_map_head; - p != smp; + p != smp; prev = p, p = p->som_next) continue; if (prev == NULL) { @@ -903,7 +903,7 @@ lookup(name, src_map, strong) continue; if ((buckets = LD_BUCKETS(smp->som_dynamic)) == 0) - continue; + continue; if (LM_PRIVATE(smp)->spd_flags & RTLD_RTLD) continue; @@ -1323,7 +1323,7 @@ __dlclose(fd) /* Dismantle shared object map and descriptor */ init_map(smp, "_fini"); - + if (unmap_object(smp) < 0) return -1; diff --git a/gnu/usr.bin/ld/symseg.h b/gnu/usr.bin/ld/symseg.h index 5e11b0b..112dd6f 100644 --- a/gnu/usr.bin/ld/symseg.h +++ b/gnu/usr.bin/ld/symseg.h @@ -4,7 +4,7 @@ * Foundation. * * from: @(#)symseg.h 5.4 (Berkeley) 4/30/91 - * $Id: symseg.h,v 1.2 1993/08/01 18:46:59 mycroft Exp $ + * $Id: symseg.h,v 1.3 1993/11/09 04:19:05 paul Exp $ */ /* GDB symbol table format definitions. @@ -150,7 +150,7 @@ struct type /* Type that is a pointer to this type. Zero if no such pointer-to type is known yet. The debugger may add the address of such a type - if it has to construct one later. */ + if it has to construct one later. */ struct type *pointer_type; /* Type that is a function returning this type. Zero if no such function type is known here. @@ -342,7 +342,7 @@ struct sourcevector }; /* Line number and address of one line. */ - + struct line { int linenum; |