Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALIGN -> BIRD_ALIGN

Browse source
This commit is contained in:
Ondrej Filip 2004-06-01 10:28:25 +00:00
parent 22122d4d4c
commit 7fdd338c36
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/birdlib.h
View file

@ -13,9 +13,7 @@
#define OFFSETOF(s, i) ((unsigned int)&((s *)0)->i) #define OFFSETOF(s, i) ((unsigned int)&((s *)0)->i)
#define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i))) #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
#ifndef ALIGN #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1))
#define ALIGN(s, a) (((s)+a-1)&~(a-1))
#endif
/* Utility macros */ /* Utility macros */

2
lib/mempool.c
View file

@ -90,7 +90,7 @@ linpool
void * void *
lp_alloc(linpool *m, unsigned size) lp_alloc(linpool *m, unsigned size)
{ {
byte *a = (byte *) ALIGN((unsigned long) m->ptr, CPU_STRUCT_ALIGN); byte *a = (byte *) BIRD_ALIGN((unsigned long) m->ptr, CPU_STRUCT_ALIGN);
byte *e = a + size; byte *e = a + size;
if (e <= m->end) if (e <= m->end)

6
proto/bgp/attrs.c
View file

@ -327,7 +327,7 @@ bgp_new_bucket(struct bgp_proto *p, ea_list *new, unsigned hash)
{ {
struct bgp_bucket *b; struct bgp_bucket *b;
unsigned ea_size = sizeof(ea_list) + new->count * sizeof(eattr); unsigned ea_size = sizeof(ea_list) + new->count * sizeof(eattr);
unsigned ea_size_aligned = ALIGN(ea_size, CPU_STRUCT_ALIGN); unsigned ea_size_aligned = BIRD_ALIGN(ea_size, CPU_STRUCT_ALIGN);
unsigned size = sizeof(struct bgp_bucket) + ea_size; unsigned size = sizeof(struct bgp_bucket) + ea_size;
unsigned i; unsigned i;
byte *dest; byte *dest;
@ -338,7 +338,7 @@ bgp_new_bucket(struct bgp_proto *p, ea_list *new, unsigned hash)
{ {
eattr *a = &new->attrs[i]; eattr *a = &new->attrs[i];
if (!(a->type & EAF_EMBEDDED)) if (!(a->type & EAF_EMBEDDED))
size += ALIGN(sizeof(struct adata) + a->u.ptr->length, CPU_STRUCT_ALIGN); size += BIRD_ALIGN(sizeof(struct adata) + a->u.ptr->length, CPU_STRUCT_ALIGN);
} }
/* Create the bucket and hash it */ /* Create the bucket and hash it */
@ -364,7 +364,7 @@ bgp_new_bucket(struct bgp_proto *p, ea_list *new, unsigned hash)
struct adata *na = (struct adata *) dest; struct adata *na = (struct adata *) dest;
memcpy(na, oa, sizeof(struct adata) + oa->length); memcpy(na, oa, sizeof(struct adata) + oa->length);
a->u.ptr = na; a->u.ptr = na;
dest += ALIGN(sizeof(struct adata) + na->length, CPU_STRUCT_ALIGN); dest += BIRD_ALIGN(sizeof(struct adata) + na->length, CPU_STRUCT_ALIGN);
} }
} }