From 82fc2f9628e0f1dbd9010e0146ff63832e4a77a1 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Sat, 14 Nov 2009 08:10:22 -0800
Subject: binarybuffer: fix whitespace related issues
Add inter-operator whitespace. Improve existing documentation.
---
src/helper/binarybuffer.c | 6 +++---
src/helper/binarybuffer.h | 35 +++++++++++++++--------------------
2 files changed, 18 insertions(+), 23 deletions(-)
(limited to 'src/helper')
diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c
index fdfcf715..d813ecf5 100644
--- a/src/helper/binarybuffer.c
+++ b/src/helper/binarybuffer.c
@@ -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++;
}
diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index 2399a6ed..60077b31 100644
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -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);
--
cgit v1.2.3