greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add casts

Browse source
This commit is contained in:
Rusty Sears 2013-01-30 14:08:42 -08:00
parent ed791137b1
commit b31fe84427
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/stasis/util/lhtable.c
View file

@ -469,7 +469,7 @@ void * pblHtFirst ( pblHashTable_t * h ) {
struct LH_ENTRY(list) *list = stasis_alloc(struct LH_ENTRY(list)); struct LH_ENTRY(list) *list = stasis_alloc(struct LH_ENTRY(list));
struct LH_ENTRY(list) * oldList; struct LH_ENTRY(list) * oldList;
if((oldList = LH_ENTRY(insert)(pblLists, if((oldList = (LH_ENTRY(list*))LH_ENTRY(insert)(pblLists,
&h, sizeof(pblHashTable_t*), &h, sizeof(pblHashTable_t*),
list))) { list))) {
LH_ENTRY(closelist)(oldList); LH_ENTRY(closelist)(oldList);
@ -481,27 +481,27 @@ void * pblHtFirst ( pblHashTable_t * h ) {
if(p) { if(p) {
return p->value; return p->value;
} else { } else {
oldList = LH_ENTRY(remove)(pblLists, &h, sizeof(pblHashTable_t*)); oldList = (LH_ENTRY(list*))LH_ENTRY(remove)(pblLists, &h, sizeof(pblHashTable_t*));
free(oldList); free(oldList);
return 0; return 0;
} }
} }
void * pblHtNext ( pblHashTable_t * h ) { void * pblHtNext ( pblHashTable_t * h ) {
struct LH_ENTRY(list) *list = LH_ENTRY(find)(pblLists, struct LH_ENTRY(list) *list = (LH_ENTRY(list*))LH_ENTRY(find)(pblLists,
&h, sizeof(pblHashTable_t*)); &h, sizeof(pblHashTable_t*));
assert(list); assert(list);
const struct LH_ENTRY(pair_t) * p = LH_ENTRY(readlist)(list); const struct LH_ENTRY(pair_t) * p = LH_ENTRY(readlist)(list);
if(p) { if(p) {
return p->value; return p->value;
} else { } else {
struct LH_ENTRY(list)* oldList = struct LH_ENTRY(list)* oldList = (LH_ENTRY(list*))
LH_ENTRY(remove)(pblLists, &h, sizeof(pblHashTable_t*)); LH_ENTRY(remove)(pblLists, &h, sizeof(pblHashTable_t*));
free(oldList); free(oldList);
return 0; return 0;
} }
} }
void * pblHtCurrent ( pblHashTable_t * h ) { void * pblHtCurrent ( pblHashTable_t * h ) {
struct LH_ENTRY(list) *list = LH_ENTRY(find)(pblLists, struct LH_ENTRY(list) *list = (LH_ENTRY(list*))LH_ENTRY(find)(pblLists,
&h, sizeof(pblHashTable_t*)); &h, sizeof(pblHashTable_t*));
if(list && list->currentPair) if(list && list->currentPair)
return list->currentPair->value; return list->currentPair->value;
@ -509,7 +509,7 @@ void * pblHtCurrent ( pblHashTable_t * h ) {
return 0; return 0;
} }
void * pblHtCurrentKey ( pblHashTable_t * h ) { void * pblHtCurrentKey ( pblHashTable_t * h ) {
struct LH_ENTRY(list) *list = LH_ENTRY(find)(pblLists, struct LH_ENTRY(list) *list = (LH_ENTRY(list*))LH_ENTRY(find)(pblLists,
&h, sizeof(pblHashTable_t*)); &h, sizeof(pblHashTable_t*));
if(list && list->currentPair) if(list && list->currentPair)
return (void*)list->currentPair->key; return (void*)list->currentPair->key;

6
src/stasis/util/min.c
View file

@ -56,7 +56,7 @@ void stasis_aggregate_min_add(stasis_aggregate_min_t * min, lsn_t * a) {
min->memo = a; min->memo = a;
} }
} }
lsn_t * p = pthread_getspecific(min->key); lsn_t * p = (lsn_t*)pthread_getspecific(min->key);
if(!p) { if(!p) {
p = stasis_alloc(lsn_t); p = stasis_alloc(lsn_t);
*p = -1; *p = -1;
@ -81,12 +81,12 @@ void stasis_aggregate_min_add(stasis_aggregate_min_t * min, lsn_t * a) {
} }
const lsn_t * stasis_aggregate_min_remove(stasis_aggregate_min_t * min, lsn_t * a) { const lsn_t * stasis_aggregate_min_remove(stasis_aggregate_min_t * min, lsn_t * a) {
if(min->tree) { if(min->tree) {
const lsn_t * ret = rbdelete(a, min->tree); const lsn_t * ret = (const lsn_t*)rbdelete(a, min->tree);
assert(ret == a); assert(ret == a);
return ret; return ret;
} else { } else {
if(min->memo && *min->memo == *a) { min->memo = NULL; } if(min->memo && *min->memo == *a) { min->memo = NULL; }
lsn_t * p = pthread_getspecific(min->key); lsn_t * p = (lsn_t*)pthread_getspecific(min->key);
if(p /*key defined*/) { if(p /*key defined*/) {
if(*p != -1 /*key points to slot in array*/) { if(*p != -1 /*key points to slot in array*/) {
if(min->vals[*p]/*slot in array points to something*/ ) { if(min->vals[*p]/*slot in array points to something*/ ) {

2
src/stasis/util/ringbuffer.c
View file

@ -295,7 +295,7 @@ stasis_ringbuffer_t * stasis_ringbuffer_init(intptr_t base, lsn_t initial_offset
if(err == -1) { perror("Couldn't ftruncate file"); } if(err == -1) { perror("Couldn't ftruncate file"); }
// Note: MAP_ANON is deprecated, but MAP_ANONYMOUS is not supported on MacOS. // Note: MAP_ANON is deprecated, but MAP_ANONYMOUS is not supported on MacOS.
ring->mem = mmap(0, size*2, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0); ring->mem = (byte*)mmap(0, size*2, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
if(ring->mem == MAP_FAILED) { perror("Couldn't mmap anonymous region"); abort(); } if(ring->mem == MAP_FAILED) { perror("Couldn't mmap anonymous region"); abort(); }