fixed, c++11 compiler warnings

xbmc · Sep 8, 2015 · 95e6801 · LS80 · Sep 23, 2015 · 95e6801
1 parent 7a85f35
commit 95e6801
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp
@@ -196,18 +196,29 @@ namespace PythonBindings
       PyObject *tracebackModule = PyImport_ImportModule("traceback");
       if (tracebackModule != NULL)
       {
-        PyObject *tbList = PyObject_CallMethod(tracebackModule, "format_exception", "OOO", exc_type, exc_value == NULL ? Py_None : exc_value, exc_traceback == NULL ? Py_None : exc_traceback);
-        PyObject *emptyString = PyString_FromString("");
-        PyObject *strRetval = PyObject_CallMethod(emptyString, "join", "O", tbList);
-
-        str = PyString_AsString(strRetval);
-        if (str != NULL)
-          exceptionTraceback = str;
-
-        Py_DECREF(tbList);
-        Py_DECREF(emptyString);
-        Py_DECREF(strRetval);
+        char format_exception[] = "format_exception";
+        char zeros[] = "000";
+        PyObject *tbList = PyObject_CallMethod(tracebackModule, format_exception, zeros, exc_type, exc_value == NULL ? Py_None : exc_value, exc_traceback == NULL ? Py_None : exc_traceback);
+
+        if (tbList)
+        {
+          PyObject *emptyString = PyString_FromString("");
+          char join[] = "join";
+          char zero[] = "O";
+          PyObject *strRetval = PyObject_CallMethod(emptyString, join, zero, tbList);
+          Py_DECREF(emptyString);
+
+          if (strRetval)
+          {
+            str = PyString_AsString(strRetval);
+            if (str != NULL)
+              exceptionTraceback = str;
+            Py_DECREF(strRetval);
+          }
+          Py_DECREF(tbList);
+        }
         Py_DECREF(tracebackModule);
+
       }
     }