Skip to content
This repository was archived by the owner on Aug 19, 2021. It is now read-only.

Commit f602cb5

Browse files
committed
Adopted size_t where applicable
1 parent d11bd98 commit f602cb5

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

equeue.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <string.h>
1111

1212

13-
int equeue_create(equeue_t *q, unsigned size) {
13+
int equeue_create(equeue_t *q, size_t size) {
1414
void *buffer = malloc(size);
1515
if (!buffer) {
1616
return -1;
@@ -21,7 +21,7 @@ int equeue_create(equeue_t *q, unsigned size) {
2121
return err;
2222
}
2323

24-
int equeue_create_inplace(equeue_t *q, unsigned size, void *buffer) {
24+
int equeue_create_inplace(equeue_t *q, size_t size, void *buffer) {
2525
q->slab.size = size;
2626
q->slab.data = buffer;
2727
q->chunks = 0;
@@ -67,7 +67,7 @@ void equeue_destroy(equeue_t *q) {
6767
}
6868

6969
// equeue allocation functions
70-
static void *equeue_mem_alloc(equeue_t *q, unsigned size) {
70+
static void *equeue_mem_alloc(equeue_t *q, size_t size) {
7171
size = size + sizeof(unsigned);
7272
size = (size + sizeof(unsigned)-1) & ~(sizeof(unsigned)-1);
7373
if (size < sizeof(struct equeue_chunk)) {
@@ -134,7 +134,7 @@ static inline int equeue_next_id(equeue_t *q) {
134134
return id;
135135
}
136136

137-
void *equeue_alloc(equeue_t *q, unsigned size) {
137+
void *equeue_alloc(equeue_t *q, size_t size) {
138138
struct equeue_event *e = equeue_mem_alloc(q,
139139
sizeof(struct equeue_event) + size);
140140
if (!e) {

equeue.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ extern "C" {
1616
#include "equeue_mutex.h"
1717
#include "equeue_sema.h"
1818

19+
#include <stddef.h>
20+
1921

2022
// Definition of the minimum size of an event
2123
// This size fits the events created in the event_call set of functions.
@@ -44,7 +46,7 @@ typedef struct equeue {
4446
struct equeue_chunk *nchunk;
4547
} *chunks;
4648
struct equeue_slab {
47-
unsigned size;
49+
size_t size;
4850
unsigned char *data;
4951
} slab;
5052

@@ -59,8 +61,8 @@ typedef struct equeue {
5961
// Queue operations
6062
//
6163
// Creation results in negative value on failure.
62-
int equeue_create(equeue_t *queue, unsigned size);
63-
int equeue_create_inplace(equeue_t *queue, unsigned size, void *buffer);
64+
int equeue_create(equeue_t *queue, size_t size);
65+
int equeue_create_inplace(equeue_t *queue, size_t size, void *buffer);
6466
void equeue_destroy(equeue_t *queue);
6567

6668
// Dispatch events
@@ -98,7 +100,7 @@ int equeue_call_every(equeue_t *queue, int ms, void (*cb)(void *), void *data);
98100
//
99101
// equeue_alloc will result in null if no memory is available
100102
// or the requested size is less than the size passed to equeue_create.
101-
void *equeue_alloc(equeue_t *queue, unsigned size);
103+
void *equeue_alloc(equeue_t *queue, size_t size);
102104
void equeue_dealloc(equeue_t *queue, void *event);
103105

104106
// Configure an allocated event

tests/tests.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void timing_func(void *p) {
7474

7575
struct fragment {
7676
equeue_t *q;
77-
unsigned size;
77+
size_t size;
7878
struct timing timing;
7979
};
8080

@@ -293,7 +293,7 @@ void fragmenting_barrage_test(int N) {
293293
test_assert(!err);
294294

295295
for (int i = 0; i < N; i++) {
296-
unsigned size = sizeof(struct fragment) + i*sizeof(int);
296+
size_t size = sizeof(struct fragment) + i*sizeof(int);
297297
struct fragment *fragment = equeue_alloc(&q, size);
298298
test_assert(fragment);
299299

0 commit comments

Comments
 (0)