Make tuple default.

This commit is contained in:
inada-n 2009-12-17 15:19:18 +09:00
parent 77e3e59620
commit 658c90f132
2 changed files with 11 additions and 13 deletions

View file

@ -20,7 +20,7 @@
#include "unpack_define.h"
typedef struct unpack_user {
int use_tuple;
int use_list;
} unpack_user;
@ -136,7 +136,7 @@ static inline int template_callback_false(unpack_user* u, msgpack_unpack_object*
static inline int template_callback_array(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
{
PyObject *p = u->use_tuple ? PyTuple_New(n) : PyList_New(n);
PyObject *p = u->use_list ? PyList_New(n) : PyTuple_New(n);
if (!p)
return -1;
@ -146,12 +146,10 @@ static inline int template_callback_array(unpack_user* u, unsigned int n, msgpac
static inline int template_callback_array_item(unpack_user* u, unsigned int current, msgpack_unpack_object* c, msgpack_unpack_object o)
{
if (u->use_tuple) {
PyTuple_SET_ITEM(*c, current, o);
}
else {
if (u->use_list)
PyList_SET_ITEM(*c, current, o);
}
else
PyTuple_SET_ITEM(*c, current, o);
return 0;
}