Skip to content

Commit 7a69b6e

Browse files
committed
Add macro for assert
1 parent 4a69dff commit 7a69b6e

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

circularbuffer.c

+17-15
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@
3636
/* **** Includes **** */
3737

3838
#include "circularbuffer.h"
39-
#include <assert.h>
4039
#include <string.h>
40+
#include <assert.h>
4141

4242
/* **** Defines **** */
4343

44+
#define ASSERT(expr) assert(expr)
45+
4446
/* **** Typedefs **** */
4547

4648
/* **** Static Function Declarations **** */
@@ -55,14 +57,14 @@
5557

5658
void CircularBufferInit(CircularBufferContext *ctx, void *buf, size_t buf_size,
5759
size_t element_size) {
58-
assert(ctx);
59-
assert(buf);
60-
assert(buf_size);
61-
assert(element_size);
60+
ASSERT(ctx);
61+
ASSERT(buf);
62+
ASSERT(buf_size);
63+
ASSERT(element_size);
6264

6365
const size_t size = buf_size / element_size;
6466

65-
assert((size & (size - 1u)) == 0u);
67+
ASSERT((size & (size - 1u)) == 0u);
6668

6769
ctx->buf = buf;
6870
ctx->write_pos = 0u;
@@ -72,15 +74,15 @@ void CircularBufferInit(CircularBufferContext *ctx, void *buf, size_t buf_size,
7274
}
7375

7476
void CircularBufferClear(CircularBufferContext *ctx) {
75-
assert(ctx);
77+
ASSERT(ctx);
7678

7779
ctx->write_pos = 0u;
7880
ctx->read_pos = 0u;
7981
}
8082

8183
int32_t CircularBufferPushBack(CircularBufferContext *ctx, const void *val) {
82-
assert(ctx);
83-
assert(val);
84+
ASSERT(ctx);
85+
ASSERT(val);
8486

8587
const size_t write_pos = (ctx->write_pos + 1) & ctx->max_size;
8688

@@ -100,8 +102,8 @@ int32_t CircularBufferPushBack(CircularBufferContext *ctx, const void *val) {
100102
}
101103

102104
int32_t CircularBufferPopFront(CircularBufferContext *ctx, void *val) {
103-
assert(ctx);
104-
assert(val);
105+
ASSERT(ctx);
106+
ASSERT(val);
105107

106108
// Check if empty
107109
if (ctx->read_pos == ctx->write_pos) {
@@ -121,7 +123,7 @@ int32_t CircularBufferPopFront(CircularBufferContext *ctx, void *val) {
121123

122124
int32_t CircularBufferPeek(const CircularBufferContext *ctx, size_t num,
123125
void **elem) {
124-
assert(ctx);
126+
ASSERT(ctx);
125127

126128
const size_t write_pos = ctx->write_pos;
127129
const size_t read_pos = ctx->read_pos;
@@ -143,19 +145,19 @@ int32_t CircularBufferPeek(const CircularBufferContext *ctx, size_t num,
143145
}
144146

145147
size_t CircularBufferSize(const CircularBufferContext *ctx) {
146-
assert(ctx);
148+
ASSERT(ctx);
147149

148150
return ((ctx->write_pos - ctx->read_pos) & ctx->max_size);
149151
}
150152

151153
size_t CircularBufferSpace(const CircularBufferContext *ctx) {
152-
assert(ctx);
154+
ASSERT(ctx);
153155

154156
return (ctx->max_size - CircularBufferSize(ctx));
155157
}
156158

157159
bool CircularBufferEmpty(const CircularBufferContext *ctx) {
158-
assert(ctx);
160+
ASSERT(ctx);
159161

160162
return (ctx->read_pos == ctx->write_pos);
161163
}

0 commit comments

Comments
 (0)