diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp index 17017ff30..fe0c37d2f 100644 --- a/src/gui/output/xvdisplayer.cpp +++ b/src/gui/output/xvdisplayer.cpp @@ -62,7 +62,7 @@ XvDisplayer::XvDisplayer( Gtk::Widget *drawing_area, int width, int height ) : for ( unsigned int n = 0; gotPort == false && n < count; ++n ) { // Diagnostics - INFO(gui, "%s, %d, %d, %d", adaptorInfo[ n ].name, + INFO(gui, "%s, %d, %d", adaptorInfo[ n ].name, adaptorInfo[ n ].base_id, adaptorInfo[ n ].num_ports - 1); for ( unsigned int port = adaptorInfo[ n ].base_id; diff --git a/src/lib/mpool.c b/src/lib/mpool.c index 88a2a8be2..9d28266cf 100644 --- a/src/lib/mpool.c +++ b/src/lib/mpool.c @@ -116,7 +116,7 @@ bitmap_bit_get_nth (MPoolcluster cluster, unsigned index) uintptr_t quot = index>>MPOOL_DIV_SHIFT; uintptr_t rem = index & ~((~MPOOL_C(0))<data; + uintptr_t* bitmap = (uintptr_t*)cluster->data; return bitmap[quot] & ((uintptr_t)1<data, 0, MPOOL_BITMAP_SIZE (self->elements_per_cluster)); + memset (cluster->data, 0, MPOOL_BITMAP_SIZE (self->elements_per_cluster)); /* initialize freelist */ for (unsigned i = 0; i < self->elements_per_cluster; ++i) @@ -240,7 +240,7 @@ alloc_near (MPoolcluster cluster, MPool self, void* locality) uintptr_t quot = index>>MPOOL_DIV_SHIFT; uintptr_t rem = index & ~((~MPOOL_C(0))<data; + uintptr_t* bitmap = (uintptr_t*)cluster->data; unsigned r = ~0U; /* the bitmap word at locality */ @@ -276,7 +276,7 @@ bitmap_set_element (MPoolcluster cluster, MPool self, void* element) uintptr_t quot = index>>MPOOL_DIV_SHIFT; uintptr_t rem = index & ~((~MPOOL_C(0))<data; + uintptr_t* bitmap = (uintptr_t*)cluster->data; bitmap[quot] |= ((uintptr_t)1<>MPOOL_DIV_SHIFT; uintptr_t rem = index & ~((~MPOOL_C(0))<data; + uintptr_t* bitmap = (uintptr_t*)cluster->data; bitmap[quot] &= ~((uintptr_t)1<>MPOOL_DIV_SHIFT; uintptr_t rem = index & ~((~MPOOL_C(0))<data; + uintptr_t* bitmap = (uintptr_t*)cluster->data; unsigned r = ~0U; /* the bitmap word at locality */