sim: callback: drop unused printf helpers

[deliverable/binutils-gdb.git] / sim / common / hw-ports.c

diff --git a/sim/common/hw-ports.c b/sim/common/hw-ports.c
index 2cd469dc99edecf05d163f994c0a082173da0faa..fbc7278ddd1ff042518246a9af1bba6e04db7130 100644 (file)
--- a/sim/common/hw-ports.c
+++ b/sim/common/hw-ports.c
@@ -1,5 +1,5 @@
 /* Hardware ports.
-   Copyright (C) 1998, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1998-2021 Free Software Foundation, Inc.
    Contributed by Andrew Cagney and Cygnus Solutions.
 
 This file is part of GDB, the GNU debugger.
@@ -17,26 +17,19 @@ GNU General Public License for more details.
 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_STDLIB_H
 #include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
 #include <ctype.h>
 
 
-struct hw_port_edge {
+struct hw_port_edge
+{
   int my_port;
   struct hw *dest;
   int dest_port;
@@ -44,13 +37,15 @@ struct hw_port_edge {
   object_disposition disposition;
 };
 
-struct hw_port_data {
+struct hw_port_data
+{
   hw_port_event_method *to_port_event;
   const struct hw_port_descriptor *ports;
   struct hw_port_edge *edges;
 };
 
-const struct hw_port_descriptor empty_hw_ports[] = {
+const struct hw_port_descriptor empty_hw_ports[] =
+{
   { NULL, 0, 0, 0 },
 };
 
@@ -242,7 +237,7 @@ hw_port_decode (struct hw *me,
 {
   if (port_name == NULL || port_name[0] == '\0')
     return 0;
-  if (isdigit(port_name[0]))
+  if (isdigit (port_name[0]))
     {
       return strtoul (port_name, NULL, 0);
     }
@@ -250,7 +245,7 @@ hw_port_decode (struct hw *me,
     {
       const struct hw_port_descriptor *ports =
        me->ports_of_hw->ports;
-      if (ports != NULL) 
+      if (ports != NULL)
        {
          while (ports->name != NULL)
            {
@@ -264,7 +259,7 @@ hw_port_decode (struct hw *me,
                        {
                          if (port_name[len] == '\0')
                            return ports->number;
-                         else if(isdigit (port_name[len]))
+                         else if (isdigit (port_name[len]))
                            {
                              int port = (ports->number
                                          + strtoul (&port_name[len], NULL, 0));
@@ -283,7 +278,7 @@ hw_port_decode (struct hw *me,
            }
        }
     }
-  hw_abort (me, "Unreconized port %s", port_name);
+  hw_abort (me, "Unrecognized port %s", port_name);
   return 0;
 }
 
@@ -309,7 +304,7 @@ hw_port_encode (struct hw *me,
                    && port_number < ports->number + ports->nr_ports)
                  {
                    strcpy (buf, ports->name);
-                   sprintf (buf + strlen(buf), "%d", port_number - ports->number);
+                   sprintf (buf + strlen (buf), "%d", port_number - ports->number);
                    if (strlen (buf) >= sizeof_buf)
                      hw_abort (me, "hw_port_encode: buffer overflow");
                    return strlen (buf);
@@ -319,10 +314,10 @@ hw_port_encode (struct hw *me,
              {
                if (ports->number == port_number)
                  {
-                   if (strlen(ports->name) >= sizeof_buf)
+                   if (strlen (ports->name) >= sizeof_buf)
                      hw_abort (me, "hw_port_encode: buffer overflow");
-                   strcpy(buf, ports->name);
-                   return strlen(buf);
+                   strcpy (buf, ports->name);
+                   return strlen (buf);
                  }
              }
          }
@@ -330,7 +325,7 @@ hw_port_encode (struct hw *me,
       }
   }
   sprintf (buf, "%d", port_number);
-  if (strlen(buf) >= sizeof_buf)
+  if (strlen (buf) >= sizeof_buf)
     hw_abort (me, "hw_port_encode: buffer overflow");
-  return strlen(buf);
+  return strlen (buf);
 }