Skip to content

Commit 3557878

Browse files
committed
Avoid using size_t
1 parent 6287d97 commit 3557878

4 files changed

Lines changed: 9 additions & 11 deletions

File tree

src/sonyflake_turbo/_sonyflake.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <stdbool.h>
55
#include <stdint.h>
66
#include <time.h>
7-
#include <unistd.h>
87

98
#include "sonyflake.h"
109
#include "machine_ids.h"

src/sonyflake_turbo/machine_ids.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ int cmp_machine_ids(const void *a, const void *b) {
1616
return (*(uint16_t *)a - *(uint16_t *)b);
1717
}
1818

19-
void sort_machine_ids(uint16_t *machine_ids, size_t machine_ids_len) {
19+
void sort_machine_ids(uint16_t *machine_ids, int machine_ids_len) {
2020
if (machine_ids_len <= 1) {
2121
return;
2222
}
2323

2424
qsort(machine_ids, machine_ids_len, sizeof(uint16_t), cmp_machine_ids);
2525
}
2626

27-
bool has_machine_id_dupes(const uint16_t *machine_ids, size_t machine_ids_len) {
27+
bool has_machine_id_dupes(const uint16_t *machine_ids, int machine_ids_len) {
2828
if (machine_ids_len <= 1) {
2929
return false;
3030
}
3131

32-
for (size_t i = 1; i < machine_ids_len; i++) {
32+
for (int i = 1; i < machine_ids_len; i++) {
3333
if (machine_ids[i] == machine_ids[i - 1]) {
3434
return true;
3535
}

src/sonyflake_turbo/machine_ids.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ struct machine_id_lcg_state;
1010
extern PyType_Slot machine_id_lcg_slots[];
1111
extern PyType_Spec machine_id_lcg_spec;
1212

13-
void sort_machine_ids(uint16_t *machine_ids, size_t machine_ids_len);
14-
bool has_machine_id_dupes(const uint16_t *machine_ids, size_t machine_ids_len);
13+
void sort_machine_ids(uint16_t *machine_ids, int machine_ids_len);
14+
bool has_machine_id_dupes(const uint16_t *machine_ids, int machine_ids_len);
1515

1616
static inline uint16_t machine_id_lcg(uint32_t x) {
1717
return (32309 * x + 13799) % 65536;

src/sonyflake_turbo/sonyflake.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <stdbool.h>
66
#include <stdint.h>
77
#include <time.h>
8-
#include <unistd.h>
98

109
#include "sonyflake.h"
1110
#include "machine_ids.h"
@@ -18,7 +17,7 @@ struct sonyflake_state {
1817
sonyflake_time elapsed_time;
1918
uint32_t combined_sequence;
2019
uint16_t *machine_ids;
21-
size_t machine_ids_len;
20+
Py_ssize_t machine_ids_len;
2221
};
2322

2423
uint64_t compose(const struct sonyflake_state *self) {
@@ -114,7 +113,7 @@ static int sonyflake_init(PyObject *py_self, PyObject *args, PyObject *kwargs) {
114113
self->machine_ids[i] = (uint16_t) machine_id;
115114
}
116115

117-
self->machine_ids_len = (size_t) machine_ids_len;
116+
self->machine_ids_len = machine_ids_len;
118117

119118
sort_machine_ids(self->machine_ids, self->machine_ids_len);
120119

@@ -290,15 +289,15 @@ static PyObject *sonyflake_repr(struct sonyflake_state *self) {
290289

291290
PyList_SetItem(args_list, self->machine_ids_len, s);
292291

293-
for (size_t i = 0; i < self->machine_ids_len; i++) {
292+
for (Py_ssize_t i = 0; i < self->machine_ids_len; i++) {
294293
s = PyUnicode_FromFormat("%u", (unsigned) self->machine_ids[i]);
295294

296295
if (!s) {
297296
Py_DECREF(args_list);
298297
return NULL;
299298
}
300299

301-
PyList_SetItem(args_list, (Py_ssize_t) i, s);
300+
PyList_SetItem(args_list, i, s);
302301
}
303302

304303
s = PyUnicode_FromString(", ");

0 commit comments

Comments
 (0)