Changeset 932

Timestamp:

Apr 22, 2018, 12:26:15 PM (10 months ago)

Author:

cito

Message:

Alternative workaround for Python 3.7 issue

File:

• trunk/pgmodule.c (modified) (5 diffs)

trunk/pgmodule.c

@@ -2225 +2225 @@
                 /* prepare arguments */
                 PyObject        **str, **s;
-                char            **parms, **p;
+                const char      **parms, **p;
                 register int i;
 
                 str = (PyObject **)PyMem_Malloc(nparms * sizeof(*str));
-                parms = (char **)PyMem_Malloc(nparms * sizeof(*parms));
+                parms = (const char **)PyMem_Malloc(nparms * sizeof(*parms));
                 if (!str || !parms)
                 {
-                        PyMem_Free(parms); PyMem_Free(str);
+                        PyMem_Free((void *)parms); PyMem_Free(str);
                         Py_XDECREF(query_obj); Py_XDECREF(param_obj);
                         return PyErr_NoMemory();
@@ -2257 +2257 @@
                                 if (!str_obj)
                                 {
-                                        PyMem_Free(parms);
+                                        PyMem_Free((void *)parms);
                                         while (s != str) { s--; Py_DECREF(*s); }
                                         PyMem_Free(str);
@@ -2273 +2273 @@
                                 if (!str_obj)
                                 {
-                                        PyMem_Free(parms);
+                                        PyMem_Free((void *)parms);
                                         while (s != str) { s--; Py_DECREF(*s); }
                                         PyMem_Free(str);
@@ -2283 +2283 @@
                                 }
                                 *s++ = str_obj;
-                                *p = (char *)PyStr_AsString(str_obj);
+                                *p = PyStr_AsString(str_obj);
                         }
                 }
@@ -2289 +2289 @@
                 Py_BEGIN_ALLOW_THREADS
                 result = PQexecParams(self->cnx, query, nparms,
-                        NULL, (const char * const *)parms, NULL, NULL, 0);
+                        NULL, parms, NULL, NULL, 0);
                 Py_END_ALLOW_THREADS
 
-                PyMem_Free(parms);
+                PyMem_Free((void *)parms);
                 while (s != str) { s--; Py_DECREF(*s); }
                 PyMem_Free(str);