make obstack object allocators more type-safe

This changes OBSTACK_ZALLOC and OBSTACK_CALLOC to cast their value to
the correct type.  This is more type-safe and also is more in line
with the other object-allocation macros in libiberty.h.

Making this change revealed one trivial error in dwarf2read.c.
On the whole that seems pretty good to me.

Tested by rebuilding.

2014-06-20  Tom Tromey  <tromey@redhat.com>

	* dwarf2read.c (dw2_get_real_path): Use correct type in
	OBSTACK_CALLOC.
	* gdb_obstack.h (OBSTACK_ZALLOC, OBSTACK_CALLOC): Cast result.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1fc54b235a29bf7deb233efa0d9d08074ae260bc..be26dc9129c8eff377c91e8b27e02a80776ea54e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-20  Tom Tromey  <tromey@redhat.com>
+
+       * dwarf2read.c (dw2_get_real_path): Use correct type in
+       OBSTACK_CALLOC.
+       * gdb_obstack.h (OBSTACK_ZALLOC, OBSTACK_CALLOC): Cast result.
+
 2014-06-20  Gary Benson  <gbenson@redhat.com>
 
        * common/gdb_thread_db.h: Moved to nat.  All includes updated.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 9a9f5aa84dc06a9d51e22fcaf4353b4e3f59884b..ba642566393662512b06836730497a20e2121151 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3297,7 +3297,7 @@ dw2_get_real_path (struct objfile *objfile,
 {
   if (qfn->real_names == NULL)
     qfn->real_names = OBSTACK_CALLOC (&objfile->objfile_obstack,
-                                     qfn->num_file_names, char *);
+                                     qfn->num_file_names, const char *);
 
   if (qfn->real_names[index] == NULL)
     qfn->real_names[index] = gdb_realpath (qfn->file_names[index]);

diff --git a/gdb/gdb_obstack.h b/gdb/gdb_obstack.h
index 0b394002d243b7895776cc3b45181a8761635acf..ec2dd97de9f852cc3c195ad096e9234e5acb19ee 100644 (file)
--- a/gdb/gdb_obstack.h
+++ b/gdb/gdb_obstack.h
@@ -25,11 +25,11 @@
 /* Utility macros - wrap obstack alloc into something more robust.  */
 
 #define OBSTACK_ZALLOC(OBSTACK,TYPE) \
-  (memset (obstack_alloc ((OBSTACK), sizeof (TYPE)), 0, sizeof (TYPE)))
+  ((TYPE *) memset (obstack_alloc ((OBSTACK), sizeof (TYPE)), 0, sizeof (TYPE)))
 
 #define OBSTACK_CALLOC(OBSTACK,NUMBER,TYPE) \
-  (memset (obstack_alloc ((OBSTACK), (NUMBER) * sizeof (TYPE)), \
-          0, (NUMBER) * sizeof (TYPE)))
+  ((TYPE *) memset (obstack_alloc ((OBSTACK), (NUMBER) * sizeof (TYPE)), \
+                   0, (NUMBER) * sizeof (TYPE)))
 
 /* Unless explicitly specified, GDB obstacks always use xmalloc() and
    xfree().  */