binarybuffer: fix whitespace related issues

Add inter-operator whitespace.  Improve existing documentation.
This commit is contained in:
Zachary T Welch 2009-11-14 08:10:22 -08:00
parent b695cb7522
commit 82fc2f9628
2 changed files with 18 additions and 23 deletions

View File

@ -145,10 +145,10 @@ uint8_t* buf_set_buf(const uint8_t *src, int src_start, uint8_t *dst, int dst_st
for (i = 0; i < len; i++)
{
if (((src[src_idx/8] >> (src_idx % 8)) & 1) == 1)
dst[dst_idx/8] |= 1 << (dst_idx%8);
if (((src[src_idx / 8] >> (src_idx % 8)) & 1) == 1)
dst[dst_idx / 8] |= 1 << (dst_idx % 8);
else
dst[dst_idx/8] &= ~(1 << (dst_idx%8));
dst[dst_idx / 8] &= ~(1 << (dst_idx % 8));
dst_idx++;
src_idx++;
}

View File

@ -25,38 +25,34 @@
#include "types.h"
/* support functions to access arbitrary bits in a byte array
* flip_u32 inverses the bit order inside a 32-bit word (31..0 -> 0..31)
/** @file
* Support functions to access arbitrary bits in a byte array
*/
/* inlining this will help show what fn that is taking time during profiling. */
static inline void buf_set_u32(uint8_t* buffer,
unsigned int first, unsigned int num, uint32_t value)
{
if ((num == 32) && (first == 0))
{
buffer[3]=(value >> 24)&0xff;
buffer[2]=(value >> 16)&0xff;
buffer[1]=(value >> 8)&0xff;
buffer[0]=(value >> 0)&0xff;
} else
{
if ((num == 32) && (first == 0)) {
buffer[3] = (value >> 24) & 0xff;
buffer[2] = (value >> 16) & 0xff;
buffer[1] = (value >> 8) & 0xff;
buffer[0] = (value >> 0) & 0xff;
} else {
unsigned int i;
for (i = first; i < first + num; i++)
{
if (((value >> (i-first))&1) == 1)
buffer[i/8] |= 1 << (i%8);
if (((value >> (i - first)) & 1) == 1)
buffer[i / 8] |= 1 << (i % 8);
else
buffer[i/8] &= ~(1 << (i%8));
buffer[i / 8] &= ~(1 << (i % 8));
}
}
}
static inline uint32_t buf_get_u32(const uint8_t* buffer,
unsigned int first, unsigned int num)
{
if ((num == 32) && (first == 0))
{
if ((num == 32) && (first == 0)) {
return (((uint32_t)buffer[3]) << 24) |
(((uint32_t)buffer[2]) << 16) |
(((uint32_t)buffer[1]) << 8) |
@ -64,17 +60,16 @@ static inline uint32_t buf_get_u32(const uint8_t* buffer,
} else {
uint32_t result = 0;
unsigned int i;
for (i = first; i < first + num; i++)
{
if (((buffer[i/8]>>(i%8))&1) == 1)
result |= 1 << (i-first);
if (((buffer[i / 8] >> (i % 8)) & 1) == 1)
result |= 1 << (i - first);
}
return result;
}
}
/// flip_u32 inverts the bit order inside a 32-bit word (31..0 -> 0..31)
uint32_t flip_u32(uint32_t value, unsigned int num);
int buf_cmp(const uint8_t *buf1, const uint8_t *buf2, int size);