summaryrefslogtreecommitdiffstats
path: root/generic/tclRegexp.c
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2015-07-17 21:22:22 (GMT)
committerdgp@users.sourceforge.net <dgp>2015-07-17 21:22:22 (GMT)
commitdee9a9cbe77ea21d498f9c6c3885df0a93c8da50 (patch)
treeeb303b04e47fe05468dc5620171a0ee2c8453095 /generic/tclRegexp.c
parent3b5dff82b3bea4153a4034c95ebdc7af76076428 (diff)
parent77985b9936c999f8cbcb0f87825fedb45afada9a (diff)
downloadtcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.zip
tcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.tar.gz
tcl-dee9a9cbe77ea21d498f9c6c3885df0a93c8da50.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclRegexp.c')
-rw-r--r--generic/tclRegexp.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index 6348e4a..ea25d4b 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -755,7 +755,7 @@ FreeRegexpInternalRep(
* If this is the last reference to the regexp, free it.
*/
- if (--(regexpRepPtr->refCount) <= 0) {
+ if (regexpRepPtr->refCount-- <= 1) {
FreeRegexp(regexpRepPtr);
}
objPtr->typePtr = NULL;
@@ -946,7 +946,8 @@ CompileRegexp(
* Tcl_RegExpExecObj to optionally do a fast match (avoids RE engine).
*/
- if (TclReToGlob(NULL, string, length, &stringBuf, &exact) == TCL_OK) {
+ if (TclReToGlob(NULL, string, length, &stringBuf, &exact,
+ NULL) == TCL_OK) {
regexpPtr->globObjPtr = TclDStringToObj(&stringBuf);
Tcl_IncrRefCount(regexpPtr->globObjPtr);
} else {
@@ -975,7 +976,7 @@ CompileRegexp(
if (tsdPtr->patterns[NUM_REGEXPS-1] != NULL) {
TclRegexp *oldRegexpPtr = tsdPtr->regexps[NUM_REGEXPS-1];
- if (--(oldRegexpPtr->refCount) <= 0) {
+ if (oldRegexpPtr->refCount-- <= 1) {
FreeRegexp(oldRegexpPtr);
}
ckfree(tsdPtr->patterns[NUM_REGEXPS-1]);
@@ -1049,7 +1050,7 @@ FinalizeRegexp(
for (i = 0; (i < NUM_REGEXPS) && (tsdPtr->patterns[i] != NULL); i++) {
regexpPtr = tsdPtr->regexps[i];
- if (--(regexpPtr->refCount) <= 0) {
+ if (regexpPtr->refCount-- <= 1) {
FreeRegexp(regexpPtr);
}
ckfree(tsdPtr->patterns[i]);