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

fix regression in C build

Browse source
This commit is contained in:
Rusty Sears 2013-01-30 14:19:24 -08:00
parent 11336cde4c
commit ae086372dd
1 changed files with 6 additions and 6 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(list*))LH_ENTRY(insert)(pblLists, if((oldList = (struct 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(list*))LH_ENTRY(remove)(pblLists, &h, sizeof(pblHashTable_t*)); oldList = (struct 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(list*))LH_ENTRY(find)(pblLists, struct LH_ENTRY(list) *list = (struct 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 = (LH_ENTRY(list*)) struct LH_ENTRY(list)* oldList = (struct 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(list*))LH_ENTRY(find)(pblLists, struct LH_ENTRY(list) *list = (struct 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(list*))LH_ENTRY(find)(pblLists, struct LH_ENTRY(list) *list = (struct 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;