diff options
| author | Dirk Engling <erdgeist@erdgeist.org> | 2026-04-03 01:40:39 +0200 |
|---|---|---|
| committer | Dirk Engling <erdgeist@erdgeist.org> | 2026-04-03 01:40:39 +0200 |
| commit | e4eb716d2688f5c2d4615d79ad5f4f1eb50a9343 (patch) | |
| tree | 5612056173478fecaad0a030195b6ed2f399df4d /ot_iovec.c | |
| parent | b20b0b89264e9d28ab873b8b1cc9ba73cdb58aeb (diff) | |
turn all int offsets into size_t
Diffstat (limited to 'ot_iovec.c')
| -rw-r--r-- | ot_iovec.c | 21 |
1 files changed, 10 insertions, 11 deletions
| @@ -14,9 +14,9 @@ | |||
| 14 | /* Opentracker */ | 14 | /* Opentracker */ |
| 15 | #include "ot_iovec.h" | 15 | #include "ot_iovec.h" |
| 16 | 16 | ||
| 17 | void *iovec_increase(int *iovec_entries, struct iovec **iovector, size_t new_alloc) { | 17 | void *iovec_increase(size_t *iovec_entries, struct iovec **iovector, size_t new_alloc) { |
| 18 | void *new_data; | 18 | void *new_data; |
| 19 | int new_entries = 1 + *iovec_entries; | 19 | size_t new_entries = 1 + *iovec_entries; |
| 20 | struct iovec *new_vec = realloc(*iovector, new_entries * sizeof(struct iovec)); | 20 | struct iovec *new_vec = realloc(*iovector, new_entries * sizeof(struct iovec)); |
| 21 | 21 | ||
| 22 | if (!new_vec) | 22 | if (!new_vec) |
| @@ -35,8 +35,8 @@ void *iovec_increase(int *iovec_entries, struct iovec **iovector, size_t new_all | |||
| 35 | return new_data; | 35 | return new_data; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | void *iovec_append(int *iovec_entries, struct iovec **iovector, struct iovec *append_iovector) { | 38 | void *iovec_append(size_t *iovec_entries, struct iovec **iovector, struct iovec *append_iovector) { |
| 39 | int new_entries = *iovec_entries + 1; | 39 | size_t new_entries = *iovec_entries + 1; |
| 40 | struct iovec *new_vec = realloc(*iovector, new_entries * sizeof(struct iovec)); | 40 | struct iovec *new_vec = realloc(*iovector, new_entries * sizeof(struct iovec)); |
| 41 | if (!new_vec) | 41 | if (!new_vec) |
| 42 | return NULL; | 42 | return NULL; |
| @@ -54,15 +54,15 @@ void *iovec_append(int *iovec_entries, struct iovec **iovector, struct iovec *ap | |||
| 54 | return new_vec; | 54 | return new_vec; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | void iovec_free(int *iovec_entries, struct iovec **iovector) { | 57 | void iovec_free(size_t *iovec_entries, struct iovec **iovector) { |
| 58 | int i; | 58 | size_t i; |
| 59 | for (i = 0; i < *iovec_entries; ++i) | 59 | for (i = 0; i < *iovec_entries; ++i) |
| 60 | free(((*iovector)[i]).iov_base); | 60 | free(((*iovector)[i]).iov_base); |
| 61 | *iovector = NULL; | 61 | *iovector = NULL; |
| 62 | *iovec_entries = 0; | 62 | *iovec_entries = 0; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | void iovec_fixlast(int *iovec_entries, struct iovec **iovector, void *last_ptr) { | 65 | void iovec_fixlast(size_t *iovec_entries, struct iovec **iovector, void *last_ptr) { |
| 66 | if (*iovec_entries) { | 66 | if (*iovec_entries) { |
| 67 | char *base = (char *)((*iovector)[*iovec_entries - 1]).iov_base; | 67 | char *base = (char *)((*iovector)[*iovec_entries - 1]).iov_base; |
| 68 | size_t new_alloc = ((char *)last_ptr) - base; | 68 | size_t new_alloc = ((char *)last_ptr) - base; |
| @@ -72,7 +72,7 @@ void iovec_fixlast(int *iovec_entries, struct iovec **iovector, void *last_ptr) | |||
| 72 | } | 72 | } |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | void *iovec_fix_increase_or_free(int *iovec_entries, struct iovec **iovector, void *last_ptr, size_t new_alloc) { | 75 | void *iovec_fix_increase_or_free(size_t *iovec_entries, struct iovec **iovector, void *last_ptr, size_t new_alloc) { |
| 76 | void *new_data; | 76 | void *new_data; |
| 77 | 77 | ||
| 78 | iovec_fixlast(iovec_entries, iovector, last_ptr); | 78 | iovec_fixlast(iovec_entries, iovector, last_ptr); |
| @@ -83,9 +83,8 @@ void *iovec_fix_increase_or_free(int *iovec_entries, struct iovec **iovector, vo | |||
| 83 | return new_data; | 83 | return new_data; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | size_t iovec_length(const int *iovec_entries, const struct iovec **iovector) { | 86 | size_t iovec_length(const size_t *iovec_entries, const struct iovec **iovector) { |
| 87 | size_t length = 0; | 87 | size_t i, length = 0; |
| 88 | int i; | ||
| 89 | for (i = 0; i < *iovec_entries; ++i) | 88 | for (i = 0; i < *iovec_entries; ++i) |
| 90 | length += ((*iovector)[i]).iov_len; | 89 | length += ((*iovector)[i]).iov_len; |
| 91 | return length; | 90 | return length; |
