diff options
author | Pavel Hrdina <phrdina@redhat.com> | 2015-08-21 12:38:45 -0700 |
---|---|---|
committer | Pavel Hrdina <phrdina@redhat.com> | 2015-10-05 08:50:14 +0200 |
commit | b9314f145038989f7fded66e3dc2abcc8422c61b (patch) | |
tree | b06f6ab68ff8152753383cfb76a6ce7b4c9fa1a0 | |
parent | 29b0c4d9ae8669013e7a76d85c4d5654648ed4cf (diff) | |
download | libvirt-python-b9314f145038989f7fded66e3dc2abcc8422c61b.tar.gz |
Use VIR_PY_NONE instead of increment and Py_None
To insert Py_None into some other python object like dict or tuple, you
need to increase reference to the Py_None. We have a macro to do that.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-rw-r--r-- | libvirt-override.c | 9 | ||||
-rw-r--r-- | typewrappers.c | 54 |
2 files changed, 21 insertions, 42 deletions
diff --git a/libvirt-override.c b/libvirt-override.c index f96cc16..1851406 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -1961,7 +1961,6 @@ virConnectCredCallbackWrapper(virConnectCredentialPtr cred, for (i = 0; i < ncred; i++) { PyObject *pycreditem; pycreditem = PyList_New(5); - Py_INCREF(Py_None); PyTuple_SetItem(pycred, i, pycreditem); PyList_SetItem(pycreditem, 0, libvirt_intWrap((long) cred[i].type)); PyList_SetItem(pycreditem, 1, libvirt_constcharPtrWrap(cred[i].prompt)); @@ -1969,17 +1968,15 @@ virConnectCredCallbackWrapper(virConnectCredentialPtr cred, PyList_SetItem(pycreditem, 2, libvirt_constcharPtrWrap(cred[i].challenge)); } else { - Py_INCREF(Py_None); - PyList_SetItem(pycreditem, 2, Py_None); + PyList_SetItem(pycreditem, 2, VIR_PY_NONE); } if (cred[i].defresult) { PyList_SetItem(pycreditem, 3, libvirt_constcharPtrWrap(cred[i].defresult)); } else { - Py_INCREF(Py_None); - PyList_SetItem(pycreditem, 3, Py_None); + PyList_SetItem(pycreditem, 3, VIR_PY_NONE); } - PyList_SetItem(pycreditem, 4, Py_None); + PyList_SetItem(pycreditem, 4, VIR_PY_NONE); } PyTuple_SetItem(list, 0, pycred); diff --git a/typewrappers.c b/typewrappers.c index 77bdeef..a9561dd 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -97,8 +97,7 @@ libvirt_charPtrSizeWrap(char *str, Py_ssize_t size) PyObject *ret; if (str == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } #if PY_MAJOR_VERSION > 2 ret = PyBytes_FromStringAndSize(str, size); @@ -114,8 +113,7 @@ libvirt_charPtrWrap(char *str) PyObject *ret; if (str == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } #if PY_MAJOR_VERSION > 2 ret = PyUnicode_FromString(str); @@ -131,8 +129,7 @@ libvirt_constcharPtrWrap(const char *str) PyObject *ret; if (str == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } #if PY_MAJOR_VERSION > 2 ret = PyUnicode_FromString(str); @@ -431,8 +428,7 @@ libvirt_virDomainPtrWrap(virDomainPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virDomainPtr", NULL); @@ -445,8 +441,7 @@ libvirt_virNetworkPtrWrap(virNetworkPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virNetworkPtr", NULL); @@ -459,8 +454,7 @@ libvirt_virInterfacePtrWrap(virInterfacePtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virInterfacePtr", NULL); @@ -473,8 +467,7 @@ libvirt_virStoragePoolPtrWrap(virStoragePoolPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virStoragePoolPtr", NULL); @@ -487,8 +480,7 @@ libvirt_virStorageVolPtrWrap(virStorageVolPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virStorageVolPtr", NULL); @@ -501,8 +493,7 @@ libvirt_virConnectPtrWrap(virConnectPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virConnectPtr", NULL); @@ -515,8 +506,7 @@ libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virNodeDevicePtr", NULL); @@ -529,8 +519,7 @@ libvirt_virSecretPtrWrap(virSecretPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virSecretPtr", NULL); @@ -543,8 +532,7 @@ libvirt_virNWFilterPtrWrap(virNWFilterPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virNWFilterPtr", NULL); @@ -557,8 +545,7 @@ libvirt_virStreamPtrWrap(virStreamPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virStreamPtr", NULL); @@ -571,8 +558,7 @@ libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virDomainSnapshotPtr", NULL); @@ -585,9 +571,8 @@ libvirt_virEventHandleCallbackWrap(virEventHandleCallback node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); printf("%s: WARNING - Wrapping None\n", __func__); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virEventHandleCallback", NULL); @@ -601,8 +586,7 @@ libvirt_virEventTimeoutCallbackWrap(virEventTimeoutCallback node) if (node == NULL) { printf("%s: WARNING - Wrapping None\n", __func__); - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virEventTimeoutCallback", NULL); @@ -615,8 +599,7 @@ libvirt_virFreeCallbackWrap(virFreeCallback node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "virFreeCallback", NULL); @@ -629,8 +612,7 @@ libvirt_virVoidPtrWrap(void* node) PyObject *ret; if (node == NULL) { - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } ret = libvirt_buildPyObject(node, "void*", NULL); |