Fixes to compile with Clang 2.8 (tested on Ubuntu 11.04)

mdboom · mdboom · commit edba4fc6d641 · 2011-08-25T09:46:44.000-04:00
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -1578,19 +1578,19 @@ _path_module::convert_to_svg(const Py::Tuple& args)
         #if PY_VERSION_HEX >= 0x02070000
         char* str;
         str = PyOS_double_to_string(x, 'g', precision, 0, NULL);
-        p += snprintf(p, buffersize - (p - buffer), str);
+        p += snprintf(p, buffersize - (p - buffer), "%s", str);
         PyMem_Free(str);
         *p++ = ' ';
         str = PyOS_double_to_string(y, 'g', precision, 0, NULL);
-        p += snprintf(p, buffersize - (p - buffer), str);
+        p += snprintf(p, buffersize - (p - buffer), "%s", str);
         PyMem_Free(str);
         #else
         char str[64];
         PyOS_ascii_formatd(str, 64, format, x);
-        p += snprintf(p, buffersize - (p - buffer), str);
+        p += snprintf(p, buffersize - (p - buffer), "%s", str);
         *p++ = ' ';
         PyOS_ascii_formatd(str, 64, format, y);
-        p += snprintf(p, buffersize - (p - buffer), str);
+        p += snprintf(p, buffersize - (p - buffer), "%s", str);
         #endif
 
         --wait;
diff --git a/src/cntr.c b/src/cntr.c
@@ -1366,8 +1366,8 @@ int reorder(double *xpp, double *ypp, short *kpp,
     int maxnsegs = npts/2 + 1;
 
     /* allocate maximum possible size--gross overkill */
-    i0 = malloc(maxnsegs * sizeof(int));
-    i1 = malloc(maxnsegs * sizeof(int));
+    i0 = (int *)malloc(maxnsegs * sizeof(int));
+    i1 = (int *)malloc(maxnsegs * sizeof(int));
 
     /* Find the segments. */
     iseg = 0;
@@ -1400,7 +1400,7 @@ int reorder(double *xpp, double *ypp, short *kpp,
 
     /* Find the subpaths as sets of connected segments. */
 
-    subp = malloc(nsegs * sizeof(int));
+    subp = (int *)malloc(nsegs * sizeof(int));
     for (i=0; i<nsegs; i++) subp[i] = -1;
 
     nsp = 0;
@@ -1776,15 +1776,15 @@ Cntr_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 static int
 Cntr_init(Cntr *self, PyObject *args, PyObject *kwds)
 {
-    static char *kwlist[] = {"x", "y", "z", "mask", NULL};
+    static const char *kwlist[] = {"x", "y", "z", "mask", NULL};
     PyObject *xarg, *yarg, *zarg, *marg;
     PyArrayObject *xpa, *ypa, *zpa, *mpa;
     long iMax, jMax;
     char *mask;
 
     marg = NULL;
 
-    if (! PyArg_ParseTupleAndKeywords(args, kwds, "OOO|O", kwlist,
+    if (! PyArg_ParseTupleAndKeywords(args, kwds, "OOO|O", (char **)kwlist,
                                       &xarg, &yarg, &zarg, &marg))
         return -1;
     if (marg == Py_None)
@@ -1858,9 +1858,9 @@ Cntr_trace(Cntr *self, PyObject *args, PyObject *kwds)
     double levels[2] = {0.0, -1e100};
     int nlevels = 2;
     long nchunk = 0L;
-    static char *kwlist[] = {"level0", "level1",  "nchunk", NULL};
+    static const char *kwlist[] = {"level0", "level1",  "nchunk", NULL};
 
-    if (! PyArg_ParseTupleAndKeywords(args, kwds, "d|dl", kwlist,
+    if (! PyArg_ParseTupleAndKeywords(args, kwds, "d|dl", (char **)kwlist,
                                       levels, levels+1, &nchunk))
     {
         return NULL;
