diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 12:35:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 12:35:02 (GMT) |
| commit | bd12eef0809ee8745b15fa5709711881f139f1e1 (patch) | |
| tree | 5b3a1dcdb575f5f66d1c37aa14c631a01aceacbb /generic/tclStringObj.c | |
| parent | c0279cc641d237a25c2a4fc47b6a17d4b9f9b58a (diff) | |
| parent | 1fbedd426d7faecbf706afa024c4316bf31ff8b1 (diff) | |
| download | tcl-bd12eef0809ee8745b15fa5709711881f139f1e1.zip tcl-bd12eef0809ee8745b15fa5709711881f139f1e1.tar.gz tcl-bd12eef0809ee8745b15fa5709711881f139f1e1.tar.bz2 | |
Merge 8.7. encodingPtr -> encodingNamePtr (for consistency)
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index ee2eaae..6f289c8 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -452,7 +452,7 @@ TclGetCharLength( if (TclIsPureByteArray(objPtr)) { (void) Tcl_GetBytesFromObj(NULL, objPtr, &numChars); } else { - Tcl_GetString(objPtr); + TclGetString(objPtr); numChars = TclNumUtfChars(objPtr->bytes, objPtr->length); } @@ -2560,7 +2560,7 @@ Tcl_AppendFormatToObj( if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad field specifier \"%c\"", ch)); - Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADTYPE", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADTYPE", (char *)NULL); } goto error; } @@ -2620,7 +2620,7 @@ Tcl_AppendFormatToObj( errorMsg: if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1)); - Tcl_SetErrorCode(interp, "TCL", "FORMAT", errCode, (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "FORMAT", errCode, (char *)NULL); } error: Tcl_SetObjLength(appendObj, originalLength); @@ -3044,7 +3044,7 @@ TclStringRepeat( Tcl_ObjPrintf("max size for a Tcl value (%" TCL_SIZE_MODIFIER "d bytes) exceeded", TCL_SIZE_MAX)); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } @@ -3083,7 +3083,7 @@ TclStringRepeat( "string size overflow: unable to alloc %" TCL_SIZE_MODIFIER "d bytes", STRING_SIZE(count*length))); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } @@ -3111,7 +3111,7 @@ TclStringRepeat( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "string size overflow: unable to alloc %" TCL_SIZE_MODIFIER "d bytes", count*length)); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } @@ -3410,7 +3410,7 @@ TclStringCat( "concatenation failed: unable to alloc %" TCL_Z_MODIFIER "u bytes", STRING_SIZE(length))); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } @@ -3427,7 +3427,7 @@ TclStringCat( "concatenation failed: unable to alloc %" TCL_Z_MODIFIER "u bytes", STRING_SIZE(length))); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } @@ -3458,7 +3458,7 @@ TclStringCat( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "concatenation failed: unable to alloc %" TCL_SIZE_MODIFIER "d bytes", length)); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } @@ -3473,7 +3473,7 @@ TclStringCat( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "concatenation failed: unable to alloc %" TCL_SIZE_MODIFIER "d bytes", length)); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } @@ -3499,7 +3499,7 @@ TclStringCat( if (interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "max size for a Tcl value (%" TCL_SIZE_MODIFIER "d bytes) exceeded", TCL_SIZE_MAX)); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } @@ -4251,7 +4251,7 @@ TclStringReplace( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "max size for a Tcl value (%" TCL_SIZE_MODIFIER "d bytes) exceeded", TCL_SIZE_MAX)); - Tcl_SetErrorCode(interp, "TCL", "MEMORY", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "MEMORY", (char *)NULL); } return NULL; } |