summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2012-03-07 14:30:58 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2012-03-07 14:30:58 (GMT)
commitc88d1d82845e92393e2221c65b9dd7f8f8d2703e (patch)
treec424e4e080a680ca9c48011b3b24ef02cbae05d1
parentdd2857b1d9e8579e82ddae82b1d4d10a80ea090d (diff)
parent54785bd545944c4addc9eb8e4a162a3d10b3a3b9 (diff)
downloadtk-c88d1d82845e92393e2221c65b9dd7f8f8d2703e.zip
tk-c88d1d82845e92393e2221c65b9dd7f8f8d2703e.tar.gz
tk-c88d1d82845e92393e2221c65b9dd7f8f8d2703e.tar.bz2
Minor: code style improvements.
-rw-r--r--generic/tkObj.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 2e45e0e..8877d42 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -368,10 +368,9 @@ static void
FreePixelInternalRep(
Tcl_Obj *objPtr) /* Pixel object with internal rep to free. */
{
- PixelRep *pixelPtr;
-
if (!SIMPLE_PIXELREP(objPtr)) {
- pixelPtr = GET_COMPLEXPIXEL(objPtr);
+ PixelRep *pixelPtr = GET_COMPLEXPIXEL(objPtr);
+
ckfree(pixelPtr);
}
SET_SIMPLEPIXEL(objPtr, 0);
@@ -401,13 +400,13 @@ DupPixelInternalRep(
register Tcl_Obj *srcPtr, /* Object with internal rep to copy. */
register Tcl_Obj *copyPtr) /* Object with internal rep to set. */
{
- PixelRep *oldPtr, *newPtr;
-
copyPtr->typePtr = srcPtr->typePtr;
if (SIMPLE_PIXELREP(srcPtr)) {
SET_SIMPLEPIXEL(copyPtr, GET_SIMPLEPIXEL(srcPtr));
} else {
+ PixelRep *oldPtr, *newPtr;
+
oldPtr = GET_COMPLEXPIXEL(srcPtr);
newPtr = ckalloc(sizeof(PixelRep));
newPtr->value = oldPtr->value;