bfd macro conversion to inline functions

[deliverable/binutils-gdb.git] / sim / ppc / hw_disk.c

diff --git a/sim/ppc/hw_disk.c b/sim/ppc/hw_disk.c
index 84086ff1d4ae16e1717b0fa1d7ee9f5700328607..a2ea9340bc5afa64baec0f023bc033077045188e 100644 (file)
--- a/sim/ppc/hw_disk.c
+++ b/sim/ppc/hw_disk.c
@@ -4,7 +4,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,
@@ -13,8 +13,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/>.
     
     */
 
@@ -203,7 +202,7 @@ open_disk_image(device *me,
   if (disk->image != NULL)
     fclose(disk->image);
   if (disk->name != NULL)
-    zfree(disk->name);
+    free(disk->name);
   disk->name = strdup(name);
   disk->image = fopen(disk->name, disk->read_only ? "r" : "r+");
   if (disk->image == NULL) {
@@ -233,7 +232,7 @@ hw_disk_init_address(device *me)
                        me);
 
   /* Tell the world we are a disk.  */
-  device_add_string_property(me, "device_type", "disk");
+  device_add_string_property(me, "device_type", "block");
 
   /* get the name of the file specifying the disk image */
   disk->name_index = 0;
@@ -351,7 +350,7 @@ hw_disk_instance_delete(device_instance *instance)
   hw_disk_instance *data = device_instance_data(instance);
   DITRACE(disk, ("delete - instance=%ld\n",
                 (unsigned long)device_instance_to_external(instance)));
-  zfree(data);
+  free(data);
 }
 
 static int