sim: sim_do_commandf: fix call to va_end [PR sim/19273]

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

diff --git a/sim/common/hw-instances.c b/sim/common/hw-instances.c
index 3a4791393e3bf6bb71af30d2adab2fd7432f96c6..5cb2bc8feda5b783cdf82466df5bd138ff30fd1f 100644 (file)
--- a/sim/common/hw-instances.c
+++ b/sim/common/hw-instances.c
@@ -1,6 +1,6 @@
 /* The common simulator framework for GDB, the GNU Debugger.
 
-   Copyright 2002, 2007 Free Software Foundation, Inc.
+   Copyright 2002-2015 Free Software Foundation, Inc.
 
    Contributed by Andrew Cagney and Red Hat.
 
@@ -8,7 +8,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include "hw-main.h"
@@ -28,7 +26,8 @@
 #include "sim-io.h"
 #include "sim-assert.h"
 
-struct hw_instance_data {
+struct hw_instance_data
+{
   hw_finish_instance_method *to_finish;
   struct hw_instance *instances;
 };
@@ -88,11 +87,11 @@ hw_instance_delete (struct hw_instance *instance)
   struct hw *me = hw_instance_hw (instance);
   if (instance->to_instance_delete == NULL)
     hw_abort (me, "no delete method");
-  instance->method->delete(instance);
+  instance->method->delete (instance);
   if (instance->args != NULL)
-    zfree (instance->args);
+    free (instance->args);
   if (instance->path != NULL)
-    zfree (instance->path);
+    free (instance->path);
   if (instance->child == NULL)
     {
       /* only remove leaf nodes */
@@ -110,7 +109,7 @@ hw_instance_delete (struct hw_instance *instance)
       struct hw_instance *curr = me->instances;
       while (curr != NULL)
        {
-         ASSERT(curr != instance);
+         ASSERT (curr != instance);
          curr = curr->next;
        }
       /* unlink the child */
@@ -118,7 +117,7 @@ hw_instance_delete (struct hw_instance *instance)
       instance->child->parent = NULL;
     }
   cap_remove (me->ihandles, instance);
-  zfree (instance);
+  free (instance);
 #endif
 }
 
@@ -158,7 +157,7 @@ int
 hw_instance_call_method (struct hw_instance *instance,
                         const char *method_name,
                         int n_stack_args,
-                        unsigned_cell stack_args[/*n_stack_args*/],    
+                        unsigned_cell stack_args[/*n_stack_args*/],
                         int n_stack_returns,
                         unsigned_cell stack_returns[/*n_stack_args*/])
 {
@@ -174,7 +173,7 @@ hw_instance_call_method (struct hw_instance *instance,
     }
   while (method->name != NULL)
     {
-      if (strcmp(method->name, method_name) == 0)
+      if (strcmp (method->name, method_name) == 0)
        {
          return method->method (instance,
                                 n_stack_args, stack_args,
@@ -281,8 +280,8 @@ hw_instance_interceed (struct hw_instance *parent,
       *previous = instance;
     }
   instance->data = data;
-  instance->args = (args == NULL ? NULL : (char *) strdup(args));
-  instance->path = (path == NULL ? NULL : (char *) strdup(path));
+  instance->args = (args == NULL ? NULL : (char *) strdup (args));
+  instance->path = (path == NULL ? NULL : (char *) strdup (path));
   cap_add (instance->owner->ihandles, instance);
   return instance;
 #endif