repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 23ce0393b23779f19d6d56103c46f9d929fdef53:
path_to: 
revision_to: 

commit 23ce0393b23779f19d6d56103c46f9d929fdef53
Author: Florian Westphal 
Date:   Sun Jan 9 19:40:54 2011 +0100

    array: remove check for allocated == 0

    allocated can only be zero if ->mem is NULL.

diff --git a/src/ngircd/array.c b/src/ngircd/array.c

--- a/src/ngircd/array.c
+++ b/src/ngircd/array.c
@@ -12,8 +12,6 @@

 #include "array.h"

-static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $";
-
 #include 

 #include 
@@ -26,7 +24,7 @@ static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $";



-#define array_UNUSABLE(x)	( !(x)->mem || (0 == (x)->allocated) )
+#define array_UNUSABLE(x)	( !(x)->mem )
 static bool
 safemult_sizet(size_t a, size_t b, size_t *res)
 {
@@ -93,6 +91,7 @@ array_length(const array * const a, size_t membersize)
 	if (array_UNUSABLE(a))
 		return 0;

+	assert(a->allocated);
 	return membersize ? a->used / membersize : 0;
 }

@@ -104,6 +103,7 @@ array_copy(array * dest, const array * const src)
 	if (array_UNUSABLE(src))
 		return false;

+	assert(src->allocated);
 	return array_copyb(dest, src->mem, src->used);
 }

-----END OF PAGE-----