Changeset 12

Timestamp:

Feb 13, 2009 2:07:09 PM (15 years ago)

Author:

hammonds

Message:

Code cleanup
Fix structure mistake for unpackTimeGet

File:

• caPython/ca_internal_functions.c (modified) (7 diffs)

caPython/ca_internal_functions.c

@@ -94 +94 @@
     func = PyTuple_GetItem(pyTup, 0);
     if (PyCallable_Check(func)) {
-/*        SWIG_MakePtr(_ptemp, (char *) &(connect_args.chid),
- *        "_chid_p");*/
         chidptr = SWIG_NewPointerObj( (void *) &(connect_args.chid),
         SWIGTYPE_p_chid, 0);
@@ -137 +135 @@
     
     /* Create a swigged pointer to the channel identifier */
-/*    SWIG_MakePtr(_ptemp, (char *) &(event_args.chid), "_chid_p"); */
-/*    _ptemp = SWIG_NewPointerObj((char *) &(event_args.chid),
-    SWIGTYPE_p_chid, 0);*/
     chidptr = SWIG_NewPointerObj((char *) &(event_args.chid),
     SWIGTYPE_p_chid, 0);
@@ -474 +469 @@
     PyObject *d=NULL, *t=NULL, *pyVal=NULL;
     int i;
-    
+ 
     if(1 == count) {
         switch(dbrType) {
@@ -605 +600 @@
                 /* case DBR_STRING: No arrays of strings in EPICS*/
                 case DBR_TIME_CHAR:
-                    pyVal = Py_BuildValue("b", (char)*(&(pBuf->gchrval.value) + i));
+                    pyVal = Py_BuildValue("b", (char)*(&(pBuf->tchrval.value) + i));
                     break;
                 case DBR_TIME_SHORT:
-                    pyVal = Py_BuildValue("h", (short)*(&(pBuf->gshrtval.value) + i));
+                    pyVal = Py_BuildValue("h", (short)*(&(pBuf->tshrtval.value) + i));
                     break;
                 case DBR_TIME_ENUM:
-                    pyVal = Py_BuildValue("h", (int)*(&(pBuf->genmval.value) +i));
+                    pyVal = Py_BuildValue("h", (int)*(&(pBuf->tenmval.value) +i));
                     break;
                 case DBR_TIME_LONG:
-                    pyVal = Py_BuildValue("i", (long)*(&(pBuf->glngval.value) + i));
+                    pyVal = Py_BuildValue("i", (long)*(&(pBuf->tlngval.value) + i));
                     break;
                 case DBR_TIME_FLOAT:
-                    pyVal = Py_BuildValue("f", (float)*(&(pBuf->gfltval.value) + i));
+                    pyVal = Py_BuildValue("f", (float)*(&(pBuf->tfltval.value) + i));
                     break;
                 case DBR_TIME_DOUBLE:
-                    pyVal = Py_BuildValue("d", (double)*(&(pBuf->gdblval.value) + i));
+                    pyVal = Py_BuildValue("d", (double)*(&(pBuf->tdblval.value) + i));
                 break;
             } /* end switch */
@@ -1079 +1074 @@
                     break;
                 case DBR_CTRL_FLOAT:
-                    pyVal = Py_BuildValue("d", (float)*(&(pBuf->cfltval.value) + i));
+                    pyVal = Py_BuildValue("f", (float)*(&(pBuf->cfltval.value) + i));
                     break;
                 case DBR_CTRL_DOUBLE:
@@ -1135 +1130 @@
     }
 
-/*    SWIG_MakePtr(_ptemp, (char *) &(event_args.chid), "_chid_p");*/
     chidptr = SWIG_NewPointerObj((char *) &(event_args.chid),
     SWIGTYPE_p_chid, 0);
@@ -1207 +1201 @@
 
     /* Create a swigged pointer to the channel identifier */
-/*    SWIG_MakePtr(_ptemp, (char *) &(event_args.chid), "_chid_p");*/
     chidptr = SWIG_NewPointerObj((char *) &(event_args.chid),
     SWIGTYPE_p_chid, 0);