summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-09-01 13:49:55 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-09-01 13:49:55 (GMT)
commit7a136a781a8acc9f92bafecfb5406db9537d61ed (patch)
treed9d9588d3e8a3837a50a6f3b5d1ea8d07bab4daf
parent1997e71e603d7d479143da6fdf0db628f8f9ba82 (diff)
parent6832ae16ff4f18e496fe00d20334e627e2acf525 (diff)
downloadtcl-7a136a781a8acc9f92bafecfb5406db9537d61ed.zip
tcl-7a136a781a8acc9f92bafecfb5406db9537d61ed.tar.gz
tcl-7a136a781a8acc9f92bafecfb5406db9537d61ed.tar.bz2
Merge core-8-6-branch
-rw-r--r--generic/tclScan.c4
-rw-r--r--generic/tclStringObj.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 7a6a8a2..e1fcad4 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -72,7 +72,7 @@ BuildCharSet(
CharSet *cset,
const char *format) /* Points to first char of set. */
{
- Tcl_UniChar ch, start;
+ Tcl_UniChar ch = 0, start;
int offset, nranges;
const char *end;
@@ -582,7 +582,7 @@ Tcl_ScanObjCmd(
char op = 0;
int width, underflow = 0;
Tcl_WideInt wideValue;
- Tcl_UniChar ch, sch;
+ Tcl_UniChar ch = 0, sch = 0;
Tcl_Obj **objs = NULL, *objPtr = NULL;
int flags;
char buf[513]; /* Temporary buffer to hold scanned number
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 209f982..59758bb 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1650,6 +1650,7 @@ Tcl_AppendFormatToObj(
const char *span = format, *msg, *errCode;
int numBytes = 0, objIndex = 0, gotXpg = 0, gotSequential = 0;
int originalLength, limit;
+ Tcl_UniChar ch = 0;
static const char *mixedXPG =
"cannot mix \"%\" and \"%n$\" conversion specifiers";
static const char *const badIndex[2] = {
@@ -1677,7 +1678,6 @@ Tcl_AppendFormatToObj(
#endif
int newXpg, numChars, allocSegment = 0, segmentLimit, segmentNumBytes;
Tcl_Obj *segment;
- Tcl_UniChar ch = 0;
int step = TclUtfToUniChar(format, &ch);
format += step;