diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2024-05-26 14:09:38 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2024-05-26 14:09:38 (GMT) |
| commit | ee407b9bf60dbb8dac81770bcc01422decf03c2b (patch) | |
| tree | d061081fc6918174fe2cb762c0d00bec4a78584d /generic/tclEncoding.c | |
| parent | bac8bdb8bb12e32bbec2724e1ce04959ce13bb8f (diff) | |
| parent | b2214142f4719ab73e4979553e03e6daf1ad4508 (diff) | |
| download | tcl-ee407b9bf60dbb8dac81770bcc01422decf03c2b.zip tcl-ee407b9bf60dbb8dac81770bcc01422decf03c2b.tar.gz tcl-ee407b9bf60dbb8dac81770bcc01422decf03c2b.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 73b4f54..176838d 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -1736,8 +1736,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, TCL_INDEX_NONE); - Tcl_Obj *fileNameObj = Tcl_DuplicateObj(nameObj); + Tcl_Obj *fileNameObj = Tcl_ObjPrintf("%s.enc", name); Tcl_Obj *searchPath = Tcl_DuplicateObj(Tcl_GetEncodingSearchPath()); Tcl_Obj *map = TclGetProcessGlobalValue(&encodingFileMap); Tcl_Obj **dir, *path, *directory = NULL; @@ -1745,10 +1744,8 @@ OpenEncodingFileChannel( Tcl_Size i, numDirs; TclListObjGetElements(NULL, searchPath, &numDirs, &dir); - Tcl_IncrRefCount(nameObj); - Tcl_AppendToObj(fileNameObj, ".enc", TCL_INDEX_NONE); 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. @@ -1777,7 +1774,7 @@ OpenEncodingFileChannel( */ map = Tcl_DuplicateObj(map); - Tcl_DictObjRemove(NULL, map, nameObj); + TclDictRemove(NULL, map, name); TclSetProcessGlobalValue(&encodingFileMap, map); directory = NULL; } @@ -1811,7 +1808,7 @@ OpenEncodingFileChannel( */ map = Tcl_DuplicateObj(TclGetProcessGlobalValue(&encodingFileMap)); - Tcl_DictObjPut(NULL, map, nameObj, dir[i]); + TclDictPut(NULL, map, name, dir[i]); TclSetProcessGlobalValue(&encodingFileMap, map); } } @@ -1822,7 +1819,6 @@ OpenEncodingFileChannel( Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ENCODING", name, (void *)NULL); } Tcl_DecrRefCount(fileNameObj); - Tcl_DecrRefCount(nameObj); Tcl_DecrRefCount(searchPath); return chan; |