mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-10-30 21:42:59 +00:00
Code Issues Releases Wiki Activity

array: remove check for allocated == 0

Browse Source 
allocated can only be zero if ->mem is NULL.
This commit is contained in:
Florian Westphal
2011-01-09 19:40:54 +01:00
parent 994a003aba
commit 23ce0393b2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ngircd/array.c
View File

@@ -12,8 +12,6 @@
#include "array.h" #include "array.h"
static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $";
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
@@ -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 static bool
safemult_sizet(size_t a, size_t b, size_t *res) 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)) if (array_UNUSABLE(a))
return 0; return 0;
assert(a->allocated);
return membersize ? a->used / membersize : 0; return membersize ? a->used / membersize : 0;
} }
@@ -104,6 +103,7 @@ array_copy(array * dest, const array * const src)
if (array_UNUSABLE(src)) if (array_UNUSABLE(src))
return false; return false;
assert(src->allocated);
return array_copyb(dest, src->mem, src->used); return array_copyb(dest, src->mem, src->used);
} }