X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fbase%2Fnconfig.cpp;h=106558ac1e649f883263a7a783b1ee4ad00e8ec8;hp=562b3503c838d5704e12179611ef7598c31dfb4a;hb=fe619dbed1c9bf14a0d442cc16d7e968769bbcc0;hpb=56e40b4b0f436dc7d9214fd3a96a621c15bd9f10 diff --git a/lib/base/nconfig.cpp b/lib/base/nconfig.cpp index 562b350..106558a 100644 --- a/lib/base/nconfig.cpp +++ b/lib/base/nconfig.cpp @@ -1,9 +1,9 @@ #include -#include +#include -PyObject *ePythonConfigQuery::m_queryFunc; +ePyObject ePythonConfigQuery::m_queryFunc; -void ePythonConfigQuery::setQueryFunc(PyObject *queryFunc) +void ePythonConfigQuery::setQueryFunc(ePyObject queryFunc) { if (m_queryFunc) Py_DECREF(m_queryFunc); @@ -16,15 +16,16 @@ RESULT ePythonConfigQuery::getConfigValue(const char *key, std::string &value) { if (key && PyCallable_Check(m_queryFunc)) { - PyObject *pArgs = PyTuple_New(1); + ePyObject pArgs = PyTuple_New(1); PyTuple_SET_ITEM(pArgs, 0, PyString_FromString(key)); - PyObject *pRet = PyObject_CallObject(m_queryFunc, pArgs); + ePyObject pRet = PyObject_CallObject(m_queryFunc, pArgs); Py_DECREF(pArgs); if (pRet) { if (PyString_Check(pRet)) { value.assign(PyString_AS_STRING(pRet)); + Py_DECREF(pRet); return 0; } Py_DECREF(pRet);