From 3aade68889268c7d15e121d6d63cb1b753ec12fa Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 12 Aug 2015 04:42:37 -0700 Subject: [PATCH] Remove trailing spaces in binutils --- binutils/BRANCHES | 4 +- binutils/ChangeLog-2005 | 4 +- binutils/ChangeLog-2006 | 4 +- binutils/ChangeLog-2008 | 4 +- binutils/ChangeLog-2009 | 2 +- binutils/MAINTAINERS | 2 +- binutils/NEWS | 10 ++-- binutils/README | 2 +- binutils/ar.c | 2 +- binutils/arlex.l | 6 +-- binutils/arparse.y | 30 ++++++------ binutils/bucomm.c | 8 ++-- binutils/coffgrok.c | 2 +- binutils/configure.ac | 4 +- binutils/configure.com | 6 +-- binutils/configure.tgt | 16 +++---- binutils/deflex.l | 12 ++--- binutils/defparse.y | 28 +++++------ binutils/dlltool.c | 58 +++++++++++------------ binutils/dllwrap.c | 10 ++-- binutils/dwarf.c | 2 +- binutils/elfcomm.c | 12 ++--- binutils/embedspu.sh | 2 +- binutils/makefile.vms | 4 +- binutils/mcparse.y | 10 ++-- binutils/nlmconv.c | 8 ++-- binutils/nm.c | 4 +- binutils/objcopy.c | 10 ++-- binutils/objdump.c | 100 ++++++++++++++++++++-------------------- binutils/rclex.c | 12 ++--- binutils/rcparse.y | 42 ++++++++--------- binutils/resbin.c | 6 +-- binutils/rescoff.c | 2 +- binutils/resrc.c | 14 +++--- binutils/resres.c | 2 +- binutils/stabs.c | 2 +- binutils/strings.c | 6 +-- binutils/sysinfo.y | 88 +++++++++++++++++------------------ binutils/syslex.l | 2 +- binutils/syslex_wrap.c | 2 +- binutils/sysroff.info | 32 ++++++------- binutils/windres.c | 16 +++---- 42 files changed, 296 insertions(+), 296 deletions(-) diff --git a/binutils/BRANCHES b/binutils/BRANCHES index 0f1e02d963..baa524bf9b 100644 --- a/binutils/BRANCHES +++ b/binutils/BRANCHES @@ -2,14 +2,14 @@ Please keep the following tables alphabetical. Organization Tag Organization Name ---------------- ----------------- -csl CodeSourcery, LLC +csl CodeSourcery, LLC This table lists branches created by particular organizations. Please include the branch name, and a description of the branch. The branch description should name the owner of the branch (i.e., the person to contact regarding the branch) and a description of the commit policy for the branch (e.g., "no commits without permission of X or Y"). - + Organization Branches Description --------------------- ----------- binutils-csl-arm-2005q1-branch diff --git a/binutils/ChangeLog-2005 b/binutils/ChangeLog-2005 index 39e9a82ceb..416013e253 100644 --- a/binutils/ChangeLog-2005 +++ b/binutils/ChangeLog-2005 @@ -178,7 +178,7 @@ * srconv.c (usage): Likewise. * strings.c (usage): Likewise. * windres.c (usage): Likewise. - * doc/binutils.texi: Add section on common options. + * doc/binutils.texi: Add section on common options. 2005-10-03 H.J. Lu @@ -236,7 +236,7 @@ * sysdump.c (main): Likewise. * sysinfo.y (main): Likewise. * windres.c (main): Likewise. - + 2005-09-30 H.J. Lu * Makefile.am: Run "make dep-am". diff --git a/binutils/ChangeLog-2006 b/binutils/ChangeLog-2006 index b837782526..8286b4aaf5 100644 --- a/binutils/ChangeLog-2006 +++ b/binutils/ChangeLog-2006 @@ -153,7 +153,7 @@ of each copied archive element, otherwise force them to be one specific file format. (copy_file): Compute force_output_target parameter to pass to - copy_archive. + copy_archive. 2006-09-05 Nick Clifton @@ -219,7 +219,7 @@ Nigel Stephens * readelf.c (dump_relocations): Handle MIPS-specific - SHN_MIPS_SCOMMON and SHN_MIPS_SUNDEFINED. + SHN_MIPS_SCOMMON and SHN_MIPS_SUNDEFINED. (get_symbol_index_type): Similarly. 2006-07-24 Ralk Wildenhues diff --git a/binutils/ChangeLog-2008 b/binutils/ChangeLog-2008 index a1b9505e2e..f04688cc43 100644 --- a/binutils/ChangeLog-2008 +++ b/binutils/ChangeLog-2008 @@ -88,7 +88,7 @@ * readelf.c (arm_attr_tag_ABI_FP_16bit_format): New. (arm_attr_tag_VFP_HP_extension): New. (arm_attr_public_tag arm_attr_public_tags): Support - new attributes. + new attributes. 2008-11-17 Nick Clifton @@ -365,7 +365,7 @@ 2008-07-15 H.J. Lu - * objdump.c (load_debug_section): Initialize section_is_compressed + * objdump.c (load_debug_section): Initialize section_is_compressed for gcc 3.4/ia64. * readelf.c (load_debug_section): Likewise. diff --git a/binutils/ChangeLog-2009 b/binutils/ChangeLog-2009 index 5a3d78704b..d5f9357277 100644 --- a/binutils/ChangeLog-2009 +++ b/binutils/ChangeLog-2009 @@ -109,7 +109,7 @@ (is_32bit_abs_reloc): Add support for xc16c 32-bit absolute reloc. (is_16bit_abs_reloc): Add support for xc16c 16-bit absolute reloc. (is_none_reloc): Add support for xc16c null reloc. - + 2009-11-20 Ben Elliston * Makefile.am (syslex.o): Use $(NO_WERROR) not -Wno-error. diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS index 37f4601b6f..c5e34685b5 100644 --- a/binutils/MAINTAINERS +++ b/binutils/MAINTAINERS @@ -144,7 +144,7 @@ responsibility among the other maintainers. x86_64 H.J. Lu XCOFF Richard Sandiford XGATE Sean Keys - Xtensa Sterling Augustine + Xtensa Sterling Augustine z80 Arnold Metselaar z8k Christian Groessler diff --git a/binutils/NEWS b/binutils/NEWS index 051fe48be6..36f2c056ef 100644 --- a/binutils/NEWS +++ b/binutils/NEWS @@ -114,7 +114,7 @@ Changes in 2.20: * Add new option --use-nul-prefixed-import-tables to dlltool to allow fall- back to old import table generation with null element prefix. -* Added --identify-strict switch to cause --identify to +* Added --identify-strict switch to cause --identify to report an error when the import library is associated with multiple DLLs. @@ -133,7 +133,7 @@ Changes in 2.19: object files rather than the files themselves and which contain a flattened symbol index for all objects, and archives, which have been added to the archive. - + * Added -F switch to objdump to include file offsets in the disassembly. * Added -c switch to readelf to allow string dumps of archive symbol index. @@ -198,9 +198,9 @@ Changes in 2.17: * Add "--globalize-symbol " and "--globalize-symbols " switches to objcopy to convert local symbols into global symbols. - + * gprof now allows input files to have histogram records for - several memory ranges, provided those ranges are disjoint. + several memory ranges, provided those ranges are disjoint. Changes in 2.16: @@ -249,7 +249,7 @@ Changes in 2.15: * objcopy now accepts --add-gnu-debuglink= to insert a .gnu_debuglink section into a (presumably stripped) executable. This allows the debug information for the file to be held in a separate file. - + * BFD marks the sections .comment and .note as 'n' in the BSD/POSIX single-character representation. This can be checked by running nm with the -a switch. diff --git a/binutils/README b/binutils/README index 5ad30b0b5d..6838fa5ae7 100644 --- a/binutils/README +++ b/binutils/README @@ -57,7 +57,7 @@ By default, the binutils will be configured to support the system on which they are built. When doing cross development, use the --target configure option to specify a different target, eg: - ./configure --target=foo-elf + ./configure --target=foo-elf The --enable-targets option adds support for more binary file formats besides the default. List them as the argument to --enable-targets, diff --git a/binutils/ar.c b/binutils/ar.c index 2765dcc5f7..b0fb7ffda1 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -955,7 +955,7 @@ open_inarch (const char *archive_filename, const char *file) bfd_get_filename (arch)); goto bloser; } - } + } last_one = &(arch->archive_next); /* Read all the contents right away, regardless. */ diff --git a/binutils/arlex.l b/binutils/arlex.l index 1e8fbda2d2..28f61b4bb6 100644 --- a/binutils/arlex.l +++ b/binutils/arlex.l @@ -33,7 +33,7 @@ #ifndef YY_NO_UNPUT #define YY_NO_UNPUT #endif - + extern int yylex (void); int linenumber; @@ -78,14 +78,14 @@ int linenumber; "(" { return '('; } ")" { return ')'; } "," { return ','; } -[A-Za-z0-9/\\$:.\-\_]+ { +[A-Za-z0-9/\\$:.\-\_]+ { yylval.name = xstrdup (yytext); return FILENAME; } "*".* { } ";".* { } " " { } -"\n" { linenumber ++; return NEWLINE; } +"\n" { linenumber ++; return NEWLINE; } %% #ifndef yywrap diff --git a/binutils/arparse.y b/binutils/arparse.y index 75078109d5..95a8687082 100644 --- a/binutils/arparse.y +++ b/binutils/arparse.y @@ -59,7 +59,7 @@ struct list *list ; %token SAVE %token OPEN -%type modulelist +%type modulelist %type modulename %type optional_filename %% @@ -78,8 +78,8 @@ command_line: ; command: - open_command - | create_command + open_command + | create_command | verbose_command | directory_command | addlib_command @@ -102,11 +102,11 @@ extract_command: { ar_extract($2); } ; -replace_command: +replace_command: REPLACE modulename { ar_replace($2); } ; - + clear_command: CLEAR { ar_clear(); } @@ -121,12 +121,12 @@ addmod_command: { ar_addmod($2); } ; -list_command: +list_command: LIST { ar_list(); } ; -save_command: +save_command: SAVE { ar_save(); } ; @@ -134,12 +134,12 @@ save_command: open_command: - OPEN FILENAME + OPEN FILENAME { ar_open($2,0); } ; create_command: - CREATE FILENAME + CREATE FILENAME { ar_open($2,1); } ; @@ -162,7 +162,7 @@ optional_filename: ; modulelist: - '(' modulename ')' + '(' modulename ')' { $$ = $2; } | { $$ = 0; } @@ -171,22 +171,22 @@ modulelist: modulename: modulename optcomma FILENAME { struct list *n = (struct list *) malloc(sizeof(struct list)); - n->next = $1; + n->next = $1; n->name = $3; $$ = n; } | { $$ = 0; } ; - + optcomma: ',' | ; - - + + verbose_command: - VERBOSE + VERBOSE { verbose = !verbose; } ; diff --git a/binutils/bucomm.c b/binutils/bucomm.c index 06fbc462e2..4621e601ba 100644 --- a/binutils/bucomm.c +++ b/binutils/bucomm.c @@ -86,7 +86,7 @@ bfd_nonfatal_message (const char *filename, section_name = NULL; va_start (args, format); fprintf (stderr, "%s", program_name); - + if (abfd) { if (!filename) @@ -574,7 +574,7 @@ off_t get_file_size (const char * file_name) { struct stat statbuf; - + if (stat (file_name, &statbuf) < 0) { if (errno == ENOENT) @@ -582,7 +582,7 @@ get_file_size (const char * file_name) else non_fatal (_("Warning: could not locate '%s'. reason: %s"), file_name, strerror (errno)); - } + } else if (! S_ISREG (statbuf.st_mode)) non_fatal (_("Warning: '%s' is not an ordinary file"), file_name); else if (statbuf.st_size < 0) @@ -604,7 +604,7 @@ bfd_get_archive_filename (const bfd *abfd) size_t needed; assert (abfd != NULL); - + if (!abfd->my_archive) return bfd_get_filename (abfd); diff --git a/binutils/coffgrok.c b/binutils/coffgrok.c index 87b87c3cbd..779c66264a 100644 --- a/binutils/coffgrok.c +++ b/binutils/coffgrok.c @@ -886,7 +886,7 @@ coff_grok (bfd *inabfd) non_fatal (_("%s: is not a COFF format file"), bfd_get_filename (abfd)); return NULL; } - + storage = bfd_get_symtab_upper_bound (abfd); if (storage < 0) diff --git a/binutils/configure.ac b/binutils/configure.ac index 31864ec9dc..c27844f3a0 100644 --- a/binutils/configure.ac +++ b/binutils/configure.ac @@ -6,12 +6,12 @@ dnl This file is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 3 of the License, or dnl (at your option) any later version. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; see the file COPYING3. If not see dnl . diff --git a/binutils/configure.com b/binutils/configure.com index e5c6b07b66..e123c2c9d0 100644 --- a/binutils/configure.com +++ b/binutils/configure.com @@ -2,19 +2,19 @@ $! $! This file configures binutils for use with openVMS/Alpha $! We do not use the configure script, since we do not have /bin/sh $! to execute it. -$! +$! $! Copyright (C) 2012-2015 Free Software Foundation, Inc. $! $! This file 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 3 of the License, or $! (at your option) any later version. -$! +$! $! This program is distributed in the hope that it will be useful, $! but WITHOUT ANY WARRANTY; without even the implied warranty of $! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the $! GNU General Public License for more details. -$! +$! $! You should have received a copy of the GNU General Public License $! along with this program; see the file COPYING3. If not see $! . diff --git a/binutils/configure.tgt b/binutils/configure.tgt index d614fa030b..6093e4e436 100644 --- a/binutils/configure.tgt +++ b/binutils/configure.tgt @@ -9,12 +9,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING3. If not see # . @@ -26,17 +26,17 @@ case "${targ}" in powerpc-*-aix[5-9]* | rs6000-*-aix[5-9]*) - targ_emul=aix - targ_emul_vector=bin_aix_emulation + targ_emul=aix + targ_emul_vector=bin_aix_emulation ;; powerpc-*-aix4.3* | rs6000-*-aix4.3*) - targ_emul=aix - targ_emul_vector=bin_aix_emulation + targ_emul=aix + targ_emul_vector=bin_aix_emulation ;; *) - targ_emul=vanilla - targ_emul_vector=bin_vanilla_emulation + targ_emul=vanilla + targ_emul_vector=bin_vanilla_emulation ;; esac diff --git a/binutils/deflex.l b/binutils/deflex.l index e9eca4a970..54e62c2690 100644 --- a/binutils/deflex.l +++ b/binutils/deflex.l @@ -3,19 +3,19 @@ %{/* deflex.l - Lexer for .def files */ /* Copyright (C) 1995-2015 Free Software Foundation, Inc. - + This file is part of GNU Binutils. - + 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 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, @@ -60,10 +60,10 @@ int linenumber; "TERMINSTANCE" { return TERMINSTANCE;} "TERMGLOBAL" { return TERMGLOBAL;} -[0-9][x0-9A-Fa-f]* { yylval.number = strtol (yytext,0,0); +[0-9][x0-9A-Fa-f]* { yylval.number = strtol (yytext,0,0); return NUMBER; } -(@)?[A-Za-z$:\-\_?][A-Za-z0-9/$:\<\>\-\_@?]* { +(@)?[A-Za-z$:\-\_?][A-Za-z0-9/$:\<\>\-\_@?]* { yylval.id = xstrdup (yytext); return ID; } diff --git a/binutils/defparse.y b/binutils/defparse.y index 4b3bbe71b4..0ad5b5c3fc 100644 --- a/binutils/defparse.y +++ b/binutils/defparse.y @@ -1,19 +1,19 @@ %{ /* defparse.y - parser for .def files */ /* Copyright (C) 1995-2015 Free Software Foundation, Inc. - + This file is part of GNU Binutils. - + 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 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, @@ -49,10 +49,10 @@ start: start command | command ; -command: +command: NAME opt_name opt_base { def_name ($2, $3); } | LIBRARY opt_name opt_base option_list { def_library ($2, $3); } - | EXPORTS explist + | EXPORTS explist | DESCRIPTION ID { def_description ($2);} | STACKSIZE NUMBER opt_number { def_stacksize ($2, $3);} | HEAPSIZE NUMBER opt_number { def_heapsize ($2, $3);} @@ -75,7 +75,7 @@ expline: opt_import_name { def_exports ($1, $2, $3, $4, $5, $6, $7, $8);} ; -implist: +implist: implist impline | impline ; @@ -115,12 +115,12 @@ attr_list: opt_comma: ',' - | + | ; opt_number: ',' NUMBER { $$=$2;} | { $$=-1;} ; - + attr: READ { $$ = 1; } | WRITE { $$ = 2; } @@ -190,19 +190,19 @@ opt_name2: ID { $$ = $1; } $$ = name; } | '.' opt_name2 - { + { char *name = xmalloc (strlen ($2) + 2); sprintf (name, ".%s", $2); $$ = name; } | keyword_as_name '.' opt_name2 - { + { char *name = xmalloc (strlen ($1) + 1 + strlen ($3) + 1); sprintf (name, "%s.%s", $1, $3); $$ = name; } | ID '.' opt_name2 - { + { char *name = xmalloc (strlen ($1) + 1 + strlen ($3) + 1); sprintf (name, "%s.%s", $1, $3); $$ = name; @@ -212,7 +212,7 @@ opt_name: opt_name2 { $$ =$1; } | { $$=""; } ; -opt_ordinal: +opt_ordinal: '@' NUMBER { $$=$2;} | { $$=-1;} ; @@ -224,7 +224,7 @@ opt_import_name: opt_equal_name: '=' opt_name2 { $$ = $2; } - | { $$ = 0; } + | { $$ = 0; } ; opt_base: BASE '=' NUMBER { $$= $3;} diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 6aa11dd332..2d404d24a6 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -370,7 +370,7 @@ typedef struct dll_name_list_t { dll_name_list_node_type * head; dll_name_list_node_type * tail; -} dll_name_list_type; +} dll_name_list_type; /* Types used to pass data to iterator functions. */ typedef struct symname_search_data_t @@ -383,7 +383,7 @@ typedef struct identify_data_t { dll_name_list_type * list; bfd_boolean ms_style_implib; -} identify_data_type; +} identify_data_type; static char *head_label; @@ -482,7 +482,7 @@ static char * mcore_elf_linker_flags = NULL; #endif /* What's the right name for this ? */ -#define PATHMAX 250 +#define PATHMAX 250 /* External name alias numbering starts here. */ #define PREFIX_ALIAS_BASE 20000 @@ -588,7 +588,7 @@ static const unsigned char ppc_jtab[] = static bfd_vma ppc_glue_insn = 0x80410004; #endif -static const char i386_trampoline[] = +static const char i386_trampoline[] = "\tpushl %%ecx\n" "\tpushl %%edx\n" "\tpushl %%eax\n" @@ -598,7 +598,7 @@ static const char i386_trampoline[] = "\tpopl %%ecx\n" "\tjmp *%%eax\n"; -static const char i386_x64_trampoline[] = +static const char i386_x64_trampoline[] = "\tpushq %%rcx\n" "\tpushq %%rdx\n" "\tpushq %%r8\n" @@ -1084,7 +1084,7 @@ set_dll_name_from_def (const char *name, char is_dll) if (image_basename != name) non_fatal (_("%s: Path components stripped from image name, '%s'."), def_file, name); - /* Append the default suffix, if none specified. */ + /* Append the default suffix, if none specified. */ if (strchr (image_basename, '.') == 0) { const char * suffix = is_dll ? ".dll" : ".exe"; @@ -2036,7 +2036,7 @@ gen_exp_file (void) fatal (_("Unable to open temporary assembler file: %s"), TMP_ASM); temp_file_to_remove[TEMP_EXPORT_FILE] = TMP_ASM; - + /* xgettext:c-format */ inform (_("Opened temporary file: %s"), TMP_ASM); @@ -2746,7 +2746,7 @@ make_one_lib_file (export_type *exp, int i, int delay) { si->data = xmalloc (4); si->size = 4; - + if (exp->noname) { si->data[0] = exp->ordinal ; @@ -2953,7 +2953,7 @@ make_one_lib_file (export_type *exp, int i, int delay) /* xgettext:c-format */ fatal (_("bfd_open failed reopen stub file: %s: %s"), outname, bfd_get_errmsg ()); - + return abfd; } @@ -3219,7 +3219,7 @@ gen_lib_file (int delay) inform (_("Creating library file: %s"), imp_name); xatexit (unlink_temp_files); - + bfd_set_format (outarch, bfd_archive); outarch->has_armap = 1; outarch->is_thin_archive = 0; @@ -3344,7 +3344,7 @@ dll_name_list_append (dll_name_list_type * list, bfd_byte * data) /* Count the number of entries in list. */ -static int +static int dll_name_list_count (dll_name_list_type * list) { dll_name_list_node_type * p; @@ -3366,7 +3366,7 @@ dll_name_list_count (dll_name_list_type * list) /* Print each entry in list to stdout. */ -static void +static void dll_name_list_print (dll_name_list_type * list) { dll_name_list_node_type * p; @@ -3401,7 +3401,7 @@ dll_name_list_free (dll_name_list_type * list) /* Recursive function to free all nodes entry->next->next... as well as entry itself. */ -static void +static void dll_name_list_free_contents (dll_name_list_node_type * entry) { if (entry) @@ -3422,7 +3422,7 @@ dll_name_list_free_contents (dll_name_list_node_type * entry) /* Allocate and initialize a dll_name_list_type object, including its sentinel node. Caller is responsible - for calling dll_name_list_free when finished with + for calling dll_name_list_free when finished with the list. */ static dll_name_list_type * @@ -3446,9 +3446,9 @@ dll_name_list_create (void) OBJ (where obj is cast to const char *). If found, set global variable identify_member_contains_symname_result TRUE. It is the caller's responsibility to set the result variable FALSE before iterating with - this function. */ + this function. */ -static void +static void identify_member_contains_symname (bfd * abfd, bfd * archive_bfd ATTRIBUTE_UNUSED, void * obj) @@ -3504,9 +3504,9 @@ identify_member_contains_symname (bfd * abfd, of all sections which meet the criteria to a linked list of dll names. Finally, print them all to stdout. (If --identify-strict, an error is - reported if more than one match was found). */ + reported if more than one match was found). */ -static void +static void identify_dll_for_implib (void) { bfd * abfd = NULL; @@ -3544,7 +3544,7 @@ identify_dll_for_implib (void) (void *)(& search_data)); if (search_data.found) identify_data.ms_style_implib = TRUE; - + /* Rewind the bfd. */ if (! bfd_close (abfd)) bfd_fatal (identify_imp_name); @@ -3559,7 +3559,7 @@ identify_dll_for_implib (void) fatal (_("%s is not a library"), identify_imp_name); } - + /* Now search for the dll name. */ identify_search_archive (abfd, identify_search_member, @@ -3593,10 +3593,10 @@ identify_dll_for_implib (void) /* Loop over all members of the archive, applying the supplied function to each member that is a bfd_object. The function will be called as if: - func (member_bfd, abfd, user_storage) */ + func (member_bfd, abfd, user_storage) */ static void -identify_search_archive (bfd * abfd, +identify_search_archive (bfd * abfd, void (* operation) (bfd *, bfd *, void *), void * user_storage) { @@ -3644,7 +3644,7 @@ identify_search_archive (bfd * abfd, } /* Call the identify_search_section() function for each section of this - archive member. */ + archive member. */ static void identify_search_member (bfd *abfd, @@ -3656,7 +3656,7 @@ identify_search_member (bfd *abfd, /* This predicate returns true if section->name matches the desired value. By default, this is .idata$7 (.idata$6 on PPC, or if the import - library is ms-style). */ + library is ms-style). */ static bfd_boolean identify_process_section_p (asection * section, bfd_boolean ms_style_implib) @@ -3669,10 +3669,10 @@ identify_process_section_p (asection * section, bfd_boolean ms_style_implib) ".idata$7"; #endif static const char * MS_SECTION_NAME = ".idata$6"; - + const char * section_name = (ms_style_implib ? MS_SECTION_NAME : SECTION_NAME); - + if (strcmp (section_name, section->name) == 0) return TRUE; return FALSE; @@ -3719,7 +3719,7 @@ identify_search_section (bfd * abfd, asection * section, void * obj) /* Use a heuristic to determine if data is a dll name. Possible to defeat this if (a) the library has MANY - (more than 0x302f) imports, (b) it is an ms-style + (more than 0x302f) imports, (b) it is an ms-style import library, but (c) it is buggy, in that the SEC_DATA flag is set on the "wrong" sections. This heuristic might also fail to record a valid dll name if the dllname uses @@ -4263,8 +4263,8 @@ main (int ac, char **av) { /* If we are inferring dll_name from exp_name, strip off any path components, without emitting - a warning. */ - const char* exp_basename = lbasename (exp_name); + a warning. */ + const char* exp_basename = lbasename (exp_name); const int len = strlen (exp_basename) + 5; dll_name = xmalloc (len); strcpy (dll_name, exp_basename); diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c index 423db748c0..e60126e515 100644 --- a/binutils/dllwrap.c +++ b/binutils/dllwrap.c @@ -475,7 +475,7 @@ usage (FILE *file, int status) { fprintf (file, _("Usage %s \n"), prog_name); fprintf (file, _(" Generic options:\n")); - fprintf (file, _(" @ Read options from \n")); + fprintf (file, _(" @ Read options from \n")); fprintf (file, _(" --quiet, -q Work quietly\n")); fprintf (file, _(" --verbose, -v Verbose\n")); fprintf (file, _(" --version Print dllwrap version\n")); @@ -1021,9 +1021,9 @@ Creating one, but that may not be what you want")); /* Step 1. Call GCC/LD to create base relocation file. If using GCC, the driver command line will look like the following: - + % gcc -Wl,--dll --Wl,--base-file,foo.base [rest of command line] - + If the user does not specify a base name, create temporary one that is deleted at exit. */ @@ -1065,9 +1065,9 @@ Creating one, but that may not be what you want")); /* Step 2. generate the exp file by running dlltool. dlltool command line will look like the following: - + % dlltool -Wl,--dll --Wl,--base-file,foo.base [rest of command line] - + If the user does not specify a base name, create temporary one that is deleted at exit. */ diff --git a/binutils/dwarf.c b/binutils/dwarf.c index c3dc814204..c14049ac8d 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -7154,7 +7154,7 @@ process_cu_tu_index (struct dwarf_section *section, int do_display) row, ncols); return 0; } - + if (do_display) printf (_(" [%3d] 0x%s"), i, dwarf_vmatoa64 (signature_high, signature_low, diff --git a/binutils/elfcomm.c b/binutils/elfcomm.c index 05687a0ea5..75ee1c8d0e 100644 --- a/binutils/elfcomm.c +++ b/binutils/elfcomm.c @@ -51,7 +51,7 @@ warn (const char *message, ...) /* Try to keep warning messages in sync with the program's normal output. */ fflush (stdout); - + va_start (args, message); fprintf (stderr, _("%s: Warning: "), program_name); vfprintf (stderr, message, args); @@ -427,7 +427,7 @@ adjust_relative_path (const char *file_name, const char *name, name_len); return NULL; } - + member_file_name = (char *) malloc (amt); if (member_file_name == NULL) { @@ -491,7 +491,7 @@ process_archive_index_and_symbols (struct archive_info * arch, unsigned char * index_buffer; assert (sizeof_ar_index <= sizeof integer_buffer); - + /* Check the size of the archive index. */ if (size < sizeof_ar_index) { @@ -756,7 +756,7 @@ get_archive_member_name (struct archive_info *arch, error (_("Archive member uses long names, but no longname table found\n")); return NULL; } - + arch->nested_member_origin = 0; k = j = strtoul (arch->arhdr.ar_name + 1, &endp, 10); if (arch->is_thin_archive && endp != NULL && * endp == ':') @@ -786,7 +786,7 @@ get_archive_member_name (struct archive_info *arch, error (_("Invalid Thin archive member name\n")); return NULL; } - + /* This is a proxy for a member of a nested archive. Find the name of the member in that archive. */ member_file_name = adjust_relative_path (arch->file_name, @@ -899,7 +899,7 @@ make_qualified_name (struct archive_info * arch, nested_arch->file_name, member_name); else snprintf (name, len, "%s[%s(%s)]", arch->file_name, - error_name, member_name); + error_name, member_name); } else if (arch->is_thin_archive) snprintf (name, len, "%s[%s]", arch->file_name, member_name); diff --git a/binutils/embedspu.sh b/binutils/embedspu.sh index 4d20812c60..00425b41b5 100644 --- a/binutils/embedspu.sh +++ b/binutils/embedspu.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/sh # Embed an SPU ELF executable into a PowerPC object file. # # Copyright (C) 2006-2015 Free Software Foundation, Inc. diff --git a/binutils/makefile.vms b/binutils/makefile.vms index 6d07a01c84..a6b5216be4 100644 --- a/binutils/makefile.vms +++ b/binutils/makefile.vms @@ -11,12 +11,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING3. If not see # . diff --git a/binutils/mcparse.y b/binutils/mcparse.y index 07b9d3f103..7b6769395d 100644 --- a/binutils/mcparse.y +++ b/binutils/mcparse.y @@ -1,21 +1,21 @@ %{ /* mcparse.y -- parser for Windows mc files Copyright (C) 2007-2015 Free Software Foundation, Inc. - + Parser for Windows mc files Written by Kai Tietz, Onevision. - + This file is part of GNU Binutils. - + 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 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c index 8ef5b69746..751cf081c4 100644 --- a/binutils/nlmconv.c +++ b/binutils/nlmconv.c @@ -1058,7 +1058,7 @@ main (int argc, char **argv) { const int max_len = NLM_MODULE_NAME_SIZE - 2; const char * filename = lbasename (output_file); - + len = strlen (filename); if (len > max_len) len = max_len; @@ -1941,7 +1941,7 @@ powerpc_mangle_relocs (bfd *outbfd, asection *insec, (long) rel->address); break; } - + assert (rel->howto->size == 2 && rel->howto->pcrel_offset); val = bfd_get_32 (outbfd, (bfd_byte *) contents + rel->address); val = ((val &~ rel->howto->dst_mask) @@ -1997,7 +1997,7 @@ powerpc_mangle_relocs (bfd *outbfd, asection *insec, (long) rel->address); break; } - + val = bfd_get_16 (outbfd, (bfd_byte *) contents + rel->address); val = ((val &~ rel->howto->dst_mask) @@ -2020,7 +2020,7 @@ powerpc_mangle_relocs (bfd *outbfd, asection *insec, (long) rel->address); break; } - + val = bfd_get_32 (outbfd, (bfd_byte *) contents + rel->address); val = ((val &~ rel->howto->dst_mask) diff --git a/binutils/nm.c b/binutils/nm.c index a8f2f7059d..ad6e70dd84 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -985,7 +985,7 @@ print_size_symbols (bfd * abfd, SYMCOUNT is the number of symbols in MINISYMS and SYNTH_COUNT is the number of these that are synthetic. Synthetic symbols, if any are present, always come at the end of the MINISYMS. - + SIZE is the size of a symbol in MINISYMS. */ static void @@ -1059,7 +1059,7 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) non_fatal (_("%s: no symbols"), bfd_get_filename (abfd)); return; } - + if (show_synthetic && size == sizeof (asymbol *)) { asymbol *synthsyms; diff --git a/binutils/objcopy.c b/binutils/objcopy.c index 7ac8661ba1..e4cb3e2d3f 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -732,7 +732,7 @@ parse_flags (const char *s) We need to be careful in how we match section names because of the support for wildcard characters. For example suppose that the user has invoked objcopy like this: - + --set-section-flags .debug_*=debug --set-section-flags .debug_str=readonly,debug --change-section-address .debug_*ranges=0x1000 @@ -760,7 +760,7 @@ find_section_list (const char *name, bfd_boolean add, unsigned int context) struct section_list *p; /* assert ((context & ((1 << 7) - 1)) != 0); */ - + for (p = change_sections; p != NULL; p = p->next) { if (add) @@ -1964,7 +1964,7 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch) _("can't dump section - it has no contents")); continue; } - + bfd_size_type size = bfd_get_section_size (sec); if (size == 0) { @@ -2001,7 +2001,7 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch) free (contents); } } - + if (gnu_debuglink_filename != NULL) { /* PR 15125: Give a helpful warning message if @@ -3925,7 +3925,7 @@ copy_main (int argc, char *argv[]) dump_sections = init_section_add (optarg, dump_sections, "--dump-section"); break; - + case OPTION_CHANGE_START: change_start = parse_vma (optarg, "--change-start"); break; diff --git a/binutils/objdump.c b/binutils/objdump.c index c4387c4ded..ba9cd7c546 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -27,14 +27,14 @@ relocations, debugging directives and more. The flow of execution is as follows: - + 1. Command line arguments are checked for control switches and the information to be displayed is selected. - + 2. Any remaining arguments are assumed to be object files, and they are processed in order by display_bfd(). If the file is an archive each of its elements is processed in turn. - + 3. The file's target architecture and binary file format are determined by bfd_check_format(). If they are recognised, then dump_bfd() is called. @@ -924,7 +924,7 @@ find_symbol_for_address (bfd_vma vma, sections have overlapping memory ranges, but in that case there's no way to tell what's desired without looking at the relocation table. - + Also give the target a chance to reject symbols. */ want_section = (aux->require_sec || ((abfd->flags & HAS_RELOC) != 0 @@ -1116,9 +1116,9 @@ struct print_file_list struct print_file_list *next; const char *filename; const char *modname; - const char *map; + const char *map; size_t mapsize; - const char **linemap; + const char **linemap; unsigned maxline; unsigned last_line; int first; @@ -1175,38 +1175,38 @@ slurp_file (const char *fn, size_t *size) /* Precompute array of lines for a mapped file. */ -static const char ** -index_file (const char *map, size_t size, unsigned int *maxline) +static const char ** +index_file (const char *map, size_t size, unsigned int *maxline) { const char *p, *lstart, *end; int chars_per_line = 45; /* First iteration will use 40. */ unsigned int lineno; - const char **linemap = NULL; + const char **linemap = NULL; unsigned long line_map_size = 0; - + lineno = 0; lstart = map; end = map + size; - for (p = map; p < end; p++) - { - if (*p == '\n') - { - if (p + 1 < end && p[1] == '\r') - p++; - } - else if (*p == '\r') - { + for (p = map; p < end; p++) + { + if (*p == '\n') + { + if (p + 1 < end && p[1] == '\r') + p++; + } + else if (*p == '\r') + { if (p + 1 < end && p[1] == '\n') p++; } else continue; - + /* End of line found. */ - if (linemap == NULL || line_map_size < lineno + 1) - { + if (linemap == NULL || line_map_size < lineno + 1) + { unsigned long newsize; chars_per_line -= line_map_decrease; @@ -1219,11 +1219,11 @@ index_file (const char *map, size_t size, unsigned int *maxline) linemap = (const char **) xrealloc (linemap, newsize); } - linemap[lineno++] = lstart; - lstart = p + 1; + linemap[lineno++] = lstart; + lstart = p + 1; } - - *maxline = lineno; + + *maxline = lineno; return linemap; } @@ -1243,7 +1243,7 @@ try_print_file_open (const char *origname, const char *modname) free (p); return NULL; } - + p->linemap = index_file (p->map, p->mapsize, &p->maxline); p->last_line = 0; p->filename = origname; @@ -1293,13 +1293,13 @@ update_source_path (const char *filename) /* Print a source file line. */ -static void +static void print_line (struct print_file_list *p, unsigned int linenum) { const char *l; size_t len; - - --linenum; + + --linenum; if (linenum >= p->maxline) return; l = p->linemap [linenum]; @@ -1316,7 +1316,7 @@ dump_lines (struct print_file_list *p, unsigned int start, unsigned int end) { if (p->map == NULL) return; - while (start <= end) + while (start <= end) { print_line (p, start); start++; @@ -1392,9 +1392,9 @@ show_line (bfd *abfd, asection *section, bfd_vma addr_offset) && (prev_functionname == NULL || strcmp (functionname, prev_functionname) != 0)) printf ("%s():\n", functionname); - if (linenumber > 0 && (linenumber != prev_line || + if (linenumber > 0 && (linenumber != prev_line || (discriminator != prev_discriminator))) - { + { if (discriminator > 0) printf ("%s:%u (discriminator %u)\n", filename == NULL ? "???" : filename, linenumber, discriminator); @@ -1424,12 +1424,12 @@ show_line (bfd *abfd, asection *section, bfd_vma addr_offset) if (p != NULL && linenumber != p->last_line) { - if (file_start_context && p->first) + if (file_start_context && p->first) l = 1; - else + else { l = linenumber - SHOW_PRECEDING_CONTEXT_LINES; - if (l >= linenumber) + if (l >= linenumber) l = 1; if (p->last_line >= l && p->last_line <= linenumber) l = p->last_line + 1; @@ -1476,19 +1476,19 @@ objdump_sprintf (SFILE *f, const char *format, ...) while (1) { size_t space = f->alloc - f->pos; - + va_start (args, format); n = vsnprintf (f->buffer + f->pos, space, format, args); va_end (args); if (space > n) break; - + f->alloc = (f->alloc + n) * 2; f->buffer = (char *) xrealloc (f->buffer, f->alloc); } f->pos += n; - + return n; } @@ -1536,7 +1536,7 @@ disassemble_bytes (struct disassemble_info * inf, sfile.alloc = 120; sfile.buffer = (char *) xmalloc (sfile.alloc); sfile.pos = 0; - + if (insn_width) octets_per_line = insn_width; else if (insns) @@ -1693,7 +1693,7 @@ disassemble_bytes (struct disassemble_info * inf, the boundaries between instructions. We only do this when disassembling code of course, and when -D is in effect. */ inf->stop_vma = section->vma + stop_offset; - + octets = (*disassemble_fn) (section->vma + addr_offset, inf); inf->stop_vma = 0; @@ -2091,7 +2091,7 @@ disassemble_section (bfd *abfd, asection *section, void *inf) ((SYM)->section == section \ && (bfd_asymbol_value (SYM) > bfd_asymbol_value (sym)) \ && pinfo->symbol_is_valid (SYM, pinfo)) - + /* Search forward for the next appropriate symbol in SECTION. Note that all the symbols are sorted together into one big array, and that some sections @@ -2137,7 +2137,7 @@ disassemble_section (bfd *abfd, asection *section, void *inf) disassemble_bytes (pinfo, paux->disassemble_fn, insns, data, addr_offset, nextstop_offset, rel_offset, &rel_pp, rel_ppend); - + addr_offset = nextstop_offset; sym = nextsym; } @@ -2249,7 +2249,7 @@ disassemble_data (bfd *abfd) if (dump_dynamic_reloc_info) { long relsize = bfd_get_dynamic_reloc_upper_bound (abfd); - + if (relsize < 0) bfd_fatal (bfd_get_filename (abfd)); @@ -2290,7 +2290,7 @@ load_specific_debug_section (enum dwarf_section_display_enum debug, return 1; section->reloc_info = NULL; - section->num_relocs = 0; + section->num_relocs = 0; section->address = bfd_get_section_vma (abfd, sec); section->size = bfd_get_section_size (sec); section->start = NULL; @@ -2451,7 +2451,7 @@ dump_dwarf_section (bfd *abfd, asection *section, section, abfd)) { debug_displays [i].display (sec, abfd); - + if (i != info && i != abbrev) free_debug_section ((enum dwarf_section_display_enum) i); } @@ -2671,7 +2671,7 @@ find_stabs_section (bfd *abfd, asection *section, void *names) if (strtab == NULL) strtab = read_section_stabs (abfd, sought->string_section_name, &stabstr_size); - + if (strtab) { stabs = (bfd_byte *) read_section_stabs (abfd, section->name, @@ -2820,7 +2820,7 @@ dump_section (bfd *abfd, asection *section, void *dummy ATTRIBUTE_UNUSED) if (! process_section_p (section)) return; - + if ((datasize = bfd_section_size (abfd, section)) == 0) return; @@ -2846,7 +2846,7 @@ dump_section (bfd *abfd, asection *section, void *dummy ATTRIBUTE_UNUSED) if (start_offset >= stop_offset) return; - + printf (_("Contents of section %s:"), section->name); if (display_file_offsets) printf (_(" (Starting at file offset: 0x%lx)"), @@ -3382,7 +3382,7 @@ dump_bfd (bfd *abfd) info in the file, try DWARF instead. */ else if (! dump_dwarf_section_info) { - dwarf_select_sections_all (); + dwarf_select_sections_all (); dump_dwarf (abfd); } } diff --git a/binutils/rclex.c b/binutils/rclex.c index da63a421d6..945ab8b26b 100644 --- a/binutils/rclex.c +++ b/binutils/rclex.c @@ -147,7 +147,7 @@ cpp_line (void) ++s; while (ISSPACE (*s)) ++s; - + /* Check for #pragma code_page ( DEFAULT | ). */ len = strlen (s); mlen = strlen ("pragma"); @@ -703,7 +703,7 @@ rclex_string (void) c = -1; } while (c != -1); - + if (rclex_peekch () == '"') rclex_readch (); else @@ -781,7 +781,7 @@ yylex (void) /* Clear token. */ rclex_tok_pos = 0; rclex_tok[0] = 0; - + if ((ch = rclex_readch ()) == -1) return -1; if (ch == '\n') @@ -797,15 +797,15 @@ yylex (void) cpp_line (); ch = IGNORED_TOKEN; break; - + case '{': ch = IGNORE_CPP (BEG); break; - + case '}': ch = IGNORE_CPP (END); break; - + case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': yylval.i.val = read_digit (ch); diff --git a/binutils/rcparse.y b/binutils/rcparse.y index 0cf6c2c1f2..93c8f5798f 100644 --- a/binutils/rcparse.y +++ b/binutils/rcparse.y @@ -562,7 +562,7 @@ control: base_style = BS_AUTO3STATE; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -574,7 +574,7 @@ control: base_style = BS_AUTOCHECKBOX; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -586,7 +586,7 @@ control: base_style = BS_AUTORADIOBUTTON; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -598,7 +598,7 @@ control: base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class.named = 0; class.u.id = CTL_EDIT; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -613,7 +613,7 @@ control: base_style = BS_CHECKBOX | WS_TABSTOP; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -627,7 +627,7 @@ control: base_style = 0; class.named = 0; class.u.id = CTL_COMBOBOX; - res_text_field = res_null_text; + res_text_field = res_null_text; } control_params { @@ -659,7 +659,7 @@ control: base_style = SS_CENTER; class.named = 0; class.u.id = CTL_STATIC; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -671,7 +671,7 @@ control: base_style = BS_DEFPUSHBUTTON | WS_TABSTOP; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -683,7 +683,7 @@ control: base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class.named = 0; class.u.id = CTL_EDIT; - res_text_field = res_null_text; + res_text_field = res_null_text; } control_params { @@ -695,7 +695,7 @@ control: base_style = BS_GROUPBOX; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -707,7 +707,7 @@ control: base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class.named = 0; class.u.id = CTL_EDIT; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -745,7 +745,7 @@ control: base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class.named = 0; class.u.id = CTL_EDIT; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -760,7 +760,7 @@ control: base_style = LBS_NOTIFY | WS_BORDER; class.named = 0; class.u.id = CTL_LISTBOX; - res_text_field = res_null_text; + res_text_field = res_null_text; } control_params { @@ -772,7 +772,7 @@ control: base_style = SS_LEFT; class.named = 0; class.u.id = CTL_STATIC; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -795,7 +795,7 @@ control: base_style = BS_PUSHBUTTON | WS_TABSTOP; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -807,7 +807,7 @@ control: base_style = BS_RADIOBUTTON; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -819,7 +819,7 @@ control: base_style = SS_RIGHT; class.named = 0; class.u.id = CTL_STATIC; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -831,7 +831,7 @@ control: base_style = 0; class.named = 0; class.u.id = CTL_SCROLLBAR; - res_text_field = res_null_text; + res_text_field = res_null_text; } control_params { @@ -843,14 +843,14 @@ control: base_style = BS_3STATE; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { $$ = $4; } | USERBUTTON resref numexpr ',' numexpr ',' numexpr ',' - numexpr ',' numexpr ',' + numexpr ',' numexpr ',' { style = WS_CHILD | WS_VISIBLE; } styleexpr optcnumexpr { @@ -1258,7 +1258,7 @@ rcdata_data: /* Stringtable resources. */ stringtable: - STRINGTABLE suboptions BEG + STRINGTABLE suboptions BEG { sub_res_info = $2; rcparse_rcdata (); } string_data END { rcparse_normal (); } ; diff --git a/binutils/resbin.c b/binutils/resbin.c index 04ba721751..8b12649fd5 100644 --- a/binutils/resbin.c +++ b/binutils/resbin.c @@ -1067,7 +1067,7 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data, rc_uint_type lengt verlen -= off; stverlen -= off; - + vst->strings = NULL; ppvs = &vst->strings; @@ -1318,7 +1318,7 @@ resid_to_bin (windres_bfd *wrbfd, rc_uint_type off, rc_res_id id) if (wrbfd) { struct bin_res_id bri; - + windres_put_16 (wrbfd, bri.sig, 0xffff); windres_put_16 (wrbfd, bri.id, id.u.id); set_windres_bfd_content (wrbfd, &bri, off, BIN_RES_ID); @@ -1556,7 +1556,7 @@ res_to_bin_dialog (windres_bfd *wrbfd, rc_uint_type off, const rc_dialog *dialog windres_put_32 (wrbfd, bdc.id, dc->id); set_windres_bfd_content (wrbfd, &bdc, off, BIN_DIALOGEX_CONTROL_SIZE); } - } + } off += (dialogex != 0 ? BIN_DIALOGEX_CONTROL_SIZE : BIN_DIALOG_CONTROL_SIZE); off = resid_to_bin (wrbfd, off, dc->class); diff --git a/binutils/rescoff.c b/binutils/rescoff.c index 3e63e49901..2706f15889 100644 --- a/binutils/rescoff.c +++ b/binutils/rescoff.c @@ -164,7 +164,7 @@ read_coff_rsrc (const char *filename, const char *target) this will have to be cleaned up. */ ret = read_coff_res_dir (&wrbfd, data, &flaginfo, (const rc_res_id *) NULL, 0); - + bfd_close (abfd); return ret; diff --git a/binutils/resrc.c b/binutils/resrc.c index b4edba992f..74978cc800 100644 --- a/binutils/resrc.c +++ b/binutils/resrc.c @@ -2275,7 +2275,7 @@ write_rc_resource (FILE *e, const rc_res_id *type, default: res_id_print (e, *type, 0); break; - + PRINT_RT_NAME(RT_MANIFEST); PRINT_RT_NAME(RT_ANICURSOR); PRINT_RT_NAME(RT_ANIICON); @@ -2777,7 +2777,7 @@ write_rc_toolbar (FILE *e, const rc_toolbar *tb) indent (e, 2); if (it->id.u.id == 0) fprintf (e, "SEPARATOR\n"); - else + else fprintf (e, "BUTTON %d\n", (int) it->id.u.id); it = it->next; } @@ -2892,7 +2892,7 @@ test_rc_datablock_text (rc_uint_type length, const bfd_byte *data) int has_nl; rc_uint_type c; rc_uint_type i; - + if (length <= 1) return 0; @@ -3029,7 +3029,7 @@ write_rc_datablock (FILE *e, rc_uint_type length, const bfd_byte *data, int has_ if (i < length) fprintf (e, "\n"); } - + if (i == 0) { indent (e, 2); @@ -3052,7 +3052,7 @@ write_rc_datablock (FILE *e, rc_uint_type length, const bfd_byte *data, int has_ u = (const unichar *) &data[i]; indent (e, 2); fprintf (e, "L\""); - + for (c = 0; i < length && c < 160 && u[c] != '\n'; c++, i += 2) ; if (i < length && u[c] == '\n') @@ -3090,9 +3090,9 @@ write_rc_datablock (FILE *e, rc_uint_type length, const bfd_byte *data, int has_ { rc_uint_type k; rc_uint_type comment_start; - + comment_start = i; - + if (! first) indent (e, 2); diff --git a/binutils/resres.c b/binutils/resres.c index 7e742d2c46..6ea5746190 100644 --- a/binutils/resres.c +++ b/binutils/resres.c @@ -499,7 +499,7 @@ write_res_info (windres_bfd *wrbfd, rc_uint_type off, const rc_res_res_info *inf if (wrbfd) { struct bin_res_info l; - + windres_put_32 (wrbfd, l.version, info->version); windres_put_16 (wrbfd, l.memflags, info->memflags); windres_put_16 (wrbfd, l.language, info->language); diff --git a/binutils/stabs.c b/binutils/stabs.c index 5b4c8a3a85..11f7e28b94 100644 --- a/binutils/stabs.c +++ b/binutils/stabs.c @@ -5175,7 +5175,7 @@ stab_demangle_v3_arglist (void *dhandle, struct stab_handle *info, context for a function with no arguments. */ if (dc->u.s_binary.left == NULL) break; - + arg = stab_demangle_v3_arg (dhandle, info, dc->u.s_binary.left, NULL, &varargs); if (arg == NULL) diff --git a/binutils/strings.c b/binutils/strings.c index 0e2c9a8b91..6b77c31387 100644 --- a/binutils/strings.c +++ b/binutils/strings.c @@ -334,12 +334,12 @@ strings_a_section (bfd *abfd, asection *sect, void *arg) bfd_size_type *filesizep; bfd_size_type sectsize; void *mem; - + if ((sect->flags & DATA_FLAGS) != DATA_FLAGS) return; sectsize = bfd_get_section_size (sect); - + if (sectsize <= 0) return; @@ -350,7 +350,7 @@ strings_a_section (bfd *abfd, asection *sect, void *arg) if (*filesizep == 0) { struct stat st; - + if (bfd_stat (abfd, &st)) return; diff --git a/binutils/sysinfo.y b/binutils/sysinfo.y index 4d0ec24c1f..558c1448e4 100644 --- a/binutils/sysinfo.y +++ b/binutils/sysinfo.y @@ -40,14 +40,14 @@ extern int yylex (void); %union { int i; char *s; -} +} %token COND %token REPEAT %token '(' ')' %token TYPE %token NAME %token NUMBER UNIT -%type attr_size +%type attr_size %type attr_desc attr_id attr_type %% @@ -56,10 +56,10 @@ top: { { case 'i': printf("#ifdef SYSROFF_SWAP_IN\n"); - break; + break; case 'p': printf("#ifdef SYSROFF_p\n"); - break; + break; case 'd': break; case 'g': @@ -72,7 +72,7 @@ top: { printf("#include \n"); break; } - } + } it_list { switch (writecode) { case 'i': @@ -80,7 +80,7 @@ it_list { case 'g': case 'c': printf("#endif\n"); - break; + break; case 'd': break; } @@ -94,10 +94,10 @@ it_list: it it_list ; it: - '(' NAME NUMBER + '(' NAME NUMBER { it = $2; code = $3; - switch (writecode) + switch (writecode) { case 'd': printf("\n\n\n#define IT_%s_CODE 0x%x\n", it,code); @@ -116,7 +116,7 @@ it: printf("\tunsigned char raw[255];\n"); printf("\tint idx = 0;\n"); printf("\tint size;\n"); - printf("\tmemset(raw,0,255);\n"); + printf("\tmemset(raw,0,255);\n"); printf("\tmemset(ptr,0,sizeof(*ptr));\n"); printf("\tsize = fillup(raw);\n"); break; @@ -143,17 +143,17 @@ it: break; } - } - it_field_list + } + it_field_list ')' { switch (writecode) { - case 'd': + case 'd': printf("};\n"); break; case 'g': printf("\tchecksum(ffile,raw, idx, IT_%s_CODE);\n", it); - + case 'i': case 'o': @@ -167,7 +167,7 @@ it: it_field_list: it_field it_field_list - | cond_it_field it_field_list + | cond_it_field it_field_list | repeat_it_field it_field_list | ; @@ -175,7 +175,7 @@ it_field_list: repeat_it_field: '(' REPEAT NAME { rdepth++; - switch (writecode) + switch (writecode) { case 'c': if (rdepth==1) @@ -186,13 +186,13 @@ repeat_it_field: '(' REPEAT NAME case 'g': case 'o': - if (rdepth==1) + if (rdepth==1) { printf("\t{ int n; for (n = 0; n < %s; n++) {\n", $3); } if (rdepth == 2) { printf("\t{ int m; for (m = 0; m < %s[n]; m++) {\n", $3); - } + } break; } @@ -201,7 +201,7 @@ repeat_it_field: '(' REPEAT NAME repeat = $3; } - it_field_list ')' + it_field_list ')' { repeat = oldrepeat; @@ -221,7 +221,7 @@ repeat_it_field: '(' REPEAT NAME cond_it_field: '(' COND NAME { - switch (writecode) + switch (writecode) { case 'i': case 'g': @@ -232,7 +232,7 @@ cond_it_field: '(' COND NAME } } - it_field_list ')' + it_field_list ')' { switch (writecode) { @@ -246,8 +246,8 @@ cond_it_field: '(' COND NAME ; it_field: - '(' attr_desc '(' attr_type attr_size ')' attr_id - {name = $7; } + '(' attr_desc '(' attr_type attr_size ')' attr_id + {name = $7; } enums ')' { char *desc = $2; @@ -256,12 +256,12 @@ it_field: char *id = $7; char *p = names[rdepth]; char *ptr = pnames[rdepth]; - switch (writecode) + switch (writecode) { case 'g': - if (size % 8) + if (size % 8) { - + printf("\twriteBITS(ptr->%s%s,raw,&idx,%d);\n", id, names[rdepth], size); @@ -273,15 +273,15 @@ char *ptr = pnames[rdepth]; id, names[rdepth],size/8); } - break; + break; case 'i': { if (rdepth >= 1) { - printf("if (!ptr->%s) ptr->%s = (%s*)xcalloc(%s, sizeof(ptr->%s[0]));\n", - id, + printf("if (!ptr->%s) ptr->%s = (%s*)xcalloc(%s, sizeof(ptr->%s[0]));\n", + id, id, type, repeat, @@ -290,8 +290,8 @@ char *ptr = pnames[rdepth]; if (rdepth == 2) { - printf("if (!ptr->%s[n]) ptr->%s[n] = (%s**)xcalloc(%s[n], sizeof(ptr->%s[n][0]));\n", - id, + printf("if (!ptr->%s[n]) ptr->%s[n] = (%s**)xcalloc(%s[n], sizeof(ptr->%s[n][0]));\n", + id, id, type, repeat, @@ -300,11 +300,11 @@ char *ptr = pnames[rdepth]; } - if (size % 8) + if (size % 8) { printf("\tptr->%s%s = getBITS(raw,&idx, %d,size);\n", id, - names[rdepth], + names[rdepth], size); } else { @@ -319,7 +319,7 @@ char *ptr = pnames[rdepth]; printf("\tput%s(raw,%d,%d,&idx,ptr->%s%s);\n", type,size/8,size%8,id,names[rdepth]); break; case 'd': - if (repeat) + if (repeat) printf("\t/* repeat %s */\n", repeat); if (type[0] == 'I') { @@ -341,7 +341,7 @@ char *ptr = pnames[rdepth]; else if (type[0] == 'C') printf("\tprintf(\"%%s\\n\",ptr->%s%s);\n", id,p); - else if (type[0] == 'B') + else if (type[0] == 'B') { printf("\tpbarray(&ptr->%s%s);\n", id,p); } @@ -353,18 +353,18 @@ char *ptr = pnames[rdepth]; ; -attr_type: +attr_type: TYPE { $$ = $1; } | { $$ = "INT";} ; -attr_desc: - '(' NAME ')' +attr_desc: + '(' NAME ')' { $$ = $2; } ; attr_size: - NUMBER UNIT + NUMBER UNIT { $$ = $1 * $2; } ; @@ -372,15 +372,15 @@ attr_size: attr_id: '(' NAME ')' { $$ = $2; } | { $$ = "dummy";} - ; - -enums: + ; + +enums: | '(' enum_list ')' ; enum_list: | - enum_list '(' NAME NAME ')' { - switch (writecode) + enum_list '(' NAME NAME ')' { + switch (writecode) { case 'd': printf("#define %s %s\n", $3,$4); @@ -404,7 +404,7 @@ enum_list: int yydebug; -int +int main (int ac, char **av) { yydebug=0; diff --git a/binutils/syslex.l b/binutils/syslex.l index 886e859a0d..c95d7de1bb 100644 --- a/binutils/syslex.l +++ b/binutils/syslex.l @@ -48,7 +48,7 @@ extern int yylex (void); "[" { return '[';} "]" { return ']';} " " { ; } -";".* { ; } +";".* { ; } "\t" { ; } "\n" { ; } "\""[^\"]*"\"" { diff --git a/binutils/syslex_wrap.c b/binutils/syslex_wrap.c index 9c09df459b..f95ffa5c10 100644 --- a/binutils/syslex_wrap.c +++ b/binutils/syslex_wrap.c @@ -1,5 +1,5 @@ /* Copyright (C) 2012-2015 Free Software Foundation, Inc. - + 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 3, or (at your option) diff --git a/binutils/sysroff.info b/binutils/sysroff.info index 390fe4201b..d82157669a 100644 --- a/binutils/sysroff.info +++ b/binutils/sysroff.info @@ -59,7 +59,7 @@ (("segment shift") (1 byte) ("segsh")) (("entry point") (1 byte) ("ep")) (cond "ptr->ep" - (cond "ptr->mt != MTYPE_ABS_LM" + (cond "ptr->mt != MTYPE_ABS_LM" (("unit appearance number") (2 bytes) ("uan")) (("section appearance number") (2 bytes) ("sa"))) (cond "segmented_p" @@ -96,7 +96,7 @@ ("sc" 0x08 - (("format") (2 bits) ("format")) + (("format") (2 bits) ("format")) (("spare") (6 bits) ("spare")) (("segment address") (segsize bytes) ("segadd")) (("address") (addrsize bytes) ("addr")) @@ -129,7 +129,7 @@ ("ss" 0x09 (("neg number") (2 bytes) ("neg"))) - + ("er" 0x0c (("symbol type") (2 bits) ("type") (("ER_ENTRY" "0") @@ -138,7 +138,7 @@ ("ER_NOTSPEC" "3"))) (("spare") (6 bits) ("spare")) (("symbol name") (chars variable byte) ("name"))) - + ("ed" 0x14 (("section appearance number") (2 bytes) ("section")) @@ -169,7 +169,7 @@ (cond "ptr->cpf" (("comp reps") (addrsize bytes) ("compreps"))) (("data") (barray counted byte) ("data"))) - + ("rl" 0x20 (("boundary of relocatable area") (4 bits) ("boundary")) @@ -188,7 +188,7 @@ ("OP_EXT_REF" "2"))) (cond "ptr->op == OP_EXT_REF" (("symbol number") (2 bytes) ("symn")) ) - + (cond "ptr->op == OP_SEC_REF" (("section number") (2 bytes) ("secn")) (("const opcode") (1 byte) ("copcode_is_3")) @@ -200,7 +200,7 @@ (("dunno") (2 bytes) ("dunno"))) (("end") (1 byte) ("end"))) - + ("du" 0x30 (("format") (2 bits) ("format")) @@ -292,7 +292,7 @@ (cond "ptr->type == STYPE_TAG" (("magic") (1 byte) ("magic")))) - + ("dul" 0x52 (("max declaration type flag") (1 bit) ("max_variable")) @@ -373,7 +373,7 @@ (("minimum") (addrsize bytes) ("min")))) (("negotiation") (2 bytes) ("neg"))) - + ("dso" 0x3a (("function name") (2 bytes) ("sid")) (("sp update count") (4 bytes) ("spupdates")) @@ -392,7 +392,7 @@ (("call count") (2 bytes) ("cc")) ) (("neg") (2 bytes) ("neg"))) - + ("dpp" 0x46 (("start/end") (1 bit) ("end")) (("spare") (7 bits) ("spare")) @@ -444,7 +444,7 @@ (("rules") (chars variable byte) ("rules")) (("number of symbols") (2 bytes) ("nsymbols")) (("unknown" ) (2 bytes) ("fixme"))) - + ("pss" 0x40 (("negotiation number") (2 bytes) ("efn")) (("number of source files") (2 bytes) ("ns")) @@ -452,15 +452,15 @@ (("directory reference bit") (1 bit) ("drb")) (("spare") (7 bits) ("spare")) (("completed file name") (chars variable byte) ("fname")) - (cond "ptr->drb[n]" + (cond "ptr->drb[n]" (("directory apperance number") (2 bytes) ("dan")))) - + (("number of directories") (2 bytes) ("ndir")) (repeat "ptr->ndir" (("directory name") (chars variable bytes) ("dname")))) -; FIXME: the tr block has no contents. sysinfo, etc. aren't prepared +; FIXME: the tr block has no contents. sysinfo, etc. aren't prepared ; to deal with that. ; ("tr" 0x7f) @@ -472,7 +472,7 @@ (("directory reference bit") (1 bit) ("drb")) (("spare") (7 bits) ("spare")) (("completed file name") (chars variable byte) ("fname")) - (cond "ptr->drb[n]" + (cond "ptr->drb[n]" (("directory apperance number") (2 bytes) ("dan")))) (("number of directories") (2 bytes) ("ndir")) (repeat "ptr->ndir" @@ -493,7 +493,7 @@ (("address") (addrsize bytes) ("address")) (("block size") (addrsize bytes) ("block_size")) (("nesting") (1 byte) ("nesting")) - (cond "ptr->type == BLOCK_TYPE_PROCEDURE + (cond "ptr->type == BLOCK_TYPE_PROCEDURE || ptr->type == BLOCK_TYPE_FUNCTION" (("return address") (1 bit) ("retaddr")) (("interrupt function flag") (1 bit) ("intrflag")) diff --git a/binutils/windres.c b/binutils/windres.c index 2fed128df7..f5e128674d 100644 --- a/binutils/windres.c +++ b/binutils/windres.c @@ -939,7 +939,7 @@ main (int argc, char **argv) { struct stat statbuf; char modebuf[11]; - + if (stat (optarg, & statbuf) == 0 /* Coded this way to avoid importing knowledge of S_ISDIR into this file. */ && (mode_string (statbuf.st_mode, modebuf), modebuf[0] == 'd')) @@ -1116,7 +1116,7 @@ windres_open_as_binary (const char *filename, int rdmode) if (rdmode && ! bfd_check_format (abfd, bfd_object)) fatal ("can't open `%s' for input.", filename); - + return abfd; } @@ -1311,7 +1311,7 @@ static rc_uint_type target_get_8 (const void *p, rc_uint_type length) { rc_uint_type ret; - + if (length < 1) fatal ("Resource too small for getting 8-bit value."); @@ -1324,7 +1324,7 @@ target_get_16 (const void *p, rc_uint_type length) { if (length < 2) fatal ("Resource too small for getting 16-bit value."); - + if (target_is_bigendian) return bfd_getb16 (p); else @@ -1336,7 +1336,7 @@ target_get_32 (const void *p, rc_uint_type length) { if (length < 4) fatal ("Resource too small for getting 32-bit value."); - + if (target_is_bigendian) return bfd_getb32 (p); else @@ -1354,7 +1354,7 @@ static void target_put_16 (void *p, rc_uint_type value) { assert (!! p); - + if (target_is_bigendian) bfd_putb16 (value, p); else @@ -1365,7 +1365,7 @@ static void target_put_32 (void *p, rc_uint_type value) { assert (!! p); - + if (target_is_bigendian) bfd_putb32 (value, p); else @@ -1404,5 +1404,5 @@ int wr_print (FILE *e, const char *fmt, ...) va_start (arg, fmt); r += vfprintf (e, fmt, arg); va_end (arg); - return r; + return r; }