summaryrefslogtreecommitdiff
path: root/msgpack/_unpacker.pyx
diff options
context:
space:
mode:
authorINADA Naoki <songofacandy@gmail.com>2015-11-07 16:30:18 +0900
committerINADA Naoki <songofacandy@gmail.com>2015-11-07 16:52:58 +0900
commite9ab4d8824fddd070bac7cedca332130bf2028b0 (patch)
tree20f7d97c1f94fa2e5fe3df00a88c574f5748d155 /msgpack/_unpacker.pyx
parentab359e333044fc89559b946cfec8efb83c2c6122 (diff)
downloadmsgpack-python-e9ab4d8824fddd070bac7cedca332130bf2028b0.tar.gz
Fix warnings
fixes #146
Diffstat (limited to 'msgpack/_unpacker.pyx')
-rw-r--r--msgpack/_unpacker.pyx24
1 files changed, 12 insertions, 12 deletions
diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
index d53f724..997979c 100644
--- a/msgpack/_unpacker.pyx
+++ b/msgpack/_unpacker.pyx
@@ -37,10 +37,10 @@ cdef extern from "unpack.h":
ctypedef struct unpack_context:
msgpack_user user
PyObject* obj
- size_t count
+ Py_ssize_t count
ctypedef int (*execute_fn)(unpack_context* ctx, const char* data,
- size_t len, size_t* off) except? -1
+ Py_ssize_t len, Py_ssize_t* off) except? -1
execute_fn unpack_construct
execute_fn unpack_skip
execute_fn read_array_header
@@ -112,7 +112,7 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
See :class:`Unpacker` for options.
"""
cdef unpack_context ctx
- cdef size_t off = 0
+ cdef Py_ssize_t off = 0
cdef int ret
cdef char* buf
@@ -142,7 +142,7 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
return obj
else:
- raise UnpackValueError("Unpack failed: error = %d" % (ret,))
+ raise UnpackValueError("Unpack failed: error = %s" % (ret,))
def unpack(object stream, object object_hook=None, object list_hook=None,
@@ -233,14 +233,14 @@ cdef class Unpacker(object):
"""
cdef unpack_context ctx
cdef char* buf
- cdef size_t buf_size, buf_head, buf_tail
+ cdef Py_ssize_t buf_size, buf_head, buf_tail
cdef object file_like
cdef object file_like_read
cdef Py_ssize_t read_size
# To maintain refcnt.
cdef object object_hook, object_pairs_hook, list_hook, ext_hook
cdef object encoding, unicode_errors
- cdef size_t max_buffer_size
+ cdef Py_ssize_t max_buffer_size
def __cinit__(self):
self.buf = NULL
@@ -325,10 +325,10 @@ cdef class Unpacker(object):
cdef:
char* buf = self.buf
char* new_buf
- size_t head = self.buf_head
- size_t tail = self.buf_tail
- size_t buf_size = self.buf_size
- size_t new_size
+ Py_ssize_t head = self.buf_head
+ Py_ssize_t tail = self.buf_tail
+ Py_ssize_t buf_size = self.buf_size
+ Py_ssize_t new_size
if tail + _buf_len > buf_size:
if ((tail - head) + _buf_len) <= buf_size:
@@ -374,7 +374,7 @@ cdef class Unpacker(object):
cdef object _unpack(self, execute_fn execute, object write_bytes, bint iter=0):
cdef int ret
cdef object obj
- cdef size_t prev_head
+ cdef Py_ssize_t prev_head
if self.buf_head >= self.buf_tail and self.file_like is not None:
self.read_from_file()
@@ -408,7 +408,7 @@ cdef class Unpacker(object):
def read_bytes(self, Py_ssize_t nbytes):
"""Read a specified number of raw bytes from the stream"""
- cdef size_t nread
+ cdef Py_ssize_t nread
nread = min(self.buf_tail - self.buf_head, nbytes)
ret = PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)
self.buf_head += nread