gas: run the hwcaps-bump tests with 64-bit sparc objects only.

[deliverable/binutils-gdb.git] / libiberty / cp-demint.c

diff --git a/libiberty/cp-demint.c b/libiberty/cp-demint.c
index 8c200baed9a7e1273751b0d22f3d6f48c472a8a2..efcc5b7f5c02a3ae1cda503a80fe1f85609e85bd 100644 (file)
--- a/libiberty/cp-demint.c
+++ b/libiberty/cp-demint.c
@@ -25,7 +25,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. 
 */
 
 /* This file implements a few interface functions which are provided
@@ -110,6 +110,7 @@ cplus_demangle_fill_component (struct demangle_component *p,
     case DEMANGLE_COMPONENT_IMAGINARY:
     case DEMANGLE_COMPONENT_VENDOR_TYPE:
     case DEMANGLE_COMPONENT_CAST:
+    case DEMANGLE_COMPONENT_CONVERSION:
       if (right != NULL)
        return 0;
       break;
@@ -130,18 +131,18 @@ cplus_demangle_fill_component (struct demangle_component *p,
 
 int
 cplus_demangle_fill_builtin_type (struct demangle_component *p,
-                                  const char *typename)
+                                  const char *type_name)
 {
   int len;
   unsigned int i;
 
-  if (p == NULL || typename == NULL)
+  if (p == NULL || type_name == NULL)
     return 0;
-  len = strlen (typename);
+  len = strlen (type_name);
   for (i = 0; i < D_BUILTIN_TYPE_COUNT; ++i)
     {
       if (len == cplus_demangle_builtin_types[i].len
-         && strcmp (typename, cplus_demangle_builtin_types[i].name) == 0)
+         && strcmp (type_name, cplus_demangle_builtin_types[i].name) == 0)
        {
          p->type = DEMANGLE_COMPONENT_BUILTIN_TYPE;
          p->u.s_builtin.type = &cplus_demangle_builtin_types[i];
@@ -206,10 +207,8 @@ cplus_demangle_v3_components (const char *mangled, int options, void **mem)
             malloc (di.num_subs * sizeof (struct demangle_component *)));
   if (di.comps == NULL || di.subs == NULL)
     {
-      if (di.comps != NULL)
-       free (di.comps);
-      if (di.subs != NULL)
-       free (di.subs);
+      free (di.comps);
+      free (di.subs);
       return NULL;
     }