tclpathplan.c: remove open coded NULL, excess bracketing and casts

diff --git a/tclpkg/tclpathplan/tclpathplan.c b/tclpkg/tclpathplan/tclpathplan.c
index edcfbe4971e42ae8f1e999fe1ac433d9b9f95b53..80dab6d7995d1011633329b859d098157f8406bd 100644 (file)
--- a/tclpkg/tclpathplan/tclpathplan.c
+++ b/tclpkg/tclpathplan/tclpathplan.c
@@ -97,7 +97,7 @@ static void vc_stale(vgpane_t * vgp)
 {
     if (vgp->vc) {
        Pobsclose(vgp->vc);
-       vgp->vc = (vconfig_t *) 0;
+       vgp->vc = NULL;
     }
 }
 
@@ -106,7 +106,7 @@ static int vc_refresh(vgpane_t * vgp)
     int i;
     Ppoly_t **obs;
 
-    if (vgp->vc == (vconfig_t *) 0) {
+    if (vgp->vc == NULL) {
        obs = malloc(vgp->Npoly * sizeof(Ppoly_t));
        for (i = 0; i < vgp->Npoly; i++)
            obs[i] = &(vgp->poly[i].boundary);
@@ -116,7 +116,7 @@ static int vc_refresh(vgpane_t * vgp)
            vgp->vc = Pobsopen(obs, vgp->Npoly);
        free(obs);
     }
-    return (vgp->vc != 0);
+    return vgp->vc != NULL;
 }
 
 static void dgsprintxy(Tcl_DString * result, int npts, point p[])
@@ -153,7 +153,7 @@ static void expandPercentsEval(Tcl_Interp * interp, /* interpreter context */
         * result string.
         */
 
-       for (string = before; (*string != 0) && (*string != '%'); string++) {
+       for (string = before; *string != '\0' && *string != '%'; string++) {
            /* Empty loop body. */
        }
        if (string != before) {
@@ -230,7 +230,7 @@ static char *buildBindings(char *s1, char *s2)
                s3 = malloc(l + 2);
                strcpy(s3, s2 + 1);
            } else {
-               s3 = (char *) NULL;
+               s3 = NULL;
            }
        }
     } else {
@@ -240,7 +240,7 @@ static char *buildBindings(char *s1, char *s2)
            s3 = malloc(l + 2);
            strcpy(s3, s2);
        } else {
-           s3 = (char *) NULL;
+           s3 = NULL;
        }
     }
     return s3;
@@ -252,13 +252,11 @@ static char *buildBindings(char *s1, char *s2)
 static int scanpoint(Tcl_Interp * interp, char *argv[], point * p)
 {
     if (sscanf(argv[0], "%lg", &(p->x)) != 1) {
-       Tcl_AppendResult(interp, "invalid x coordinate: \"", argv[0],
-                        "\"", (char *) NULL);
+       Tcl_AppendResult(interp, "invalid x coordinate: \"", argv[0], "\"", NULL);
        return TCL_ERROR;
     }
     if (sscanf(argv[1], "%lg", &(p->y)) != 1) {
-       Tcl_AppendResult(interp, "invalid y coordinate: \"", argv[1],
-                        "\"", (char *) NULL);
+       Tcl_AppendResult(interp, "invalid y coordinate: \"", argv[1], "\"", NULL);
        return TCL_ERROR;
     }
     return TCL_OK;
@@ -415,13 +413,11 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
 
     if (argc < 2) {
        Tcl_AppendResult(interp, "wrong # args: should be \"",
-                        " ", argv[0], " method ?arg arg ...?\"",
-                        (char *) NULL);
+                        " ", argv[0], " method ?arg arg ...?\"", NULL);
        return TCL_ERROR;
     }
     if (!(vgpp = (vgpane_t **) tclhandleXlate(vgpaneTable, argv[0]))) {
-       Tcl_AppendResult(interp, "Invalid handle: \"", argv[0],
-                        "\"", (char *) NULL);
+       Tcl_AppendResult(interp, "Invalid handle: \"", argv[0], "\"", NULL);
        return TCL_ERROR;
     }
     vgp = *vgpp;
@@ -429,15 +425,13 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
     size_t length = strlen(argv[1]);
 
     if (strncmp(argv[1], "coords", length) == 0) {
-       if ((argc < 3)) {
+       if (argc < 3) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " id ?x1 y1 x2 y2...?\"",
-                            (char *) NULL);
+                            " ", argv[1], " id ?x1 y1 x2 y2...?\"", NULL);
            return TCL_ERROR;
        }
        if (sscanf(argv[2], "%d", &polyid) != 1) {
-           Tcl_AppendResult(interp, "not an integer: ", argv[2],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not an integer: ", argv[2], NULL);
            return TCL_ERROR;
        }
        if (argc == 3) {
@@ -451,8 +445,7 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
                    return TCL_OK;
                }
            }
-           Tcl_AppendResult(interp, " no such polygon: ", argv[2],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, " no such polygon: ", argv[2], NULL);
            return TCL_ERROR;
        }
        /* accept either inline or delimited list */
@@ -469,21 +462,19 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
        }
        if (!vargc || vargc % 2) {
            Tcl_AppendResult(interp,
-                            "There must be a multiple of two terms in the list.",
-                            (char *) NULL);
+                            "There must be a multiple of two terms in the list.", NULL);
            return TCL_ERROR;
        }
 
        /* remove old poly, add modified polygon to the end with 
           the same id as the original */
 
-       if (!(remove_poly(vgp, polyid))) {
-           Tcl_AppendResult(interp, " no such polygon: ", argv[2],
-                            (char *) NULL);
+       if (!remove_poly(vgp, polyid)) {
+           Tcl_AppendResult(interp, " no such polygon: ", argv[2], NULL);
            return TCL_ERROR;
        }
 
-       return (insert_poly(interp, vgp, polyid, vargv, vargc));
+       return insert_poly(interp, vgp, polyid, vargv, vargc);
 
     } else if (strncmp(argv[1], "debug", length) == 0) {
        /* debug only */
@@ -502,9 +493,9 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
     } else if (strncmp(argv[1], "find", length) == 0) {
        /* find the polygon that the point is inside and return it
           id, or null */
-       if ((argc < 3)) {
+       if (argc < 3) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " x y\"", (char *) NULL);
+                            " ", argv[1], " x y\"", NULL);
            return TCL_ERROR;
        }
        if (argc == 3) {
@@ -536,8 +527,7 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
           the point list */
        if ((argc < 3)) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " x1 y1 x2 y2 ...\"",
-                            (char *) NULL);
+                            " ", argv[1], " x1 y1 x2 y2 ...\"", NULL);
            return TCL_ERROR;
        }
        /* accept either inline or delimited list */
@@ -555,8 +545,7 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
 
        if (!vargc || vargc % 2) {
            Tcl_AppendResult(interp,
-                            "There must be a multiple of two terms in the list.",
-                            (char *) NULL);
+                            "There must be a multiple of two terms in the list.", NULL);
            return TCL_ERROR;
        }
 
@@ -567,7 +556,7 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
            return result;
 
        snprintf(vbuf, sizeof(vbuf), "%d", polyid);
-       Tcl_AppendResult(interp, vbuf, (char *) NULL);
+       Tcl_AppendResult(interp, vbuf, NULL);
        return TCL_OK;
 
     } else if (strncmp(argv[1], "list", length) == 0) {
@@ -581,10 +570,9 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
     } else if (strncmp(argv[1], "path", length) == 0) {
        /* return a list of points corresponding to the shortest path
           that does not cross the remaining "visible" polygons. */
-       if ((argc < 3)) {
+       if (argc < 3) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " x1 y1 x2 y2\"",
-                            (char *) NULL);
+                            " ", argv[1], " x1 y1 x2 y2\"", NULL);
            return TCL_ERROR;
        }
        if (argc == 3) {
@@ -598,10 +586,9 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
            vargc = argc - 2;
            vargv = &argv[2];
        }
-       if ((vargc < 4)) {
+       if (vargc < 4) {
            Tcl_AppendResult(interp,
-                            "invalid points: should be: \"x1 y1 x2 y2\"",
-                            (char *) NULL);
+                            "invalid points: should be: \"x1 y1 x2 y2\"", NULL);
            return TCL_ERROR;
        }
        result = scanpoint(interp, &vargv[0], &p);
@@ -612,7 +599,7 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
            return result;
 
        /* only recompute the visibility graph if we have to */
-       if ((vc_refresh(vgp))) {
+       if (vc_refresh(vgp)) {
            Pobspath(vgp->vc, p, POLYID_UNKNOWN, q, POLYID_UNKNOWN, &line);
 
            for (i = 0; i < line.pn; i++) {
@@ -623,10 +610,9 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
        return TCL_OK;
 
     } else if (strncmp(argv[1], "bind", length) == 0) {
-       if ((argc < 2) || (argc > 4)) {
+       if (argc < 2 || argc > 4) {
            Tcl_AppendResult(interp, "wrong # args: should be \"",
-                            argv[0], " bind triangle ?command?\"",
-                            (char *) NULL);
+                            argv[0], " bind triangle ?command?\"", NULL);
            return TCL_ERROR;
        }
        if (argc == 2) {
@@ -640,21 +626,19 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
                vgp->triangle_cmd = s = buildBindings(s, argv[3]);
        } else {
            Tcl_AppendResult(interp, "unknown event \"", argv[2],
-                            "\": must be one of:\n\ttriangle.",
-                            (char *) NULL);
+                            "\": must be one of:\n\ttriangle.", NULL);
            return TCL_ERROR;
        }
        if (argc == 3)
-           Tcl_AppendResult(interp, s, (char *) NULL);
+           Tcl_AppendResult(interp, s, NULL);
        return TCL_OK;
 
     } else if (strncmp(argv[1], "bpath", length) == 0) {
        /* return a list of points corresponding to the shortest path
           that does not cross the remaining "visible" polygons. */
-       if ((argc < 3)) {
+       if (argc < 3) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " x1 y1 x2 y2\"",
-                            (char *) NULL);
+                            " ", argv[1], " x1 y1 x2 y2\"", NULL);
            return TCL_ERROR;
        }
        if (argc == 3) {
@@ -670,8 +654,7 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
        }
        if ((vargc < 4)) {
            Tcl_AppendResult(interp,
-                            "invalid points: should be: \"x1 y1 x2 y2\"",
-                            (char *) NULL);
+                            "invalid points: should be: \"x1 y1 x2 y2\"", NULL);
            return TCL_ERROR;
        }
 
@@ -706,14 +689,13 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
        return TCL_OK;
 
     } else if (strncmp(argv[1], "bbox", length) == 0) {
-       if ((argc < 3)) {
+       if (argc < 3) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " id\"", (char *) NULL);
+                            " ", argv[1], " id\"", NULL);
            return TCL_ERROR;
        }
        if (sscanf(argv[2], "%d", &polyid) != 1) {
-           Tcl_AppendResult(interp, "not an integer: ", argv[2],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not an integer: ", argv[2], NULL);
            return TCL_ERROR;
        }
        for (i = 0; i < vgp->Npoly; i++) {
@@ -737,19 +719,17 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
                return TCL_OK;
            }
        }
-       Tcl_AppendResult(interp, " no such polygon: ", argv[2],
-                        (char *) NULL);
+       Tcl_AppendResult(interp, " no such polygon: ", argv[2], NULL);
        return TCL_ERROR;
 
     } else if (strncmp(argv[1], "center", length) == 0) {
-       if ((argc < 3)) {
+       if (argc < 3) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " id\"", (char *) NULL);
+                            " ", argv[1], " id\"", NULL);
            return TCL_ERROR;
        }
        if (sscanf(argv[2], "%d", &polyid) != 1) {
-           Tcl_AppendResult(interp, "not an integer: ", argv[2],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not an integer: ", argv[2], NULL);
            return TCL_ERROR;
        }
        for (i = 0; i < vgp->Npoly; i++) {
@@ -759,20 +739,18 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
                return TCL_OK;
            }
        }
-       Tcl_AppendResult(interp, " no such polygon: ", argv[2],
-                        (char *) NULL);
+       Tcl_AppendResult(interp, " no such polygon: ", argv[2], NULL);
        return TCL_ERROR;
 
     } else if (strncmp(argv[1], "triangulate", length) == 0) {
-       if ((argc < 2)) {
+       if (argc < 2) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " id ", (char *) NULL);
+                            " id ", NULL);
            return TCL_ERROR;
        }
 
        if (sscanf(argv[2], "%d", &polyid) != 1) {
-           Tcl_AppendResult(interp, "not an integer: ", argv[2],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not an integer: ", argv[2], NULL);
            return TCL_ERROR;
        }
 
@@ -783,23 +761,20 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
                return TCL_OK;
            }
        }
-       Tcl_AppendResult(interp, " no such polygon: ", argv[2],
-                        (char *) NULL);
+       Tcl_AppendResult(interp, " no such polygon: ", argv[2], NULL);
        return TCL_ERROR;
     } else if (strncmp(argv[1], "rotate", length) == 0) {
-       if ((argc < 4)) {
+       if (argc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " id alpha\"", (char *) NULL);
+                            " ", argv[1], " id alpha\"", NULL);
            return TCL_ERROR;
        }
        if (sscanf(argv[2], "%d", &polyid) != 1) {
-           Tcl_AppendResult(interp, "not an integer: ", argv[2],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not an integer: ", argv[2], NULL);
            return TCL_ERROR;
        }
        if (sscanf(argv[3], "%lg", &alpha) != 1) {
-           Tcl_AppendResult(interp, "not an angle in radians: ", argv[3],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not an angle in radians: ", argv[3], NULL);
            return TCL_ERROR;
        }
        for (i = 0; i < vgp->Npoly; i++) {
@@ -813,24 +788,21 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
                return TCL_OK;
            }
        }
-       Tcl_AppendResult(interp, " no such polygon: ", argv[2],
-                        (char *) NULL);
+       Tcl_AppendResult(interp, " no such polygon: ", argv[2], NULL);
        return TCL_ERROR;
 
     } else if (strncmp(argv[1], "scale", length) == 0) {
-       if ((argc < 4)) {
+       if (argc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " id gain\"", (char *) NULL);
+                            " ", argv[1], " id gain\"", NULL);
            return TCL_ERROR;
        }
        if (sscanf(argv[2], "%d", &polyid) != 1) {
-           Tcl_AppendResult(interp, "not an integer: ", argv[2],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not an integer: ", argv[2], NULL);
            return TCL_ERROR;
        }
        if (sscanf(argv[3], "%lg", &gain) != 1) {
-           Tcl_AppendResult(interp, "not a number: ", argv[3],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not a number: ", argv[3], NULL);
            return TCL_ERROR;
        }
        for (i = 0; i < vgp->Npoly; i++) {
@@ -843,35 +815,31 @@ vgpanecmd(ClientData clientData, Tcl_Interp * interp, int argc,
                return TCL_OK;
            }
        }
-       Tcl_AppendResult(interp, " no such polygon: ", argv[2],
-                        (char *) NULL);
+       Tcl_AppendResult(interp, " no such polygon: ", argv[2], NULL);
        return TCL_ERROR;
 
     } else if (strncmp(argv[1], "remove", length) == 0) {
-       if ((argc < 3)) {
+       if (argc < 3) {
            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                            " ", argv[1], " id\"", (char *) NULL);
+                            " ", argv[1], " id\"", NULL);
            return TCL_ERROR;
        }
        if (sscanf(argv[2], "%d", &polyid) != 1) {
-           Tcl_AppendResult(interp, "not an integer: ", argv[2],
-                            (char *) NULL);
+           Tcl_AppendResult(interp, "not an integer: ", argv[2], NULL);
            return TCL_ERROR;
        }
 
        if (remove_poly(vgp, polyid))
            return TCL_OK;
 
-       Tcl_AppendResult(interp, " no such polygon: ", argv[2],
-                        (char *) NULL);
+       Tcl_AppendResult(interp, " no such polygon: ", argv[2], NULL);
        return TCL_ERROR;
     }
 
     Tcl_AppendResult(interp, "bad method \"", argv[1],
                     "\" must be one of:",
                     "\n\tbbox, bind, bpath, center, coords, delete, find,",
-                    "\n\tinsert, list, path, remove, rotate, scale, triangulate.",
-                    (char *) NULL);
+                    "\n\tinsert, list, path, remove, rotate, scale, triangulate.", NULL);
     return TCL_ERROR;
 }
 
@@ -884,16 +852,15 @@ vgpane(ClientData clientData, Tcl_Interp * interp, int argc, char *argv[])
     vgp = malloc(sizeof(vgpane_t));
     *(vgpane_t **) tclhandleAlloc(vgpaneTable, vbuf, NULL) = vgp;
 
-    vgp->vc = (vconfig_t *) 0;
+    vgp->vc = NULL;
     vgp->Npoly = 0;
     vgp->N_poly_alloc = 250;
     vgp->poly = malloc(vgp->N_poly_alloc * sizeof(poly));
     vgp->interp = interp;
-    vgp->triangle_cmd = (char *) NULL;
+    vgp->triangle_cmd = NULL;
 
-    Tcl_CreateCommand(interp, vbuf, vgpanecmd,
-                     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_AppendResult(interp, vbuf, (char *) NULL);
+    Tcl_CreateCommand(interp, vbuf, vgpanecmd, (ClientData)NULL, NULL);
+    Tcl_AppendResult(interp, vbuf, NULL);
     return TCL_OK;
 }
 
@@ -912,8 +879,7 @@ int Tclpathplan_Init(Tcl_Interp * interp)
        return TCL_ERROR;
     }
 
-    Tcl_CreateCommand(interp, "vgpane", vgpane,
-                     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateCommand(interp, "vgpane", vgpane, (ClientData)NULL, NULL);
 
     vgpaneTable = tclhandleInit("vgpane", sizeof(vgpane_t), 10);