remove obsolete/unused debug stuff in ADTs

[libfirm] / ir / adt / array.c

diff --git a/ir/adt/array.c b/ir/adt/array.c
index 84674e3..b7dc323 100644 (file)
--- a/ir/adt/array.c
+++ b/ir/adt/array.c
@@ -76,12 +76,13 @@ void ir_verify_arr(const void *arr)
  *
  * @remark Helper function, use NEW_ARR_D() instead.
  */
-void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size) {
+void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size)
+{
        ir_arr_descr *dp;
 
        assert(obstack && (nelts >= 0));
 
-       dp = obstack_alloc(obstack, ARR_ELTS_OFFS + elts_size);
+       dp = (ir_arr_descr*) obstack_alloc(obstack, ARR_ELTS_OFFS + elts_size);
        ARR_SET_DBGINF(dp, ARR_D_MAGIC, elts_size/nelts);
        dp->u.obstack = obstack;
        dp->nelts = nelts;
@@ -99,14 +100,15 @@ void *ir_new_arr_d(struct obstack *obstack, int nelts, size_t elts_size) {
  *
  * @remark Helper function, use NEW_ARR_F() instead.
  */
-void *ir_new_arr_f(int nelts, size_t elts_size) {
-       ir_arr_descr *new;
+void *ir_new_arr_f(int nelts, size_t elts_size)
+{
+       ir_arr_descr *newa;
 
        assert (nelts >= 0);
-       new = xmalloc (ARR_ELTS_OFFS+elts_size);
-       ARR_SET_DBGINF (new, ARR_F_MAGIC, nelts ? elts_size/nelts : 0);
-       new->u.allocated = new->nelts = nelts;
-       return new->v.elts;
+       newa = (ir_arr_descr*) xmalloc (ARR_ELTS_OFFS+elts_size);
+       ARR_SET_DBGINF (newa, ARR_F_MAGIC, nelts ? elts_size/nelts : 0);
+       newa->u.allocated = newa->nelts = nelts;
+       return newa->v.elts;
 }
 
 /**
@@ -116,7 +118,8 @@ void *ir_new_arr_f(int nelts, size_t elts_size) {
  *
  * @remark Helper function, use DEL_ARR_F() instead.
  */
-void ir_del_arr_f(void *elts) {
+void ir_del_arr_f(void *elts)
+{
        ir_arr_descr *dp = ARR_DESCR (elts);
 
        ARR_VRFY (elts);
@@ -143,14 +146,15 @@ void ir_del_arr_f(void *elts) {
  *
  * @remark Helper function, use ARR_SETLEN() instead.
  */
-void *ir_arr_setlen (void *elts, int nelts, size_t elts_size) {
+void *ir_arr_setlen (void *elts, int nelts, size_t elts_size)
+{
        ir_arr_descr *dp = ARR_DESCR (elts);
 
        assert ((dp->magic == ARR_F_MAGIC) && (nelts >= 0));
        ARR_VRFY (elts);
        assert (!dp->eltsize || !nelts || (dp->eltsize == elts_size/nelts));
 
-       dp = xrealloc (dp, ARR_ELTS_OFFS+elts_size);
+       dp = (ir_arr_descr*) xrealloc (dp, ARR_ELTS_OFFS+elts_size);
        dp->u.allocated = dp->nelts = nelts;
 
        return dp->v.elts;
@@ -169,7 +173,8 @@ void *ir_arr_setlen (void *elts, int nelts, size_t elts_size) {
  *
  * @remark Helper function, use ARR_RESIZE() instead.
  */
-void *ir_arr_resize(void *elts, int nelts, size_t eltsize) {
+void *ir_arr_resize(void *elts, int nelts, size_t eltsize)
+{
        ir_arr_descr *dp = ARR_DESCR(elts);
        int n;
 
@@ -184,12 +189,8 @@ void *ir_arr_resize(void *elts, int nelts, size_t eltsize) {
        assert(n >= nelts);
 
        if (n != dp->u.allocated) {
-               dp = xrealloc(dp, ARR_ELTS_OFFS+eltsize*n);
+               dp = (ir_arr_descr*) xrealloc(dp, ARR_ELTS_OFFS+eltsize*n);
                dp->u.allocated = n;
-#if defined(DEBUG) && defined(HAVE_GNU_MALLOC)
-       } else {
-               tmalloc_tag = NULL;
-#endif
        }
        dp->nelts = nelts;
 
@@ -202,7 +203,9 @@ void *ir_arr_resize(void *elts, int nelts, size_t eltsize) {
  * Do NOT use is in code, use ARR_LEN() macro!
  * This function is intended to be called from a debugger.
  */
-int array_len(const void *arr) {
+int array_len(const void *arr);
+int array_len(const void *arr)
+{
        return ARR_LEN(arr);
 }
 
@@ -211,7 +214,9 @@ int array_len(const void *arr) {
  * Do NOT use is in code!.
  * This function is intended to be called from a debugger.
  */
-ir_arr_descr *array_descr(const void *arr) {
+ir_arr_descr *array_descr(const void *arr);
+ir_arr_descr *array_descr(const void *arr)
+{
        if (! arr)
                return NULL;
        return ARR_DESCR(arr);