Changeset 71

Timestamp:

Jul 20, 2009 4:25:09 PM (14 years ago)

Author:

hammonds

Message:

Fix some typing issues
Fix memory leaks in the callbacks.

File:

• caPython/branches/newPointers/ca_internal_functions.c (modified) (6 diffs)

caPython/branches/newPointers/ca_internal_functions.c

@@ -258 +258 @@
                 break;
             case DBR_CHAR:
-                d = Py_BuildValue("b",  (int)pBuf->charval);
+                d = Py_BuildValue("b",  (char)pBuf->charval);
                 break;
             /* case DBR_SHORT: = DBR_INT */
@@ -286 +286 @@
                 /* case DBR_STRING: No arrays of strings in EPICS*/
                 case DBR_CHAR:
-                    pyVal = Py_BuildValue("b", (int)*(&(pBuf->charval) + i));
+                    pyVal = Py_BuildValue("b", (char)*(&(pBuf->charval) + i));
                     break;
                 /* case DBR_SHORT: = DBR_INT */
@@ -309 +309 @@
         /*d = Py_BuildValue("{s:O}", PV_VALUE, t);*/
         d = t;
-/*      Py_XDECREF(t); */ /* dictionary now references the tuple */
+        /*Py_XINCREF(d);
+        Py_XDECREF(t);*/  /* dictionary now references the tuple */
+          /*Py_XDECREF(pyVal);*/
     } /* end else */
     return d;
@@ -1115 +1117 @@
             s = unpackPlainGet(pBuf, event_args.type, event_args.count);
             d = Py_BuildValue( "{s:O}", PV_VALUE, s);
+            Py_XDECREF(s);
         }
         else if(dbr_type_is_STS(event_args.type)) {
@@ -1186 +1189 @@
             s = unpackPlainGet(pBuf, event_args.type, event_args.count);
             d = Py_BuildValue( "{s:O}", PV_VALUE, s);
+            Py_XDECREF(s);
         }
         else if(dbr_type_is_STS(event_args.type)) {
@@ -1203 +1207 @@
     }
 
-    /* Create a swigged pointer to the channel identifier */
+          /* Create a swigged pointer to the channel identifier */
     chidptr = SWIG_NewPointerObj((chid *) &(event_args.chid),
     SWIGTYPE_p_chid, 0);