Changeset 217 for branches/branch-1.2/zoo-kernel/service_internal_python.c

Timestamp:

May 31, 2011, 3:30:49 AM (13 years ago)

Author:

djay

Message:

Merge trunk r111:r216 into branch-1.2

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-kernel/service_internal_python.c (modified) (4 diffs)

branches/branch-1.2/zoo-kernel/service_internal_python.c

@@ -86 +86 @@
   }
   pModule = PyImport_Import(pName);
-  int i;
   int res=SERVICE_FAILED;
-  int cpid=getpid();
   if (pModule != NULL) {
     pFunc=PyObject_GetAttrString(pModule,s->name);
     if (pFunc && PyCallable_Check(pFunc)){
+      PyObject *pValue;
       PyDictObject* arg1=PyDict_FromMaps(m);
       PyDictObject* arg2=PyDict_FromMaps(inputs);
       PyDictObject* arg3=PyDict_FromMaps(outputs);
       PyObject *pArgs=PyTuple_New(3);
-      PyObject *pValue;
+      if (!pArgs)
+        return -1;
       PyTuple_SetItem(pArgs, 0, (PyObject *)arg1);
       PyTuple_SetItem(pArgs, 1, (PyObject *)arg2);
@@ -130 +130 @@
         PyErr_Fetch(&ptype, &pvalue, &ptraceback);
         PyObject *trace=PyObject_Str(pvalue);
-        char tb[1024];
         char pbt[10240];
         if(PyString_Check(trace))
@@ -145 +144 @@
         else
           fprintf(stderr,"EMPTY TRACE ?");
-        PyObject *t;
         pName = PyString_FromString("traceback");
         pModule = PyImport_Import(pName);
@@ -302 +300 @@
   int nb=PyList_Size(list);
   int i;
-  int sizeValue=-1;
   for(i=0;i<nb;i++){
     PyObject* key=PyList_GetItem(list,i);