summaryrefslogtreecommitdiff
path: root/tk/unix/tkUnixFont.c
diff options
context:
space:
mode:
authorMartin M. Hunt <hunt@redhat.com>2003-01-21 19:53:33 +0000
committerMartin M. Hunt <hunt@redhat.com>2003-01-21 19:53:33 +0000
commit112d7d270bc1e8172fa502c794d7872a27ab5b77 (patch)
tree84d95294c14253762140774e0b38cc21e92d8420 /tk/unix/tkUnixFont.c
parent39e08fde6f9d492e5c96e7cea1e07122e5094968 (diff)
downloadgdb-112d7d270bc1e8172fa502c794d7872a27ab5b77.tar.gz
imported tk 8.4.1TK8_4_1
Diffstat (limited to 'tk/unix/tkUnixFont.c')
-rw-r--r--tk/unix/tkUnixFont.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tk/unix/tkUnixFont.c b/tk/unix/tkUnixFont.c
index ce240df7ebb..3daea3273bc 100644
--- a/tk/unix/tkUnixFont.c
+++ b/tk/unix/tkUnixFont.c
@@ -406,7 +406,7 @@ ControlUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
* correspond to the bytes stored in the
* output buffer. */
{
- CONST char *srcEnd;
+ CONST char *srcStart, *srcEnd;
char *dstStart, *dstEnd;
Tcl_UniChar ch;
int result;
@@ -416,8 +416,9 @@ ControlUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
'a', 'b', 't', 'n', 'v', 'f', 'r'
};
- result = TCL_OK;
+ result = TCL_OK;
+ srcStart = src;
srcEnd = src + srcLen;
dstStart = dst;
@@ -447,7 +448,7 @@ ControlUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
dst += 6;
}
}
- *srcReadPtr = src - srcEnd;
+ *srcReadPtr = src - srcStart;
*dstWrotePtr = dst - dstStart;
*dstCharsPtr = dst - dstStart;
return result;