Commit Diff
Diff:
e9e1fa459b2fe8575deed8a195d889f5c94d37b0
161340d4869645423f2c3e0f803d3bde671e2e2c
Commit:
161340d4869645423f2c3e0f803d3bde671e2e2c
Tree:
b306b4d9709818cd2a2903358fe537653a4f1d8a
Author:
Florian Westphal <fw@strlen.de>
Committer:
Florian Westphal <fw@strlen.de>
Date:
Sat Jul 1 22:11:48 2006 UTC
Message:
ALIGN_XXX( v ) macros now leave v alone if it was already aligned.
blob - 041cc8271880c13d8387427bd21f08c48a4eefd8
blob + 6e96bd56b0d5635324e8c04f71f41f4b4b94d66a
--- src/ngircd/array.c
+++ src/ngircd/array.c
@@ -12,7 +12,7 @@
#include "array.h"
-static char UNUSED id[] = "$Id: array.c,v 1.10 2006/05/09 17:02:40 fw Exp $";
+static char UNUSED id[] = "$Id: array.c,v 1.11 2006/07/01 22:11:48 fw Exp $";
#include <assert.h>
@@ -28,17 +28,15 @@ static char UNUSED id[] = "$Id: array.c,v 1.10 2006/05
#define array_UNUSABLE(x) ( !(x)->mem || (0 == (x)->allocated) )
-#define ALIGN_32U(x) (((x) | 0x1fU) +1)
-#define ALIGN_1024U(x) (((x) | 0x3ffU) +1)
-#define ALIGN_4096U(x) (((x) | 0xfffU) +1)
+#define ALIGN_32U(x) (((x)+31U ) & ~(31U))
+#define ALIGN_1024U(x) (((x)+1023U) & ~(1023U))
+#define ALIGN_4096U(x) (((x)+4095U) & ~(4095U))
static bool
safemult_sizet(size_t a, size_t b, size_t *res)
{
- size_t tmp;
-
- tmp = a * b;
+ size_t tmp = a * b;
if (b && (tmp / b != a))
return false;
@@ -56,8 +54,8 @@ array_init(array *a)
a->allocated = 0;
a->used = 0;
}
-
+
/* if realloc() fails, array_alloc return NULL. otherwise return pointer to elem pos in array */
void *
array_alloc(array * a, size_t size, size_t pos)
IRCNow