X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Farray.c;h=d84007e4282a979e4bce18b0086fe3d015398043;hb=dcff73b2cc34378750e2cc1979a4b120e19767a9;hp=a225628e1dafe8f37eb99e96688b54725a5ef86b;hpb=cb625e131029ac033685403fb87181533748a276;p=libfirm

diff --git a/ir/adt/array.c b/ir/adt/array.c
index a225628e1..d84007e42 100644
--- a/ir/adt/array.c
+++ b/ir/adt/array.c
@@ -21,7 +21,6 @@
  * @file
  * @brief       Array --- dynamic & flexible arrays.
  * @author      Markus Armbruster
- * @version     $Id$
  */
 
 #include "config.h"
@@ -47,7 +46,7 @@
 /**
  * An empty dynamic array descriptor.
  */
-ir_arr_descr arr_mt_descr = { ARR_D_MAGIC, 0, {0}, 0, {{{0}}} };
+ir_arr_descr arr_mt_descr = { ARR_D_MAGIC, 0, { 0 }, 0,  { { 0 } } };
 
 void ir_verify_arr(const void *arr)
 {
@@ -55,10 +54,7 @@ void ir_verify_arr(const void *arr)
 	ir_arr_descr *descr = ARR_DESCR(arr);
 	assert(descr->magic == ARR_D_MAGIC || descr->magic == ARR_A_MAGIC
 			 || descr->magic == ARR_F_MAGIC);
-	if (descr->magic == ARR_F_MAGIC) {
-		assert(descr->u.allocated >= descr->nelts);
-	}
-	assert(descr->nelts >= 0);
+	assert(descr->magic != ARR_F_MAGIC || descr->u.allocated >= descr->nelts);
 #else
 	(void) arr;
 #endif
@@ -194,6 +190,10 @@ void *ir_arr_resize(void *elts, size_t nelts, size_t eltsize)
 }
 
 #ifdef DEBUG_libfirm
+/* forward declarations to avoid warnings */
+size_t array_len(const void *arr);
+ir_arr_descr *array_descr(const void *arr);
+
 /**
  * This function returns the length of a flexible array.
  * Do NOT use is in code, use ARR_LEN() macro!