mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-10-27 20:36:18 +00:00
Code Issues Releases Wiki Activity

array_get: no need to multiply again. remove unneeded checks. remove array_free_wipe().

Browse Source
This commit is contained in:
Florian Westphal 2006-09-30 21:49:46 +00:00
parent a2f5a05ff8
commit 4c6c6ecf0e
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ngircd/array.c
View File

@ -12,7 +12,7 @@
#include "array.h" #include "array.h"
static char UNUSED id[] = "$Id: array.c,v 1.11 2006/07/01 22:11:48 fw Exp $"; static char UNUSED id[] = "$Id: array.c,v 1.12 2006/09/30 21:49:46 fw Exp $";
#include <assert.h> #include <assert.h>
@ -66,10 +66,7 @@ array_alloc(array * a, size_t size, size_t pos)
assert(size > 0); assert(size > 0);
if (pos_plus1 < pos) if (pos_plus1 == 0 || !safemult_sizet(size, pos_plus1, &alloc))
return NULL;
if (!safemult_sizet(size, pos_plus1, &alloc))
return NULL; return NULL;
if (a->allocated < alloc) { if (a->allocated < alloc) {
@ -263,7 +260,7 @@ array_get(array * a, size_t membersize, size_t pos)
if (a->allocated < totalsize) if (a->allocated < totalsize)
return NULL; return NULL;
return a->mem + pos * membersize; return a->mem + totalsize;
} }
@ -283,16 +280,6 @@ array_free(array * a)
} }
void
array_free_wipe(array * a)
{
if (!array_UNUSABLE(a))
memset(a->mem, 0, a->allocated);
array_free(a);
}
void * void *
array_start(const array * const a) array_start(const array * const a)
{ {
@ -331,9 +318,6 @@ array_moveleft(array * a, size_t membersize, size_t pos)
assert(a != NULL); assert(a != NULL);
assert(membersize > 0); assert(membersize > 0);
if (!pos)
return;
if (!safemult_sizet(membersize, pos, &bytepos)) { if (!safemult_sizet(membersize, pos, &bytepos)) {
a->used = 0; a->used = 0;
return; return;