summaryrefslogtreecommitdiffstats
path: root/generic/tkImage.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2005-11-17 16:21:55 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2005-11-17 16:21:55 (GMT)
commite80eb01a0079da5a6ad2d524d67b8c8bdfb4fb7e (patch)
treeb00bf059149c4ea5557da85bf93c22a9b3735ded /generic/tkImage.c
parentade22ba319d8ff4395c82135981cc073804ce97a (diff)
downloadtk-e80eb01a0079da5a6ad2d524d67b8c8bdfb4fb7e.zip
tk-e80eb01a0079da5a6ad2d524d67b8c8bdfb4fb7e.tar.gz
tk-e80eb01a0079da5a6ad2d524d67b8c8bdfb4fb7e.tar.bz2
ANSIfy and reduce casting of NULL to promote readability
Diffstat (limited to 'generic/tkImage.c')
-rw-r--r--generic/tkImage.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/generic/tkImage.c b/generic/tkImage.c
index 58a60de..0ae7046 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkImage.c,v 1.26 2005/11/17 10:57:35 dkf Exp $
+ * RCS: @(#) $Id: tkImage.c,v 1.27 2005/11/17 16:21:55 dkf Exp $
*/
#include "tkInt.h"
@@ -159,7 +159,7 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
{
static CONST char *imageOptions[] = {
"create", "delete", "height", "inuse", "names", "type", "types",
- "width", (char *) NULL
+ "width", NULL
};
enum options {
IMAGE_CREATE, IMAGE_DELETE, IMAGE_HEIGHT, IMAGE_INUSE, IMAGE_NAMES,
@@ -220,7 +220,7 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
}
if (typePtr == NULL) {
Tcl_AppendResult(interp, "image type \"", arg, "\" doesn't exist",
- (char *) NULL);
+ NULL);
return TCL_ERROR;
}
@@ -252,7 +252,7 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
topWin = (TkWindow *) TkToplevelWindowForCommand(interp, name);
if (topWin != NULL && winPtr->mainPtr->winPtr == topWin) {
Tcl_AppendResult(interp, "images may not be named the ",
- "same as the main window", (char *) NULL);
+ "same as the main window", NULL);
return TCL_ERROR;
}
}
@@ -436,7 +436,7 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
return TCL_OK;
alreadyDeleted:
- Tcl_AppendResult(interp, "image \"",arg,"\" doesn't exist", (char *) NULL);
+ Tcl_AppendResult(interp, "image \"", arg, "\" doesn't exist", NULL);
return TCL_ERROR;
}
@@ -574,8 +574,7 @@ Tk_GetImage(interp, tkwin, name, changeProc, clientData)
return (Tk_Image) imagePtr;
noSuchImage:
- Tcl_AppendResult(interp, "image \"", name, "\" doesn't exist",
- (char *) NULL);
+ Tcl_AppendResult(interp, "image \"", name, "\" doesn't exist", NULL);
return NULL;
}