Skip to content

Commit 1d705aa

Browse files
committed
Use Py_ssize_t rather than ssize_t
1 parent 7d57539 commit 1d705aa

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/isal/isal_zlibmodule.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,8 @@ GzipReader__new__(PyTypeObject *type, PyObject *args, PyObject *kwargs)
13311331
return (PyObject *)self;
13321332
}
13331333

1334-
static inline ssize_t GzipReader_read_from_file(GzipReader *self)
1334+
static inline Py_ssize_t
1335+
GzipReader_read_from_file(GzipReader *self)
13351336
{
13361337

13371338
uint8_t *current_pos = self->current_pos;
@@ -1388,7 +1389,7 @@ static inline ssize_t GzipReader_read_from_file(GzipReader *self)
13881389

13891390
static PyObject *BadGzipFile; // Import BadGzipFile error for consistency
13901391

1391-
static ssize_t
1392+
static Py_ssize_t
13921393
GzipReader_read_into_buffer(GzipReader *self, uint8_t *out_buffer, size_t out_buffer_size)
13931394
{
13941395
if (out_buffer_size > UINT32_MAX) {
@@ -1398,7 +1399,7 @@ GzipReader_read_into_buffer(GzipReader *self, uint8_t *out_buffer, size_t out_bu
13981399
"with a too large buffer");
13991400
return -1;
14001401
}
1401-
ssize_t bytes_written = 0;
1402+
Py_ssize_t bytes_written = 0;
14021403
while (1) {
14031404
uint8_t *current_pos = self->current_pos;
14041405
uint8_t *buffer_end = self->buffer_end;
@@ -1580,7 +1581,7 @@ GzipReader_readinto(GzipReader *self, PyObject *buffer_obj)
15801581
uint8_t *buffer = view.buf;
15811582
size_t buffer_size = Py_MIN(view.len, UINT32_MAX);
15821583
ENTER_ZLIB(self);
1583-
ssize_t written_size = GzipReader_read_into_buffer(self, buffer, buffer_size);
1584+
Py_ssize_t written_size = GzipReader_read_into_buffer(self, buffer, buffer_size);
15841585
LEAVE_ZLIB(self);
15851586
PyBuffer_Release(&view);
15861587
if (written_size < 0) {
@@ -1614,7 +1615,7 @@ GzipReader_seek(GzipReader *self, PyObject *args, PyObject *kwargs)
16141615
}
16151616
while (1) {
16161617
/* Simply overwrite the tmp buffer over and over */
1617-
ssize_t written_bytes = GzipReader_read_into_buffer(
1618+
Py_ssize_t written_bytes = GzipReader_read_into_buffer(
16181619
self, tmp_buffer, tmp_buffer_size
16191620
);
16201621
if (written_bytes < 0) {
@@ -1659,7 +1660,7 @@ GzipReader_seek(GzipReader *self, PyObject *args, PyObject *kwargs)
16591660
return PyErr_NoMemory();
16601661
}
16611662
while (offset > 0) {
1662-
ssize_t bytes_written = GzipReader_read_into_buffer(
1663+
Py_ssize_t bytes_written = GzipReader_read_into_buffer(
16631664
self, tmp_buffer, Py_MIN(tmp_buffer_size, offset));
16641665
if (bytes_written < 0) {
16651666
PyMem_FREE(tmp_buffer);
@@ -1687,7 +1688,7 @@ GzipReader_readall(GzipReader *self, PyObject *Py_UNUSED(ignore))
16871688
return NULL;
16881689
}
16891690
ENTER_ZLIB(self);
1690-
ssize_t written_size = GzipReader_read_into_buffer(
1691+
Py_ssize_t written_size = GzipReader_read_into_buffer(
16911692
self, (uint8_t *)PyBytes_AS_STRING(first_chunk), chunk_size);
16921693
LEAVE_ZLIB(self);
16931694
if (written_size < 0) {
@@ -1763,7 +1764,7 @@ GzipReader_read(GzipReader *self, PyObject *args)
17631764
return NULL;
17641765
}
17651766
ENTER_ZLIB(self);
1766-
ssize_t written_bytes = GzipReader_read_into_buffer(self, (uint8_t *)PyBytes_AS_STRING(answer), answer_size);
1767+
Py_ssize_t written_bytes = GzipReader_read_into_buffer(self, (uint8_t *)PyBytes_AS_STRING(answer), answer_size);
17671768
LEAVE_ZLIB(self);
17681769
if (written_bytes < 0) {
17691770
Py_DECREF(answer);

0 commit comments

Comments
 (0)