From dabf22219ebc373528239930b354ebe7d02295a6 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 18 Oct 2009 23:11:35 +0000 Subject: [PATCH] PR binutils/10792 * dlltool.c (dll_name_list_append): Declare variable at start of block. (dll_name_list_count, dll_name-list_print): Likewise. --- binutils/ChangeLog | 7 +++++++ binutils/dlltool.c | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c3f5b01bb38..d09915990ee 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2009-10-19 Jerker Bäck + + PR binutils/10792 + * dlltool.c (dll_name_list_append): Declare variable at start + of block. + (dll_name_list_count, dll_name-list_print): Likewise. + 2009-10-16 Doug Evans * MAINTAINERS: Add myself as m32r maintainer. diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 759961e3d9c..585c780708e 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -3192,13 +3192,15 @@ gen_lib_file (int delay) static void dll_name_list_append (dll_name_list_type * list, bfd_byte * data) { + dll_name_list_node_type * entry; + /* Error checking. */ if (! list || ! list->tail) return; /* Allocate new node. */ - dll_name_list_node_type * entry = - (dll_name_list_node_type *) xmalloc (sizeof (dll_name_list_node_type)); + entry = ((dll_name_list_node_type *) + xmalloc (sizeof (dll_name_list_node_type))); /* Initialize its values. */ entry->dllname = xstrdup ((char *) data); @@ -3214,12 +3216,14 @@ dll_name_list_append (dll_name_list_type * list, bfd_byte * data) static int dll_name_list_count (dll_name_list_type * list) { + dll_name_list_node_type * p; + int count = 0; + /* Error checking. */ if (! list || ! list->head) return 0; - int count = 0; - dll_name_list_node_type * p = list->head; + p = list->head; while (p && p->next) { @@ -3234,11 +3238,13 @@ dll_name_list_count (dll_name_list_type * list) static void dll_name_list_print (dll_name_list_type * list) { + dll_name_list_node_type * p; + /* Error checking. */ if (! list || ! list->head) return; - dll_name_list_node_type * p = list->head; + p = list->head; while (p && p->next && p->next->dllname && *(p->next->dllname)) { -- 2.30.2