cplus-dem.c (ada_demangle): Get rid of unneeded variable and of strict-aliasing warning.

	* libiberty/cplus-dem.c (ada_demangle): Get rid of unneeded
	variable and of strict-aliasing warning.
	(grow_vect): Use char as first parameter.

From-SVN: r57866

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ad8d0e4c694627fa97d081876d460a5f8ac385b6..07c18dc1d7e1b12b0f756f75da9f98f9dde8dcb5 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-06  Andreas Jaeger  <aj@suse.de>
+
+       * libiberty/cplus-dem.c (ada_demangle): Get rid of unneeded
+       variable and of strict-aliasing warning.
+       (grow_vect): Use char as first parameter.
+
 2002-09-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * Makefile.in (all): Fix multilib parallel build.
@@ -52,7 +58,7 @@
 2002-07-29  Neil Booth  <neil@daikokuya.co.uk>
 
        * cplus-dem.c (PREPEND_BLANK): Remove.
-       
+
 2002-07-10  Jason Merrill  <jason@redhat.com>
 
        * cp-demangle.c (demangle_identifier): Support extended Unicode
@@ -61,7 +67,7 @@
 2002-07-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * cp-demangle.c (demangle_v3_with_details): Wrap in
-       !defined IN_GLIBCPP_V3. 
+       !defined IN_GLIBCPP_V3.
 
 2002-07-01  Mark Mitchell  <mark@codesourcery.com>
 
@@ -135,7 +141,7 @@
 
 2002-03-30  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
-       * cp-demangle.c (java_demangle_v3): Don't try to release "demangled" 
+       * cp-demangle.c (java_demangle_v3): Don't try to release "demangled"
        if it is NULL.
 
 2002-03-27  DJ Delorie  <dj@redhat.com>
@@ -549,10 +555,10 @@ Thu Nov 15 11:06:25 2001  Jeffrey A Law  (law@cygnus.com)
 
 2001-08-22  Matt Kraai  <kraai@alumni.carnegiemellon.edu>
 
-       * fibheap.c (fibheap_init, fibnode_init): Remove.
-       (fibheap_new, fibnode_new): Use xcalloc to allocate and
-       initialize memory.
-       (fibheap_insert): Remove check for node allocation failure.
+       * fibheap.c (fibheap_init, fibnode_init): Remove.
+       (fibheap_new, fibnode_new): Use xcalloc to allocate and
+       initialize memory.
+       (fibheap_insert): Remove check for node allocation failure.
 
 2001-08-21  Richard Henderson  <rth@redhat.com>
 

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 4c4778375b0579b51b80971d43cc494ec743c94d..f42d6181d403b2e06a4d180d769a5a3003c9fc54 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -514,7 +514,7 @@ recursively_demangle PARAMS ((struct work_stuff *, const char **, string *,
                              int));
 
 static void
-grow_vect PARAMS ((void **, size_t *, size_t, int));
+grow_vect PARAMS ((char **, size_t *, size_t, int));
 
 /* Translate count to integer, consuming tokens in the process.
    Conversion terminates on the first non-digit character.
@@ -936,7 +936,7 @@ cplus_demangle (mangled, options)
 
 static void
 grow_vect (old_vect, size, min_size, element_size)
-     void **old_vect;
+     char **old_vect;
      size_t *size;
      size_t min_size;
      int element_size;
@@ -969,8 +969,7 @@ ada_demangle (mangled, option)
   char *demangled = NULL;
   int at_start_name;
   int changed;
-  char *demangling_buffer = NULL;
-  size_t demangling_buffer_size = 0;
+  size_t demangled_size = 0;
   
   changed = 0;
 
@@ -998,10 +997,9 @@ ada_demangle (mangled, option)
     }
   
   /* Make demangled big enough for possible expansion by operator name.  */
-  grow_vect ((void **) &(demangling_buffer),
-            &demangling_buffer_size,  2 * len0 + 1,
+  grow_vect (&demangled,
+            &demangled_size,  2 * len0 + 1,
             sizeof (char));
-  demangled = demangling_buffer;
   
   if (ISDIGIT ((unsigned char) mangled[len0 - 1])) {
     for (i = len0 - 2; i >= 0 && ISDIGIT ((unsigned char) mangled[i]); i -= 1)
@@ -1051,10 +1049,10 @@ ada_demangle (mangled, option)
     return demangled;
   
  Suppress:
-  grow_vect ((void **) &(demangling_buffer),
-            &demangling_buffer_size,  strlen (mangled) + 3,
+  grow_vect (&demangled,
+            &demangled_size,  strlen (mangled) + 3,
             sizeof (char));
-  demangled = demangling_buffer;
+
   if (mangled[0] == '<')
      strcpy (demangled, mangled);
   else