X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fbitmap.h;h=fd05d3da135457356e2e347f377059b67638831d;hb=69b6be193fcb99f87fb0f6747b3b708edd4305a0;hp=5b50c9cc4987aa3e840d62550e303888ce7770ba;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=sliver-openvswitch.git diff --git a/lib/bitmap.h b/lib/bitmap.h index 5b50c9cc4..fd05d3da1 100644 --- a/lib/bitmap.h +++ b/lib/bitmap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,11 +35,22 @@ bitmap_bit__(size_t offset) return 1UL << (offset % BITMAP_ULONG_BITS); } +static inline size_t +bitmap_n_longs(size_t n_bits) +{ + return DIV_ROUND_UP(n_bits, BITMAP_ULONG_BITS); +} + +static inline size_t +bitmap_n_bytes(size_t n_bits) +{ + return bitmap_n_longs(n_bits) * sizeof(unsigned long int); +} + static inline unsigned long * bitmap_allocate(size_t n_bits) { - size_t n_longs = DIV_ROUND_UP(n_bits, BITMAP_ULONG_BITS); - return xcalloc(sizeof(unsigned long int), n_longs); + return xzalloc(bitmap_n_bytes(n_bits)); } static inline void