diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2005-08-11 12:17:08 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2005-08-11 12:17:08 (GMT) |
| commit | caf3d7dc0594cd7f8e917757cbd49c931414ef18 (patch) | |
| tree | 6628dcb4bda2551aaf3158b37e00d36264d17744 /generic/tkCanvas.c | |
| parent | 0c1c0c2dc87d2fb75c61c730f4064440a0f99ecc (diff) | |
| download | tk-caf3d7dc0594cd7f8e917757cbd49c931414ef18.zip tk-caf3d7dc0594cd7f8e917757cbd49c931414ef18.tar.gz tk-caf3d7dc0594cd7f8e917757cbd49c931414ef18.tar.bz2 | |
Fix [Bug 1252702]
Diffstat (limited to 'generic/tkCanvas.c')
| -rw-r--r-- | generic/tkCanvas.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 22625ff..9c29edb 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvas.c,v 1.21.2.2 2005/06/21 17:29:16 dgp Exp $ + * RCS: @(#) $Id: tkCanvas.c,v 1.21.2.3 2005/08/11 12:17:09 dkf Exp $ */ /* #define USE_OLD_TAG_SEARCH 1 */ @@ -521,8 +521,7 @@ CanvasWidgetCmd(clientData, interp, objc, objv) Tcl_Obj *CONST objv[]; /* Argument objects. */ { TkCanvas *canvasPtr = (TkCanvas *) clientData; - unsigned int length; - int c, result; + int c, length, result; Tk_Item *itemPtr = NULL; /* Initialization needed only to * prevent compiler warning. */ #ifdef USE_OLD_TAG_SEARCH @@ -933,12 +932,12 @@ CanvasWidgetCmd(clientData, interp, objc, objv) result = TCL_ERROR; goto done; } - arg = Tcl_GetStringFromObj(objv[2], (int *) &length); + arg = Tcl_GetStringFromObj(objv[2], &length); c = arg[0]; Tcl_MutexLock(&typeListMutex); for (typePtr = typeList; typePtr != NULL; typePtr = typePtr->nextPtr) { if ((c == typePtr->name[0]) - && (strncmp(arg, typePtr->name, length) == 0)) { + && (strncmp(arg, typePtr->name, (unsigned) length) == 0)) { if (matchPtr != NULL) { Tcl_MutexUnlock(&typeListMutex); badType: @@ -5571,7 +5570,7 @@ GetStringsFromObjs(argc, objv) } argv = (CONST char **) ckalloc((argc+1) * sizeof(char *)); for (i = 0; i < argc; i++) { - argv[i]=Tcl_GetStringFromObj(objv[i], (int *) NULL); + argv[i] = Tcl_GetStringFromObj(objv[i], NULL); } argv[argc] = 0; return argv; |