diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2024-08-06 11:12:47 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2024-08-06 11:12:47 (GMT) |
| commit | 5b8e7ab89dcc095ee37af0178bbdd5805feb0fcf (patch) | |
| tree | 10b477c4f96989d84a5453310c9715aaef2b3413 /generic/tclEncoding.c | |
| parent | b7e43425e884e3fe2857892ce300dc9eb9797beb (diff) | |
| parent | df19b3581f7a45b260c626d77a2d6ca7d3363360 (diff) | |
| download | tcl-5b8e7ab89dcc095ee37af0178bbdd5805feb0fcf.zip tcl-5b8e7ab89dcc095ee37af0178bbdd5805feb0fcf.tar.gz tcl-5b8e7ab89dcc095ee37af0178bbdd5805feb0fcf.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index ba9f811..e1f2536 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -1494,8 +1494,7 @@ OpenEncodingFileChannel( const char *name) /* The name of the encoding file on disk and * also the name for new encoding. */ { - Tcl_Obj *nameObj = Tcl_NewStringObj(name, -1); - Tcl_Obj *fileNameObj = Tcl_DuplicateObj(nameObj); + Tcl_Obj *fileNameObj = Tcl_NewStringObj(name, -1); Tcl_Obj *searchPath = Tcl_DuplicateObj(Tcl_GetEncodingSearchPath()); Tcl_Obj *map = TclGetProcessGlobalValue(&encodingFileMap); Tcl_Obj **dir, *path, *directory = NULL; @@ -1503,10 +1502,9 @@ OpenEncodingFileChannel( int i, numDirs; TclListObjGetElements(NULL, searchPath, &numDirs, &dir); - Tcl_IncrRefCount(nameObj); Tcl_AppendToObj(fileNameObj, ".enc", -1); Tcl_IncrRefCount(fileNameObj); - Tcl_DictObjGet(NULL, map, nameObj, &directory); + TclDictGet(NULL, map, name, &directory); /* * Check that any cached directory is still on the encoding search path. @@ -1535,7 +1533,7 @@ OpenEncodingFileChannel( */ map = Tcl_DuplicateObj(map); - Tcl_DictObjRemove(NULL, map, nameObj); + TclDictRemove(NULL, map, name); TclSetProcessGlobalValue(&encodingFileMap, map, NULL); directory = NULL; } @@ -1569,7 +1567,7 @@ OpenEncodingFileChannel( */ map = Tcl_DuplicateObj(TclGetProcessGlobalValue(&encodingFileMap)); - Tcl_DictObjPut(NULL, map, nameObj, dir[i]); + TclDictPut(NULL, map, name, dir[i]); TclSetProcessGlobalValue(&encodingFileMap, map, NULL); } } @@ -1577,10 +1575,9 @@ OpenEncodingFileChannel( if ((NULL == chan) && (interp != NULL)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unknown encoding \"%s\"", name)); - Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, NULL); + Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, (char *)NULL); } Tcl_DecrRefCount(fileNameObj); - Tcl_DecrRefCount(nameObj); Tcl_DecrRefCount(searchPath); return chan; @@ -1652,7 +1649,7 @@ LoadEncodingFile( if ((encoding == NULL) && (interp != NULL)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "invalid encoding file \"%s\"", name)); - Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, NULL); + Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, (char *)NULL); } Tcl_Close(NULL, chan); |