Merge branch 'master' into no-TCL_VARARGS

flightaware · Jan 18, 2024 · 2bc5687 · 2bc5687
2 parents 543ca78 + a28fe35
commit 2bc5687
Show file tree

Hide file tree

Showing 37 changed files with 234 additions and 226 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-![Linux CI](https://github.com/flightaware/tclx/workflows/Linux%20CI/badge.svg)
-![Mac CI](https://github.com/flightaware/tclx/workflows/Mac%20CI/badge.svg)
+[![Linux CI](https://github.com/flightaware/tclx/actions/workflows/linux-ci.yml/badge.svg)](https://github.com/flightaware/tclx/actions/workflows/linux-ci.yml)
+[![Mac CI](https://github.com/flightaware/tclx/actions/workflows/mac-ci.yml/badge.svg)](https://github.com/flightaware/tclx/actions/workflows/mac-ci.yml)
 
 # Extended Tcl (TclX)
 

diff --git a/configure b/configure
@@ -2342,7 +2342,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-FULL_VERSION="8.6.1"
+FULL_VERSION="8.6.2"
 
 
     # TEA extensions pass this us the version of TEA they think they
@@ -9075,7 +9075,8 @@ else
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <time.h>
+#include <stdlib.h>
+            #include <time.h>
 int
 main ()
 {
@@ -9111,7 +9112,8 @@ else
 
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <time.h>
+#include <stdlib.h>
+                #include <time.h>
 int
 main ()
 {
@@ -9196,10 +9198,11 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/times.h>
 #include <unistd.h>
-main() {
+int main(void) {
     struct tms cpu;
     times(&cpu);
     sleep(2);
@@ -9462,6 +9465,17 @@ else
 
 fi
 
+    for ac_func in rresvport
+do :
+  ac_fn_c_check_func "$LINENO" "rresvport" "ac_cv_func_rresvport"
+if test "x$ac_cv_func_rresvport" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RRESVPORT 1
+_ACEOF
+
+fi
+done
+
 
     #-------------------------------------------------------------------------
     # Check for additional libraries the Tcl/Tk does not check for.
@@ -9524,7 +9538,8 @@ if test "x$ac_cv_func_catgets" = xyes; then :
 $as_echo_n "checking catclose return value... " >&6; }
     	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <nl_types.h>
+#include <stdlib.h>
+         #include <nl_types.h>
 int
 main ()
 {

diff --git a/generic/tclExtdInt.h b/generic/tclExtdInt.h
@@ -244,7 +244,7 @@ TclX_StructOffset (void *nsPtr, size_t offset,
 #define TclX_WriteNL(channel) (Tcl_Write (channel, "\n", 1))
 
 extern int
-TclX_StrToOffset (CONST char *string,
+TclX_StrToOffset (const char *string,
                   int         base,
                   off_t      *offsetPtr);
 

diff --git a/generic/tclExtend.h b/generic/tclExtend.h
@@ -97,18 +97,22 @@ EXTERN void	TclX_SplitWinCmdLine (int *argcPtr, char ***argvPtr);
 /*
  * Exported utility functions.
  */
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+__attribute__((sentinel))
+#endif
 EXTERN void	TclX_AppendObjResult (Tcl_Interp *interp, ...);
 
-EXTERN char *	TclX_DownShift (char *targetStr, CONST char *sourceStr);
+EXTERN char *	TclX_DownShift (char *targetStr, const char *sourceStr);
 
-EXTERN int	TclX_StrToInt (CONST char *string, int base, int *intPtr);
+EXTERN int	TclX_StrToInt (const char *string, int base, int *intPtr);
 
-EXTERN int	TclX_StrToUnsigned (CONST char *string,
+EXTERN int	TclX_StrToUnsigned (const char *string,
                                 int	    base,
                                 unsigned   *unsignedPtr);
 
 EXTERN char *	TclX_UpShift (char	     *targetStr,
-                              CONST char *sourceStr);
+                              const char *sourceStr);
 
 /*
  * Exported keyed list object manipulation functions.
@@ -143,7 +147,7 @@ EXTERN void_pt	TclX_HandleAlloc (void_pt	headerPtr,
 EXTERN void	TclX_HandleFree (void_pt  headerPtr,
                              void_pt  entryPtr);
 
-EXTERN void_pt	TclX_HandleTblInit (CONST char *handleBase,
+EXTERN void_pt	TclX_HandleTblInit (const char *handleBase,
                                     int	    entrySize,
                                     int	    initEntries);
 
@@ -161,7 +165,7 @@ EXTERN void	TclX_WalkKeyToHandle (void_pt   headerPtr,
 
 EXTERN void_pt	TclX_HandleXlate (Tcl_Interp  *interp,
                                   void_pt	  headerPtr,
-                                  CONST  char *handle);
+                                  const  char *handle);
 
 EXTERN void_pt	TclX_HandleXlateObj (Tcl_Interp    *interp,
                                      void_pt	       headerPtr,

diff --git a/generic/tclXbsearch.c b/generic/tclXbsearch.c
@@ -52,7 +52,7 @@ static int
 TclX_BsearchObjCmd (ClientData clientData, 
                     Tcl_Interp *interp,
                     int objc,
-                    Tcl_Obj *CONST objv[]);
+                    Tcl_Obj *const objv[]);
 
 /*-----------------------------------------------------------------------------
  *
@@ -296,7 +296,7 @@ static int
 TclX_BsearchObjCmd (ClientData clientData,
                     Tcl_Interp *interp,
                     int objc,
-                    Tcl_Obj *CONST objv[])
+                    Tcl_Obj *const objv[])
 {
     int status;
     binSearchCB_t searchCB;

diff --git a/generic/tclXchmod.c b/generic/tclXchmod.c
@@ -39,19 +39,19 @@ static int
 TclX_ChmodObjCmd (ClientData clientData, 
                   Tcl_Interp *interp,
                   int objc,
-                  Tcl_Obj *CONST objv[]);
+                  Tcl_Obj *const objv[]);
 
 static int 
 TclX_ChownObjCmd (ClientData clientData, 
                   Tcl_Interp *interp,
                   int objc,
-                  Tcl_Obj *CONST objv[]);
+                  Tcl_Obj *const objv[]);
 
 static int 
 TclX_ChgrpObjCmd (ClientData clientData, 
                   Tcl_Interp *interp,
                   int objc,
-                  Tcl_Obj *CONST objv[]);
+                  Tcl_Obj *const objv[]);
 
 
 /*-----------------------------------------------------------------------------
@@ -306,7 +306,7 @@ ChmodFileIdObj (Tcl_Interp *interp, modeInfo_t modeInfo, Tcl_Obj *fileIdObj)
  *-----------------------------------------------------------------------------
  */
 static int
-TclX_ChmodObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+TclX_ChmodObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     int           objIdx, idx, fileObjc, fileIds, result;
     modeInfo_t    modeInfo;
@@ -371,7 +371,7 @@ TclX_ChmodObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *
  *-----------------------------------------------------------------------------
  */
 static int
-TclX_ChownObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+TclX_ChownObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     int        objIdx, ownerObjc, fileIds;
     Tcl_Obj  **ownerObjv = NULL;
@@ -455,7 +455,7 @@ TclX_ChownObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *
  *-----------------------------------------------------------------------------
  */
 static int
-TclX_ChgrpObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+TclX_ChgrpObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     int        objIdx, fileIds;
     char      *fileIdsSwitch, *groupString;

diff --git a/generic/tclXcmdloop.c b/generic/tclXcmdloop.c
@@ -72,7 +72,7 @@ static int
 TclX_CommandloopObjCmd (ClientData clientData, 
                         Tcl_Interp *interp,
                         int objc,
-                        Tcl_Obj *CONST objv[]);
+                        Tcl_Obj *const objv[]);
 
 /*-----------------------------------------------------------------------------
  * IsSetVarCmd --
@@ -665,7 +665,7 @@ TclX_CommandLoop (Tcl_Interp *interp,
  *-----------------------------------------------------------------------------
  */
 static int
-TclX_CommandloopObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+TclX_CommandloopObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     int options = 0, async = FALSE, argIdx, interactive;
     char *argStr,  *endCommand = NULL;

diff --git a/generic/tclXcoalesce.c b/generic/tclXcoalesce.c
@@ -29,7 +29,7 @@
  *-----------------------------------------------------------------------------
  */
 static int
-TclX_CoalesceObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+TclX_CoalesceObjCmd (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     int i;
     Tcl_Obj *val;

diff --git a/generic/tclXdebug.c b/generic/tclXdebug.c
@@ -90,7 +90,7 @@ static int
 TclX_CmdtraceObjCmd (ClientData clientData, 
                      Tcl_Interp *interp,
                      int objc,
-                     Tcl_Obj *CONST objv[]);
+                     Tcl_Obj *const objv[]);
 
 static void
 DebugCleanUp (ClientData  clientData,
@@ -387,7 +387,7 @@ static int
 TclX_CmdtraceObjCmd (ClientData clientData,
                      Tcl_Interp *interp,
                      int objc,
-                     Tcl_Obj *CONST objv[])
+                     Tcl_Obj *const objv[])
 {
     traceInfo_pt  infoPtr = (traceInfo_pt) clientData;
     int idx;

diff --git a/generic/tclXdup.c b/generic/tclXdup.c
@@ -34,7 +34,7 @@ static int
 TclX_DupObjCmd (ClientData   clientData,
                 Tcl_Interp  *interp,
                 int          objc,
-                Tcl_Obj     *CONST objv[]);
+                Tcl_Obj     *const objv[]);
 
 
 /*-----------------------------------------------------------------------------
@@ -193,7 +193,7 @@ static int
 TclX_DupObjCmd (ClientData clientData,
                 Tcl_Interp *interp,
                 int objc,
-                Tcl_Obj *CONST objv[])
+                Tcl_Obj *const objv[])
 {
     Tcl_Channel newChannel;
     int bindFnum, fnum;

diff --git a/generic/tclXfcntl.c b/generic/tclXfcntl.c
@@ -85,7 +85,7 @@ static int
 TclX_FcntlObjCmd (ClientData clientData, 
                   Tcl_Interp *interp,
                   int objc,
-                  Tcl_Obj *CONST objv[]);
+                  Tcl_Obj *const objv[]);
 
 
 /*-----------------------------------------------------------------------------
@@ -279,7 +279,7 @@ static int
 TclX_FcntlObjCmd (ClientData clientData,
                   Tcl_Interp *interp,
                   int objc,
-                  Tcl_Obj *CONST objv[])
+                  Tcl_Obj *const objv[])
 {
     Tcl_Channel  channel;
     int          mode;

diff --git a/generic/tclXfilecmds.c b/generic/tclXfilecmds.c
@@ -39,19 +39,19 @@ static int
 TclX_PipeObjCmd (ClientData  clientData,
                  Tcl_Interp *interp,
                  int         objc,
-                 Tcl_Obj    *CONST objv[]);
+                 Tcl_Obj    *const objv[]);
 
 static int
 TclX_FtruncateObjCmd (ClientData  clientData, 
                       Tcl_Interp *interp, 
                       int         objc,
-                      Tcl_Obj    *CONST objv[]);
+                      Tcl_Obj    *const objv[]);
 
 static int
 TclX_ReaddirObjCmd (ClientData clientData,
                     Tcl_Interp *interp,
                     int         objc,
-                    Tcl_Obj    *CONST objv[]);
+                    Tcl_Obj    *const objv[]);
 
 
 /*-----------------------------------------------------------------------------
@@ -67,7 +67,7 @@ static int
 TclX_PipeObjCmd (ClientData  clientData,
                  Tcl_Interp *interp,
                  int         objc,
-                 Tcl_Obj    *CONST objv[])
+                 Tcl_Obj    *const objv[])
 {
     Tcl_Channel   channels [2];
     const char *channelNames [2];
@@ -160,7 +160,7 @@ static int
 TclX_FtruncateObjCmd (ClientData clientData,
                       Tcl_Interp *interp,
                       int objc,
-                      Tcl_Obj *CONST objv[])
+                      Tcl_Obj *const objv[])
 {
     int           objIdx, fileIds;
     off_t         newSize;
@@ -247,7 +247,7 @@ static int
 TclX_ReaddirObjCmd (ClientData clientData,
                     Tcl_Interp *interp,
                     int objc,
-                    Tcl_Obj *CONST objv[])
+                    Tcl_Obj *const objv[])
 {
     Tcl_DString  pathBuf;
     char        *dirPath;

diff --git a/generic/tclXfilescan.c b/generic/tclXfilescan.c
@@ -84,13 +84,13 @@ static int
 TclX_ScancontextObjCmd (ClientData  clientData,
                         Tcl_Interp *interp,
                         int         objc,
-                        Tcl_Obj    *CONST objv[]);
+                        Tcl_Obj    *const objv[]);
 
 static int
 TclX_ScanmatchObjCmd (ClientData  clientData,
                       Tcl_Interp *interp,
                       int         objc,
-                      Tcl_Obj    *CONST objv[]);
+                      Tcl_Obj    *const objv[]);
 
 static void
 CopyFileCloseHandler (ClientData clientData);
@@ -119,7 +119,7 @@ static int
 TclX_ScanfileObjCmd (ClientData  clientData,
                      Tcl_Interp *interp,
                      int         objc,
-                     Tcl_Obj    *CONST objv[]);
+                     Tcl_Obj    *const objv[]);
 
 static void
 FileScanCleanUp (ClientData  clientData,
@@ -331,7 +331,7 @@ static int
 TclX_ScancontextObjCmd (ClientData clientData,
                         Tcl_Interp *interp,
                         int objc,
-                        Tcl_Obj *CONST objv[])
+                        Tcl_Obj *const objv[])
 {
     char *subCommand;
 
@@ -393,7 +393,7 @@ TclX_ScancontextObjCmd (ClientData clientData,
 static int
 TclX_ScanmatchObjCmd (ClientData clientData,
                       Tcl_Interp *interp,
-                      int objc, Tcl_Obj *CONST objv[])
+                      int objc, Tcl_Obj *const objv[])
 {
     scanContext_t  *contextPtr, **tableEntryPtr;
     matchDef_t     *newmatch;
@@ -776,7 +776,7 @@ static int
 TclX_ScanfileObjCmd (ClientData clientData,
                      Tcl_Interp *interp,
                      int objc,
-                     Tcl_Obj *CONST objv[])
+                     Tcl_Obj *const objv[])
 {
     scanContext_t *contextPtr, **tableEntryPtr;
     Tcl_Obj       *contextHandleObj, *fileHandleObj, *copyFileHandleObj;