1
0

Add ACK'd v2 changes for previous commit

This commit is contained in:
Cole Robinson 2010-06-18 11:56:04 -04:00
parent 58406dd54e
commit 9edceb3233

View File

@ -101,7 +101,7 @@ void virBitmapFree(virBitmapPtr bitmap)
*/ */
int virBitmapSetBit(virBitmapPtr bitmap, size_t b) int virBitmapSetBit(virBitmapPtr bitmap, size_t b)
{ {
if (b > bitmap->size - 1) if (bitmap->size <= b)
return -1; return -1;
bitmap->map[VIR_BITMAP_UNIT_OFFSET(b)] |= (1 << VIR_BITMAP_BIT_OFFSET(b)); bitmap->map[VIR_BITMAP_UNIT_OFFSET(b)] |= (1 << VIR_BITMAP_BIT_OFFSET(b));
@ -119,7 +119,7 @@ int virBitmapSetBit(virBitmapPtr bitmap, size_t b)
*/ */
int virBitmapClearBit(virBitmapPtr bitmap, size_t b) int virBitmapClearBit(virBitmapPtr bitmap, size_t b)
{ {
if (bitmap->size != 0 && b > bitmap->size - 1) if (bitmap->size <= b)
return -1; return -1;
bitmap->map[VIR_BITMAP_UNIT_OFFSET(b)] &= ~(1 << VIR_BITMAP_BIT_OFFSET(b)); bitmap->map[VIR_BITMAP_UNIT_OFFSET(b)] &= ~(1 << VIR_BITMAP_BIT_OFFSET(b));
@ -141,7 +141,7 @@ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result)
{ {
uint32_t bit; uint32_t bit;
if (b > bitmap->size - 1) if (bitmap->size <= b)
return -1; return -1;
bit = bitmap->map[VIR_BITMAP_UNIT_OFFSET(b)] & bit = bitmap->map[VIR_BITMAP_UNIT_OFFSET(b)] &