{
if (vgp->vc) {
Pobsclose(vgp->vc);
- vgp->vc = (vconfig_t *) 0;
+ vgp->vc = NULL;
}
}
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);
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[])
* result string.
*/
- for (string = before; (*string != 0) && (*string != '%'); string++) {
+ for (string = before; *string != '\0' && *string != '%'; string++) {
/* Empty loop body. */
}
if (string != before) {
s3 = malloc(l + 2);
strcpy(s3, s2 + 1);
} else {
- s3 = (char *) NULL;
+ s3 = NULL;
}
}
} else {
s3 = malloc(l + 2);
strcpy(s3, s2);
} else {
- s3 = (char *) NULL;
+ s3 = NULL;
}
}
return s3;
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;
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;
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) {
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 */
}
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 */
} 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) {
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 */
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;
}
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) {
} 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) {
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);
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++) {
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) {
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) {
}
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;
}
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++) {
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++) {
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;
}
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++) {
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++) {
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;
}
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;
}
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);