Commit fd4c46bf authored by Trent Mick's avatar Trent Mick

Use safer comparisons (only matters when sizeof(int) != sizeof(size_t)). fread

and fwrite return size_t, so it is safer to cast up to the largest type for the
comparison. I believe the cast is required at all to remove compiler warnings.
parent 7fb489f4
......@@ -1039,8 +1039,8 @@ array_tofile(arrayobject *self, PyObject *args)
return NULL;
}
if (self->ob_size > 0) {
if ((int)fwrite(self->ob_item, self->ob_descr->itemsize,
self->ob_size, fp) != self->ob_size) {
if (fwrite(self->ob_item, self->ob_descr->itemsize,
self->ob_size, fp) != (size_t)self->ob_size) {
PyErr_SetFromErrno(PyExc_IOError);
clearerr(fp);
return NULL;
......
......@@ -407,7 +407,7 @@ write_file(Picklerobject *self, char *s, int n) {
return 0;
}
if ((int)fwrite(s, sizeof(char), n, self->fp) != n) {
if (fwrite(s, sizeof(char), n, self->fp) != (size_t)n) {
PyErr_SetFromErrno(PyExc_IOError);
return -1;
}
......@@ -503,7 +503,7 @@ read_file(Unpicklerobject *self, char **s, int n) {
self->buf_size = n;
}
if ((int)fread(self->buf, sizeof(char), n, self->fp) != n) {
if (fread(self->buf, sizeof(char), n, self->fp) != (size_t)n) {
if (feof(self->fp)) {
PyErr_SetNone(PyExc_EOFError);
return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment