From dd3da689c272a361d21ee49884174b1c2beecfc3 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 14 Oct 2013 09:15:08 +0000 Subject: * gen-aout.c (main): Fix formatting. Close file. * emultempl/aix.em (_read_file): Close file at end of function. * gas/all/itbl-test.c (main): Close fas. * read.c (add_include_dir): Use xrealloc. * config/tc-score.c (do_macro_bcmp): Initialise inst_main. * config/tc-tic6x.c (tic6x_parse_operand): Initialise second_reg. * readelf.c (decode_arm_unwind): Initialise addr structure. (process_symbol_table): Free lengths. * srcconv.c (wr_sc): Free info. * chew.c (perform): Free next. --- bfd/ChangeLog | 4 +++ bfd/doc/ChangeLog | 4 +++ bfd/doc/chew.c | 2 +- bfd/gen-aout.c | 96 ++++++++++++++++++++++++++++++------------------------- 4 files changed, 62 insertions(+), 44 deletions(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f7cc20f3ec1..f4dcecbc736 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2013-10-14 Nick Clifton + + * gen-aout.c (main): Fix formatting. Close file. + 2013-10-13 Richard Sandiford * elfxx-mips.c (mips_use_local_got_p): New function. diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog index c33eb3b3b31..08c278081c5 100644 --- a/bfd/doc/ChangeLog +++ b/bfd/doc/ChangeLog @@ -1,3 +1,7 @@ +2013-10-14 Nick Clifton + + * chew.c (perform): Free next. + 2013-04-15 Alan Modra * Makefile.am ($(MKDOC)): Append $(EXEEXT_FOR_BUILD) to temp file. diff --git a/bfd/doc/chew.c b/bfd/doc/chew.c index f949e1f7ffc..b019837b13b 100644 --- a/bfd/doc/chew.c +++ b/bfd/doc/chew.c @@ -1256,7 +1256,7 @@ perform () fprintf (stderr, "warning, %s is not recognised\n", next); skip_past_newline (); } - + free (next); } else skip_past_newline (); diff --git a/bfd/gen-aout.c b/bfd/gen-aout.c index 45331e0c813..5e791ec15aa 100644 --- a/bfd/gen-aout.c +++ b/bfd/gen-aout.c @@ -1,6 +1,5 @@ /* Generate parameters for an a.out system. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2002, 2005, 2007 - Free Software Foundation, Inc. + Copyright 1990-2013 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -27,58 +26,69 @@ #endif int -main (argc, argv) - int argc; char** argv; +main (int argc, char** argv) { struct exec my_exec; int page_size; - char *target = "unknown", *arch = "unknown"; - FILE *file = fopen("gen-aout", "r"); + char * target; + char * arch = "unknown"; + FILE * file; - if (file == NULL) { - fprintf(stderr, "Cannot open gen-aout!\n"); + target = argv[1]; + if (target == NULL) + { + fprintf (stderr, "Usage: gen-aout target_name\n"); + exit (1); + } + + file = fopen ("gen-aout", "r"); + if (file == NULL) + { + fprintf (stderr, "Cannot open gen-aout!\n"); return -1; - } - if (fread(&my_exec, sizeof(struct exec), 1, file) != 1) { + } + + if (fread (&my_exec, sizeof (struct exec), 1, file) != 1) + { fprintf(stderr, "Cannot read gen-aout!\n"); return -1; - } + } - target = argv[1]; - if (target == NULL) { - fprintf(stderr, "Usage: gen-aout target_name\n"); - exit (1); - } + fclose (file); #ifdef N_TXTOFF page_size = N_TXTOFF(my_exec); if (page_size == 0) - printf("#define N_HEADER_IN_TEXT(x) 1\n"); + printf ("#define N_HEADER_IN_TEXT(x) 1\n"); else - printf("#define N_HEADER_IN_TEXT(x) 0\n"); + printf ("#define N_HEADER_IN_TEXT(x) 0\n"); #endif printf("#define BYTES_IN_WORD %d\n", sizeof (int)); - if (my_exec.a_entry == 0) { - printf("#define ENTRY_CAN_BE_ZERO\n"); - printf("#define N_SHARED_LIB(x) 0 /* Avoids warning */\n"); - } - else { - printf("/*#define ENTRY_CAN_BE_ZERO*/\n"); - printf("/*#define N_SHARED_LIB(x) 0*/\n"); - } + if (my_exec.a_entry == 0) + { + printf ("#define ENTRY_CAN_BE_ZERO\n"); + printf ("#define N_SHARED_LIB(x) 0 /* Avoids warning */\n"); + } + else + { + printf ("/*#define ENTRY_CAN_BE_ZERO*/\n"); + printf ("/*#define N_SHARED_LIB(x) 0*/\n"); + } - printf("#define TEXT_START_ADDR %d\n", my_exec.a_entry); + printf ("#define TEXT_START_ADDR %d\n", my_exec.a_entry); #ifdef PAGSIZ if (page_size == 0) page_size = PAGSIZ; #endif + if (page_size != 0) - printf("#define TARGET_PAGE_SIZE %d\n", page_size); + printf ("#define TARGET_PAGE_SIZE %d\n", page_size); else - printf("/* #define TARGET_PAGE_SIZE ??? */\n"); - printf("#define SEGMENT_SIZE TARGET_PAGE_SIZE\n"); + printf ("/* #define TARGET_PAGE_SIZE ??? */\n"); + + printf ("#define SEGMENT_SIZE TARGET_PAGE_SIZE\n"); #ifdef vax arch = "vax"; @@ -92,19 +102,19 @@ main (argc, argv) fprintf (stderr, _(" fix DEFAULT_ARCH in the output file yourself\n")); arch = "unknown"; } - printf("#define DEFAULT_ARCH bfd_arch_%s\n\n", arch); - - printf("/* Do not \"beautify\" the CONCAT* macro args. Traditional C will not"); - printf(" remove whitespace added here, and thus will fail to concatenate"); - printf(" the tokens. */"); - printf("\n#define MY(OP) CONCAT2 (%s_,OP)\n\n", target); - printf("#define TARGETNAME \"a.out-%s\"\n\n", target); - - printf("#include \"sysdep.h\"\n"); - printf("#include \"bfd.h\"\n"); - printf("#include \"libbfd.h\"\n"); - printf("#include \"libaout.h\"\n"); - printf("\n#include \"aout-target.h\"\n"); + printf ("#define DEFAULT_ARCH bfd_arch_%s\n\n", arch); + + printf ("/* Do not \"beautify\" the CONCAT* macro args. Traditional C will not"); + printf (" remove whitespace added here, and thus will fail to concatenate"); + printf (" the tokens. */"); + printf ("\n#define MY(OP) CONCAT2 (%s_,OP)\n\n", target); + printf ("#define TARGETNAME \"a.out-%s\"\n\n", target); + + printf ("#include \"sysdep.h\"\n"); + printf ("#include \"bfd.h\"\n"); + printf ("#include \"libbfd.h\"\n"); + printf ("#include \"libaout.h\"\n"); + printf ("\n#include \"aout-target.h\"\n"); return 0; } -- cgit v1.2.1