sim: switch config.h usage to defs.h

[thirdparty/binutils-gdb.git] / sim / common / hw-base.c

diff --git a/sim/common/hw-base.c b/sim/common/hw-base.c
index 88e493e7dd4db94084dd8d509eb682cb2299d1a5..af4cc50f1a4baf52e288d98567f242aae7092f42 100644 (file)
--- a/sim/common/hw-base.c
+++ b/sim/common/hw-base.c
@@ -1,6 +1,6 @@
 /* The common simulator framework for GDB, the GNU Debugger.
 
-   Copyright 2002, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright 2002-2021 Free Software Foundation, Inc.
 
    Contributed by Andrew Cagney and Red Hat.
 
@@ -19,23 +19,14 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
 #include "hw-main.h"
 #include "hw-base.h"
 
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
-#if HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-
 #include <ctype.h>
 
 #include "hw-config.h"
@@ -114,13 +105,13 @@ generic_hw_unit_encode (struct hw *bus,
   /* don't output anything if empty */
   if (phys->nr_cells == 0)
     {
-      strcpy(pos, "");
+      strcpy (pos, "");
       len = 0;
     }
   else if (i == phys->nr_cells)
     {
       /* all zero */
-      strcpy(pos, "0");
+      strcpy (pos, "0");
       len = 1;
     }
   else
@@ -129,14 +120,14 @@ generic_hw_unit_encode (struct hw *bus,
        {
          if (pos != buf)
            {
-             strcat(pos, ",");
-             pos = strchr(pos, '\0');
+             strcat (pos, ",");
+             pos = strchr (pos, '\0');
            }
          if (phys->cells[i] < 10)
            sprintf (pos, "%ld", (unsigned long)phys->cells[i]);
          else
            sprintf (pos, "0x%lx", (unsigned long)phys->cells[i]);
-         pos = strchr(pos, '\0');
+         pos = strchr (pos, '\0');
        }
       len = pos - buf;
     }
@@ -281,11 +272,10 @@ full_name_of_hw (struct hw *leaf,
                 unsigned sizeof_buf)
 {
   /* get a buffer */
-  char full_name[1024];
-  if (buf == (char*)0)
+  if (buf == NULL)
     {
-      buf = full_name;
-      sizeof_buf = sizeof (full_name);
+      sizeof_buf = 1024;
+      buf = hw_malloc (leaf, sizeof_buf);
     }
 
   /* use head recursion to construct the path */
@@ -318,9 +308,6 @@ full_name_of_hw (struct hw *leaf,
       strcat (buf, unit);
     }
 
-  /* return it usefully */
-  if (buf == full_name)
-    buf = hw_strdup (leaf, full_name);
   return buf;
 }