diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-19 16:43:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-19 16:43:41 (GMT) |
| commit | 8bc2c23bda9e73e39c63f404bf1da85c8071f669 (patch) | |
| tree | e54fd36946aa49348e86fffb00f4b8993652eae9 /unix | |
| parent | c740da6bc26ac29aeb5b548f7e350fd15ec1f890 (diff) | |
| parent | 915616b46cc0da4948b04571734c3512ac290b35 (diff) | |
| download | tcl-8bc2c23bda9e73e39c63f404bf1da85c8071f669.zip tcl-8bc2c23bda9e73e39c63f404bf1da85c8071f669.tar.gz tcl-8bc2c23bda9e73e39c63f404bf1da85c8071f669.tar.bz2 | |
Merge 8.7 (Some Tcl_GetStringFromObj -> TclGetStringFromObj internal changes)
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixChan.c | 2 | ||||
| -rw-r--r-- | unix/tclUnixFCmd.c | 12 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 4 | ||||
| -rw-r--r-- | unix/tclUnixInit.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index 1436b5c..3e887d0 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -706,7 +706,7 @@ FileGetOptionProc( * general probe. */ - dictContents = Tcl_GetStringFromObj(dictObj, &dictLength); + dictContents = TclGetStringFromObj(dictObj, &dictLength); Tcl_DStringAppend(dsPtr, dictContents, dictLength); Tcl_DecrRefCount(dictObj); return TCL_OK; diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index 48023b1..3eee59e 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -1516,7 +1516,7 @@ SetGroupAttribute( const char *string; Tcl_Size length; - string = Tcl_GetStringFromObj(attributePtr, &length); + string = TclGetStringFromObj(attributePtr, &length); if (Tcl_UtfToExternalDStringEx(interp, NULL, string, length, 0, &ds, NULL) != TCL_OK) { Tcl_DStringFree(&ds); @@ -1587,7 +1587,7 @@ SetOwnerAttribute( const char *string; Tcl_Size length; - string = Tcl_GetStringFromObj(attributePtr, &length); + string = TclGetStringFromObj(attributePtr, &length); if (Tcl_UtfToExternalDStringEx(interp, NULL, string, length, 0, &ds, NULL) != TCL_OK) { Tcl_DStringFree(&ds); @@ -1966,7 +1966,7 @@ TclpObjNormalizePath( const char *currentPathEndPosition; char cur; Tcl_Size pathLen; - const char *path = Tcl_GetStringFromObj(pathPtr, &pathLen); + const char *path = TclGetStringFromObj(pathPtr, &pathLen); Tcl_DString ds; const char *nativePath; #ifndef NO_REALPATH @@ -2208,7 +2208,7 @@ TclUnixOpenTemporaryFile( */ if (dirObj) { - string = Tcl_GetStringFromObj(dirObj, &length); + string = TclGetStringFromObj(dirObj, &length); if (Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, 0, &templ, NULL) != TCL_OK) { return -1; } @@ -2220,7 +2220,7 @@ TclUnixOpenTemporaryFile( TclDStringAppendLiteral(&templ, "/"); if (basenameObj) { - string = Tcl_GetStringFromObj(basenameObj, &length); + string = TclGetStringFromObj(basenameObj, &length); if (Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, 0, &tmp, NULL) != TCL_OK) { Tcl_DStringFree(&tmp); return -1; @@ -2235,7 +2235,7 @@ TclUnixOpenTemporaryFile( #ifdef HAVE_MKSTEMPS if (extensionObj) { - string = Tcl_GetStringFromObj(extensionObj, &length); + string = TclGetStringFromObj(extensionObj, &length); if (Tcl_UtfToExternalDStringEx(NULL, NULL, string, length, 0, &tmp, NULL) != TCL_OK) { Tcl_DStringFree(&templ); return -1; diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 42be6bc..70924f8 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -989,7 +989,7 @@ TclpObjLink( if (transPtr == NULL) { return NULL; } - target = Tcl_GetStringFromObj(transPtr, &length); + target = TclGetStringFromObj(transPtr, &length); if (Tcl_UtfToExternalDStringEx(NULL, NULL, target, length, 0, &ds, NULL) != TCL_OK) { Tcl_DStringFree(&ds); return NULL; @@ -1149,7 +1149,7 @@ TclNativeCreateNativeRep( Tcl_IncrRefCount(validPathPtr); } - str = Tcl_GetStringFromObj(validPathPtr, &len); + str = TclGetStringFromObj(validPathPtr, &len); if (Tcl_UtfToExternalDStringEx(NULL, NULL, str, len, 0, &ds, NULL) != TCL_OK) { Tcl_DecrRefCount(validPathPtr); Tcl_DStringFree(&ds); diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index c7bc463..eb8fa4c 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -551,7 +551,7 @@ TclpInitLibraryPath( * TODO - why is the type size_t anyways? */ Tcl_Size length; - str = Tcl_GetStringFromObj(pathPtr, &length); + str = TclGetStringFromObj(pathPtr, &length); *lengthPtr = length; *valuePtr = (char *)Tcl_Alloc(length + 1); memcpy(*valuePtr, str, length + 1); |