diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 11:44:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-04 11:44:49 (GMT) |
| commit | b2c080e9ae2d44b453f81bae6443f6fffaf6b052 (patch) | |
| tree | 96c798290148ac7d237058f68a1f177fe222b7b6 /generic/tclUtil.c | |
| parent | 6e8238944201c02321c9c5fc20a4d95c4f5383c8 (diff) | |
| parent | a107ac202e6c6806a0690e555b1141f2d032fb41 (diff) | |
| download | tcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.zip tcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.tar.gz tcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclUtil.c')
| -rw-r--r-- | generic/tclUtil.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 2219c84..c73841f 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -656,7 +656,7 @@ FindElement( "%s element in braces followed by \"%.*s\" " "instead of space", typeStr, (int) (p2-p), p)); Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "JUNK", - (void *)NULL); + (char *)NULL); } return TCL_ERROR; } @@ -708,7 +708,7 @@ FindElement( "%s element in quotes followed by \"%.*s\" " "instead of space", typeStr, (int) (p2-p), p)); Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "JUNK", - (void *)NULL); + (char *)NULL); } return TCL_ERROR; } @@ -741,7 +741,7 @@ FindElement( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unmatched open brace in %s", typeStr)); Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "BRACE", - (void *)NULL); + (char *)NULL); } return TCL_ERROR; } else if (inQuotes) { @@ -749,7 +749,7 @@ FindElement( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unmatched open quote in %s", typeStr)); Tcl_SetErrorCode(interp, "TCL", "VALUE", typeCode, "QUOTE", - (void *)NULL); + (char *)NULL); } return TCL_ERROR; } @@ -900,7 +900,7 @@ Tcl_SplitList( Tcl_SetObjResult(interp, Tcl_NewStringObj( "internal error in Tcl_SplitList", -1)); Tcl_SetErrorCode(interp, "TCL", "INTERNAL", "Tcl_SplitList", - (void *)NULL); + (char *)NULL); } return TCL_ERROR; } @@ -2044,7 +2044,7 @@ Tcl_ConcatObj( if (elemPtr == NULL) { continue; } - if (Tcl_GetString(elemPtr)[0] == '#' || TCL_OK + if (TclGetString(elemPtr)[0] == '#' || TCL_OK != Tcl_ListObjAppendList(NULL, resPtr, objPtr)) { /* Abandon ship! */ Tcl_DecrRefCount(resPtr); @@ -3997,7 +3997,7 @@ GetEndOffsetFromObj( bytes += 4; } TclCheckBadOctal(interp, bytes); - Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX", (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX", (char *)NULL); } return TCL_ERROR; @@ -4807,7 +4807,7 @@ TclReToGlob( invalidGlob: if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1)); - Tcl_SetErrorCode(interp, "TCL", "RE2GLOB", code, (void *)NULL); + Tcl_SetErrorCode(interp, "TCL", "RE2GLOB", code, (char *)NULL); } Tcl_DStringFree(dsPtr); return TCL_ERROR; |