diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-09-28 07:29:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-09-28 07:29:57 (GMT) |
| commit | eb1ea6e9925f3dfc5ac745baef6723d161e065ad (patch) | |
| tree | 89c1e3fc1eb78f350386086845ec60b31044fe4f | |
| parent | fcaf388135868d5f4677827b47497f7384c3568d (diff) | |
| parent | a568c3a7370ca204923a22917acd5520223036f9 (diff) | |
| download | tcl-eb1ea6e9925f3dfc5ac745baef6723d161e065ad.zip tcl-eb1ea6e9925f3dfc5ac745baef6723d161e065ad.tar.gz tcl-eb1ea6e9925f3dfc5ac745baef6723d161e065ad.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | doc/AddErrInfo.3 | 2 | ||||
| -rw-r--r-- | doc/Eval.3 | 4 | ||||
| -rw-r--r-- | doc/SetResult.3 | 2 | ||||
| -rw-r--r-- | doc/StringObj.3 | 2 | ||||
| -rw-r--r-- | generic/tclTest.c | 6 | ||||
| -rw-r--r-- | win/tclWinDde.c | 3 | ||||
| -rw-r--r-- | win/tclWinFCmd.c | 2 |
7 files changed, 9 insertions, 12 deletions
diff --git a/doc/AddErrInfo.3 b/doc/AddErrInfo.3 index 53f134a..c71926b 100644 --- a/doc/AddErrInfo.3 +++ b/doc/AddErrInfo.3 @@ -28,7 +28,7 @@ int .sp \fBTcl_SetObjErrorCode\fR(\fIinterp, errorObjPtr\fR) .sp -\fBTcl_SetErrorCode\fR(\fIinterp, element, element, ... \fB(char *) NULL\fR) +\fBTcl_SetErrorCode\fR(\fIinterp, element, element, ... \fBNULL\fR) .sp \fBTcl_SetErrorCodeVA\fR(\fIinterp, argList\fR) .sp @@ -37,7 +37,7 @@ int \fBTcl_GlobalEvalObj\fR(\fIinterp, objPtr\fR) .sp int -\fBTcl_VarEval\fR(\fIinterp, part, part, ... \fB(char *) NULL\fR) +\fBTcl_VarEval\fR(\fIinterp, part, part, ... \fBNULL\fR) .sp int \fBTcl_VarEvalVA\fR(\fIinterp, argList\fR) @@ -150,7 +150,7 @@ then calls \fBTcl_Eval\fR to execute that string as a Tcl command. It returns the result of the command and also modifies the interpreter result in the same way as \fBTcl_Eval\fR. The last argument to \fBTcl_VarEval\fR must be NULL to indicate the end -of arguments. \fBTcl_VarEval\fR is now deprecated. +of arguments. .PP \fBTcl_VarEvalVA\fR is the same as \fBTcl_VarEval\fR except that instead of taking a variable number of arguments it takes an argument diff --git a/doc/SetResult.3 b/doc/SetResult.3 index 04a4b7f..d3c0d8a 100644 --- a/doc/SetResult.3 +++ b/doc/SetResult.3 @@ -24,7 +24,7 @@ Tcl_Obj * const char * \fBTcl_GetStringResult\fR(\fIinterp\fR) .sp -\fBTcl_AppendResult\fR(\fIinterp, result, result, ... , \fB(char *) NULL\fR) +\fBTcl_AppendResult\fR(\fIinterp, result, result, ... , \fBNULL\fR) .sp \fBTcl_AppendResultVA\fR(\fIinterp, argList\fR) .sp diff --git a/doc/StringObj.3 b/doc/StringObj.3 index 6118a2d..a64788b 100644 --- a/doc/StringObj.3 +++ b/doc/StringObj.3 @@ -56,7 +56,7 @@ void \fBTcl_AppendObjToObj\fR(\fIobjPtr, appendObjPtr\fR) .sp void -\fBTcl_AppendStringsToObj\fR(\fIobjPtr, string, string, ... \fB(char *) NULL\fR) +\fBTcl_AppendStringsToObj\fR(\fIobjPtr, string, string, ... \fBNULL\fR) .sp void \fBTcl_AppendStringsToObjVA\fR(\fIobjPtr, argList\fR) diff --git a/generic/tclTest.c b/generic/tclTest.c index 0f4289f..ab2e459 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -6439,8 +6439,7 @@ TestChannelCmd( if ((cmdName[0] == 'm') && (strncmp(cmdName, "mremove-rd", len) == 0)) { if (argc != 3) { - Tcl_AppendResult(interp, "channel name required", - (char *) NULL); + Tcl_AppendResult(interp, "channel name required", NULL); return TCL_ERROR; } @@ -6449,8 +6448,7 @@ TestChannelCmd( if ((cmdName[0] == 'm') && (strncmp(cmdName, "mremove-wr", len) == 0)) { if (argc != 3) { - Tcl_AppendResult(interp, "channel name required", - (char *) NULL); + Tcl_AppendResult(interp, "channel name required", NULL); return TCL_ERROR; } diff --git a/win/tclWinDde.c b/win/tclWinDde.c index 3377bfa..d01e7ae 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.c @@ -1305,8 +1305,7 @@ DdeObjCmd( Tcl_Obj *const *objv) /* The arguments */ { static const char *const ddeCommands[] = { - "servername", "execute", "poke", "request", "services", "eval", - (char *) NULL}; + "servername", "execute", "poke", "request", "services", "eval", NULL}; enum DdeSubcommands { DDE_SERVERNAME, DDE_EXECUTE, DDE_POKE, DDE_REQUEST, DDE_SERVICES, DDE_EVAL diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index 7f35bd7..e02f6d6 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -56,7 +56,7 @@ static const int attributeArray[] = {FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_HIDD const char *const tclpFileAttrStrings[] = { "-archive", "-hidden", "-longname", "-readonly", - "-shortname", "-system", (char *) NULL + "-shortname", "-system", NULL }; const TclFileAttrProcs tclpFileAttrProcs[] = { |