summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-08-31 16:25:50 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-08-31 16:25:50 (GMT)
commit05da5a98f0de68b9da67eb1d881ebe9a173741f8 (patch)
treee24b95196825ac08da41748e069ac58d4f70d65b /generic
parent6b5a61fba89e91d2f3c262758595d29c21346d79 (diff)
downloadtcl-05da5a98f0de68b9da67eb1d881ebe9a173741f8.zip
tcl-05da5a98f0de68b9da67eb1d881ebe9a173741f8.tar.gz
tcl-05da5a98f0de68b9da67eb1d881ebe9a173741f8.tar.bz2
Completed an incomplete undo of a mistaken commit that broke the HEAD.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclVar.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 705fe27..a0a6f42 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -15,7 +15,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclVar.c,v 1.90 2004/08/31 15:24:48 dkf Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.91 2004/08/31 16:25:50 dgp Exp $
*/
#ifdef STDC_HEADERS
@@ -2832,7 +2832,7 @@ Tcl_ArrayObjCmd(dummy, interp, objc, objv)
* Store the array names in a new object.
*/
- nameLstPtr = TclNewObj();
+ nameLstPtr = Tcl_NewObj();
Tcl_IncrRefCount(nameLstPtr);
for (hPtr = Tcl_FirstHashEntry(varPtr->value.tablePtr, &search);
@@ -2850,8 +2850,8 @@ Tcl_ArrayObjCmd(dummy, interp, objc, objv)
result = Tcl_ListObjAppendElement(interp, nameLstPtr,
namePtr);
if (result != TCL_OK) {
- TclDecrRefCount(namePtr); /* free unneeded name obj */
- TclDecrRefCount(nameLstPtr);
+ Tcl_DecrRefCount(namePtr); /* free unneeded name obj */
+ Tcl_DecrRefCount(nameLstPtr);
return result;
}
}
@@ -2867,7 +2867,7 @@ Tcl_ArrayObjCmd(dummy, interp, objc, objv)
* Get the array values corresponding to each element name
*/
- tmpResPtr = TclNewObj();
+ tmpResPtr = Tcl_NewObj();
result = Tcl_ListObjGetElements(interp, nameLstPtr,
&count, &namePtrPtr);
if (result != TCL_OK) {
@@ -2904,13 +2904,13 @@ Tcl_ArrayObjCmd(dummy, interp, objc, objv)
}
varPtr->refCount--;
Tcl_SetObjResult(interp, tmpResPtr);
- TclDecrRefCount(nameLstPtr);
+ Tcl_DecrRefCount(nameLstPtr);
break;
errorInArrayGet:
varPtr->refCount--;
- TclDecrRefCount(nameLstPtr);
- TclDecrRefCount(tmpResPtr); /* free unneeded temp result obj */
+ Tcl_DecrRefCount(nameLstPtr);
+ Tcl_DecrRefCount(tmpResPtr); /* free unneeded temp result obj */
return result;
}
case ARRAY_NAMES: {
@@ -2975,7 +2975,7 @@ Tcl_ArrayObjCmd(dummy, interp, objc, objv)
namePtr = Tcl_NewStringObj(name, -1);
result = Tcl_ListObjAppendElement(interp, resultPtr, namePtr);
if (result != TCL_OK) {
- TclDecrRefCount(namePtr); /* free unneeded name obj */
+ Tcl_DecrRefCount(namePtr); /* free unneeded name obj */
return result;
}
}