git: 40908d8bebbc - main - devel/tcllib: update to 1.21
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 May 2022 13:10:46 UTC
The branch main has been updated by gahr:
URL: https://cgit.FreeBSD.org/ports/commit/?id=40908d8bebbc5f3757e771592d477196b1910ab1
commit 40908d8bebbc5f3757e771592d477196b1910ab1
Author: Pietro Cerutti <gahr@FreeBSD.org>
AuthorDate: 2022-05-12 13:08:53 +0000
Commit: Pietro Cerutti <gahr@FreeBSD.org>
CommitDate: 2022-05-12 13:10:41 +0000
devel/tcllib: update to 1.21
Release notes: https://core.tcl-lang.org/tcllib/technote/7a047636411e
---
devel/tcllib/Makefile | 2 +-
devel/tcllib/distinfo | 6 +-
devel/tcllib/files/patch-warnings | 1722 ++++++++++++++++---------------------
devel/tcllib/pkg-plist | 102 ++-
4 files changed, 788 insertions(+), 1044 deletions(-)
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index 04b896389cbb..1bdfdd552a70 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -1,7 +1,7 @@
# Created by: Mikhail Teterin <mi@aldan.algebra.com>
PORTNAME= tcllib
-PORTVERSION= 1.20
+PORTVERSION= 1.21
CATEGORIES= devel tcl
MASTER_SITES= https://core.tcl.tk/tcllib/uv/
diff --git a/devel/tcllib/distinfo b/devel/tcllib/distinfo
index e2ff96cafc8d..e7b82e3fbe82 100644
--- a/devel/tcllib/distinfo
+++ b/devel/tcllib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575275009
-SHA256 (tcllib-1.20.tar.xz) = 199e8ec7ee26220e8463bc84dd55c44965fc8ef4d4ac6e4684b2b1c03b1bd5b9
-SIZE (tcllib-1.20.tar.xz) = 6692664
+TIMESTAMP = 1652338359
+SHA256 (tcllib-1.21.tar.xz) = 10c7749e30fdd6092251930e8a1aa289b193a3b7f1abf17fee1d4fa89814762f
+SIZE (tcllib-1.21.tar.xz) = 6467488
diff --git a/devel/tcllib/files/patch-warnings b/devel/tcllib/files/patch-warnings
index 38276e544816..dcbbf3bf52d9 100644
--- a/devel/tcllib/files/patch-warnings
+++ b/devel/tcllib/files/patch-warnings
@@ -1,6 +1,17 @@
---- modules/md5/md5.c.orig 2016-02-04 05:14:14 UTC
-+++ modules/md5/md5.c
-@@ -115,7 +115,7 @@ MD5_CTX *mdContext;
+--- ./modules/rc4/rc4c.tcl.orig 2021-10-28 21:08:34.000000000 +0000
++++ ./modules/rc4/rc4c.tcl 2022-05-12 07:00:35.590698000 +0000
+@@ -20,6 +20,8 @@
+ namespace eval ::rc4 {
+
+ critcl::ccode {
++ #include <string.h>
++
+ #include <string.h>
+
+ typedef struct RC4_CTX {
+--- ./modules/md5/md5.c.orig 2019-08-23 04:55:08.000000000 +0000
++++ ./modules/md5/md5.c 2022-05-12 07:00:35.560242000 +0000
+@@ -115,7 +115,7 @@
in the message whose digest is being computed.
*/
void MD5Update (mdContext, inBuf, inLen)
@@ -9,9 +20,9 @@
unsigned int inLen;
{
register int i, ii;
---- modules/md5/md5.h.orig 2016-02-04 05:14:14 UTC
-+++ modules/md5/md5.h
-@@ -59,7 +59,7 @@ typedef struct {
+--- ./modules/md5/md5.h.orig 2019-08-23 04:55:08.000000000 +0000
++++ ./modules/md5/md5.h 2022-05-12 07:00:35.560779000 +0000
+@@ -59,7 +59,7 @@
} MD5_CTX;
void MD5Init (MD5_CTX *mdContext);
@@ -20,224 +31,467 @@
void MD5Final (unsigned char digest[16], MD5_CTX *mdContext);
void Transform (UINT4 *buf, UINT4 *in);
---- modules/md5crypt/md5cryptc.tcl.orig 2016-02-04 05:14:14 UTC
-+++ modules/md5crypt/md5cryptc.tcl
-@@ -57,8 +57,9 @@ namespace eval ::md5crypt {
- const char *salt,
- const char *magic)
- {
-- static char passwd[120], *p;
-- static const unsigned char *sp,*ep;
-+ static char passwd[120];
-+ char *p;
-+ const unsigned char *sp,*ep;
- unsigned char final[16];
- int sl,pl,i;
- MD5_CTX ctx,ctx1;
-@@ -113,7 +114,7 @@ namespace eval ::md5crypt {
- }
-
- /* Now make the output string */
-- snprintf(passwd, sizeof(passwd), "%s%.*s$", (char *)magic,
-+ p = passwd + snprintf(passwd, sizeof(passwd), "%s%.*s$", (char *)magic,
- sl, (const char *)sp);
-
- MD5Final(final,&ctx);
-@@ -143,8 +144,6 @@ namespace eval ::md5crypt {
- MD5Final(final,&ctx1);
- }
+--- ./modules/struct/tree/ms.c.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/tree/ms.c 2022-05-12 07:00:40.010342000 +0000
+@@ -312,7 +312,7 @@
+ M_NODES, M_NUMCHILDREN, M_PARENT, M_PREVIOUS, M_RENAME,
+ M_ROOTNAME, M_SERIALIZE, M_SET, M_SIZE, M_SPLICE,
+ M_SWAP, M_UNSET, M_WALK, M_WALKPROC
+- };
++ } method;
-- p = passwd + strlen(passwd);
--
- l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4;
- l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4;
- l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
---- modules/pt/pt_cparam_config_critcl.tcl.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/pt_cparam_config_critcl.tcl
-@@ -114,6 +114,8 @@ proc ::pt::cparam::configuration::critcl
- critcl::ccode {
- /* -*- c -*- */
+ if (objc < 2) {
+ Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+@@ -326,7 +326,7 @@
+ * the requested functionality
+ */
-+ #include <stdint.h>
-+ #include <stdlib.h>
- #include <string.h>
- #define SCOPE static
+- switch (m) {
++ switch (method = m) {
+ case M_TASSIGN: return tm_TASSIGN (t, interp, objc, objv);
+ case M_TSET: return tm_TSET (t, interp, objc, objv);
+ case M_ANCESTORS: return tm_ANCESTORS (t, interp, objc, objv);
+--- ./modules/struct/tree/util.c.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/tree/util.c 2022-05-12 07:00:40.012345000 +0000
+@@ -77,7 +77,7 @@
+ /* Delete all items in the list.
+ */
---- modules/pt/pt_cparam_config_tea.tcl.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/pt_cparam_config_tea.tcl
-@@ -94,6 +94,7 @@ proc ::pt::cparam::configuration::tea::d
- * * ** *** ***** ******** ************* *********************/
- #include <string.h>
- #include <tcl.h>
-+ #include <stdint.h>
- #include <stdlib.h>
- #include <ctype.h>
- #define SCOPE static
---- modules/pt/pt_parse_peg_c.tcl.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/pt_parse_peg_c.tcl
-@@ -45,6 +45,8 @@ namespace eval ::pt::parse {
- critcl::ccode {
- /* -*- c -*- */
+-void*
++void
+ nlq_clear (NLQ* q)
+ {
+ NL* next;
+--- ./modules/struct/tree/util.h.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/tree/util.h 2022-05-12 07:00:40.012741000 +0000
+@@ -52,7 +52,7 @@
+ void nlq_append (NLQ* q, void* n);
+ void nlq_push (NLQ* q, void* n);
+ void* nlq_pop (NLQ* q);
+-void* nlq_clear (NLQ* q);
++void nlq_clear (NLQ* q);
-+ #include <stdint.h>
-+ #include <stdlib.h>
- #include <string.h>
- #define SCOPE static
+ #endif /* _UTIL_H */
+
+--- ./modules/struct/tree/walk.c.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/struct/tree/walk.c 2022-05-12 07:00:40.013310000 +0000
+@@ -1,8 +1,9 @@
-@@ -896,7 +898,7 @@ namespace eval ::pt::parse {
- p->ER->loc = p->CL;
- p->ER->msg = rde_stack_new (NULL);
- ASSERT_BOUNDS(s,p->numstr);
-- rde_stack_push (p->ER->msg, (void*) s);
-+ rde_stack_push (p->ER->msg, (void*)(intptr_t)s);
- }
- static void
- error_state_free (void* esx)
-@@ -986,7 +988,7 @@ namespace eval ::pt::parse {
- hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL);
- if (!hPtr) { return 0; }
- tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
-- hPtr = Tcl_FindHashEntry (tablePtr, (char*) s);
-+ hPtr = Tcl_FindHashEntry (tablePtr, (void *)(intptr_t)s);
- if (!hPtr) { return 0; }
-
- scs = Tcl_GetHashValue (hPtr);
-@@ -1002,7 +1004,7 @@ namespace eval ::pt::parse {
- SCOPE void
- rde_param_i_symbol_save (RDE_PARAM p, long int s)
- {
-- long int at = (long int) rde_stack_top (p->LS);
-+ intptr_t at = (intptr_t)rde_stack_top (p->LS);
- NC_STATE* scs;
- Tcl_HashEntry* hPtr;
- Tcl_HashTable* tablePtr;
-@@ -1011,7 +1013,7 @@ namespace eval ::pt::parse {
- TRACE (("RDE_PARAM %p",p));
- TRACE (("INT %d",s));
-
-- hPtr = Tcl_CreateHashEntry (&p->NC, (char*) at, &isnew);
-+ hPtr = Tcl_CreateHashEntry (&p->NC, (void*) at, &isnew);
- if (isnew) {
- tablePtr = ALLOC (Tcl_HashTable);
- Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS);
-@@ -1019,7 +1021,7 @@ namespace eval ::pt::parse {
- } else {
- tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
- }
-- hPtr = Tcl_CreateHashEntry (tablePtr, (char*) s, &isnew);
-+ hPtr = Tcl_CreateHashEntry (tablePtr, (void*)(intptr_t)s, &isnew);
- if (isnew) {
-
- scs = ALLOC (NC_STATE);
-@@ -1169,12 +1171,14 @@ namespace eval ::pt::parse {
- static int
- UniCharIsHexDigit (int character)
- {
-- return (character >= 0) && (character < 0x80) && isxdigit(character);
-+ return UniCharIsDecDigit(character) ||
-+ (character >= 'a' && character <= 'f') ||
-+ (character >= 'A' && character <= 'F');
- }
- static int
- UniCharIsDecDigit (int character)
- {
-- return (character >= 0) && (character < 0x80) && isdigit(character);
-+ return (character >= '0') && (character <= '9');
- }
- SCOPE void
- rde_param_i_value_clear (RDE_PARAM p)
-@@ -4727,7 +4731,7 @@ namespace eval ::pt::parse {
- /* -*- c -*- */
++#include <stdint.h>
+ #include <string.h>
+-#include "tcl.h"
+-#include <t.h>
+-#include <util.h>
++#include <tcl.h>
++#include "t.h"
++#include "util.h"
- typedef struct PARSERg {
-- long int counter;
-+ size_t counter;
- char buf [50];
- } PARSERg;
+ /* .................................................. */
-@@ -4755,7 +4759,7 @@ namespace eval ::pt::parse {
+--- ./modules/struct/sets/m.c.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/sets/m.c 2022-05-12 07:00:40.005832000 +0000
+@@ -80,7 +80,7 @@
+ s_get (interp, val, &vs);
}
- parserg->counter ++;
-- sprintf (parserg->buf, "peg%ld", parserg->counter);
-+ sprintf (parserg->buf, "peg%td", parserg->counter);
- return parserg->buf;
- #undef KEY
+- (void*) Tcl_CreateHashEntry(&vs->el, key, &new);
++ Tcl_CreateHashEntry(&vs->el, key, &new);
+ nx = 1;
}
---- modules/pt/pt_rdengine_c.tcl.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/pt_rdengine_c.tcl
-@@ -48,7 +48,7 @@ namespace eval ::pt {
- */
-
- typedef struct PARAMg {
-- long int counter;
-+ size_t counter;
- char buf [50];
- } PARAMg;
-
-@@ -76,7 +76,7 @@ namespace eval ::pt {
- }
-
- paramg->counter ++;
-- sprintf (paramg->buf, "rde%ld", paramg->counter);
-+ sprintf (paramg->buf, "rde%td", paramg->counter);
- return paramg->buf;
+ if (nx) {
+--- ./modules/struct/sets/s.c.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/sets/s.c 2022-05-12 07:00:40.006303000 +0000
+@@ -293,7 +293,7 @@
+ if (Tcl_FindHashEntry (&b->el, key) != NULL) continue;
+ /* key is in a, not in b <=> in (a-b) */
- #undef KEY
---- modules/pt/rde_critcl/p.c.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/rde_critcl/p.c
-@@ -2,9 +2,10 @@
- * (c) PARAM functions
- */
+- (void*) Tcl_CreateHashEntry(&s->el, key, &new);
++ Tcl_CreateHashEntry(&s->el, key, &new);
+ }
--#include <pInt.h> /* Our public and internal APIs */
--#include <util.h> /* Allocation macros */
-+#include <stdint.h>
- #include <string.h>
-+#include "pInt.h" /* Our public and internal APIs */
-+#include "util.h" /* Allocation macros */
+ return s;
+@@ -329,7 +329,7 @@
+ if (Tcl_FindHashEntry (&b->el, key) == NULL) continue;
+ /* key is in a, in b <=> in (a*b) */
- /* .................................................. */
+- (void*) Tcl_CreateHashEntry(&s->el, key, &new);
++ Tcl_CreateHashEntry(&s->el, key, &new);
+ }
-@@ -132,7 +133,7 @@ param_intern (RDE_STATE p, const char* l
- hPtr = Tcl_CreateHashEntry(&p->str, literal, &isnew);
- ASSERT (isnew, "Should have found entry");
+ return s;
+@@ -365,7 +365,7 @@
+ he != NULL;
+ he = Tcl_NextHashEntry(&hs)) {
+ key = Tcl_GetHashKey (&b->el, he);
+- (void*) Tcl_CreateHashEntry(&a->el, key, &new);
++ Tcl_CreateHashEntry(&a->el, key, &new);
+ if (new) {nx = 1;}
+ }
+ }
+@@ -377,7 +377,7 @@
+ {
+ int new;
-- Tcl_SetHashValue (hPtr, p->numstr);
-+ Tcl_SetHashValue (hPtr, (intptr_t)p->numstr);
+- (void*) Tcl_CreateHashEntry(&a->el, item, &new);
++ Tcl_CreateHashEntry(&a->el, item, &new);
+ }
- if (p->numstr >= p->maxnum) {
- long int new;
---- modules/pt/rde_critcl/param.c.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/rde_critcl/param.c
-@@ -3,11 +3,13 @@
- * == pt::rde (critcl) - Data Structures - PARAM architectural state.
+ void
+--- ./modules/struct/graph/ds.h.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/graph/ds.h 2022-05-12 07:00:35.592738000 +0000
+@@ -160,7 +160,7 @@
*/
--#include <param.h> /* Public and private APIs */
--#include <stack.h> /* Stack handling */
--#include <tc.h> /* Token cache handling */
--#include <util.h> /* Allocation utilities */
-+#include <stdint.h>
-+#include <stdlib.h>
- #include <string.h>
-+#include "param.h" /* Public and private APIs */
-+#include "stack.h" /* Stack handling */
-+#include "tc.h" /* Token cache handling */
-+#include "util.h" /* Allocation utilities */
-
- /*
- * = = == === ===== ======== ============= =====================
-@@ -670,7 +672,7 @@ error_set (RDE_PARAM p, long int s)
-
- ASSERT_BOUNDS(s,p->numstr);
+ typedef struct GG {
+- long int counter; /* Graph id generator */
++ size_t counter; /* Graph id generator */
+ char buf [50]; /* Buffer for handle construction */
+ } GG;
-- rde_stack_push (p->ER->msg, (void*) s);
-+ rde_stack_push (p->ER->msg, (void*)(intptr_t)s);
+--- ./modules/struct/graph/filter.c.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/struct/graph/filter.c 2022-05-12 07:00:35.593586000 +0000
+@@ -261,13 +261,12 @@
+ (na->mode == NA_NONE)) {
+ filter_none (interp, gx, &l);
+ } else {
+- if (na->mode != NA_NONE) {
+- if (nodes) {
+- filter_mode_n (na->mode, gx, &l, na->nc, na->nv, g);
+- } else {
+- filter_mode_a (na->mode, gx, &l, na->nc, na->nv, g);
+- }
++ if (nodes) {
++ filter_mode_n (na->mode, gx, &l, na->nc, na->nv, g);
++ } else {
++ filter_mode_a (na->mode, gx, &l, na->nc, na->nv, g);
+ }
++
+ if (na->key && na->value) {
+ filter_kv (interp, gx, &l, gf, g, na->key, na->value);
+ } else if (na->key) {
+@@ -332,6 +331,7 @@
+ case NA_IN: filter_mode_a_in (gx, l, nc, nv, g); break;
+ case NA_INNER: filter_mode_a_inn (gx, l, nc, nv, g); break;
+ case NA_OUT: filter_mode_a_out (gx, l, nc, nv, g); break;
++ case NA_NONE: /* nothing */;
+ }
+ }
+
+@@ -592,6 +592,7 @@
+ case NA_IN: filter_mode_n_in (gx, l, nc, nv, g); break;
+ case NA_INNER: filter_mode_n_inn (gx, l, nc, nv, g); break;
+ case NA_OUT: filter_mode_n_out (gx, l, nc, nv, g); break;
++ case NA_NONE: /* nothing */;
+ }
+ }
+
+--- ./modules/struct/graph/graph.c.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/struct/graph/graph.c 2022-05-12 07:00:35.594881000 +0000
+@@ -2,12 +2,13 @@
+ * (c) Graph functions
+ */
+
+-#include <arc.h>
+-#include <attr.h>
+-#include <graph.h>
+-#include <node.h>
+-#include <objcmd.h>
+-#include <util.h>
++#include <stdint.h>
++#include "arc.h"
++#include "attr.h"
++#include "graph.h"
++#include "node.h"
++#include "objcmd.h"
++#include "util.h"
+
+ /* .................................................. */
+
+--- ./modules/struct/graph/objcmd.c.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/graph/objcmd.c 2022-05-12 07:00:40.002398000 +0000
+@@ -40,7 +40,7 @@
+ M_DESTROY, M_GET, M_GETALL, M_KEYEXISTS, M_KEYS, M_LAPPEND,
+ M_NODE, M_NODES, M_SERIALIZE, M_SET, M_SWAP, M_UNSET,
+ M_WALK
+- };
++ } method;
+
+ static CONST char* a_methods [] = {
+ "append", "attr", "delete", "exists", "flip",
+@@ -57,7 +57,7 @@
+ MA_MOVE_SOURCE, MA_MOVE_TARGET, MA_NODES, MA_RENAME, MA_SET, MA_SETUNWEIGHTED,
+ MA_SETWEIGHT, MA_SOURCE, MA_TARGET, MA_UNSET, MA_UNSETWEIGHT,
+ MA_WEIGHTS
+- };
++ } a_method;
+
+ static CONST char* n_methods [] = {
+ "append", "attr", "degree", "delete", "exists",
+@@ -69,7 +69,7 @@
+ MN_APPEND, MN_ATTR, MN_DEGREE, MN_DELETE, MN_EXISTS,
+ MN_GET, MN_GETALL, MN_INSERT, MN_KEYEXISTS, MN_KEYS,
+ MN_LAPPEND, MN_OPPOSITE, MN_RENAME, MN_SET, MN_UNSET
+- };
++ } n_method;
+
+ if (objc < 2) {
+ Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+@@ -83,7 +83,7 @@
+ * the requested functionality
+ */
+
+- switch (m) {
++ switch (method = m) {
+ case M_GSET: return gm_GSET (g, interp, objc, objv);
+ case M_GASSIGN: return gm_GASSIGN (g, interp, objc, objv);
+ case M_APPEND: return gm_APPEND (g, interp, objc, objv);
+@@ -95,7 +95,7 @@
+ 0, &m) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- switch (m) {
++ switch (a_method = m) {
+ case MA_APPEND: return gm_arc_APPEND (g, interp, objc, objv);
+ case MA_ATTR: return gm_arc_ATTR (g, interp, objc, objv);
+ case MA_DELETE: return gm_arc_DELETE (g, interp, objc, objv);
+@@ -141,7 +141,7 @@
+ 0, &m) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- switch (m) {
++ switch (n_method = m) {
+ case MN_APPEND: return gm_node_APPEND (g, interp, objc, objv);
+ case MN_ATTR: return gm_node_ATTR (g, interp, objc, objv);
+ case MN_DEGREE: return gm_node_DEGREE (g, interp, objc, objv);
+--- ./modules/struct/graph/util.c.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/graph/util.c 2022-05-12 07:00:40.002840000 +0000
+@@ -77,7 +77,7 @@
+ /* Delete all items in the list.
+ */
+
+-void*
++void
+ g_nlq_clear (NLQ* q)
+ {
+ NL* next;
+--- ./modules/struct/graph/util.h.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/graph/util.h 2022-05-12 07:00:40.003195000 +0000
+@@ -53,7 +53,7 @@
+ void g_nlq_append (NLQ* q, void* n);
+ void g_nlq_push (NLQ* q, void* n);
+ void* g_nlq_pop (NLQ* q);
+-void* g_nlq_clear (NLQ* q);
++void g_nlq_clear (NLQ* q);
+
+ #endif /* _G_UTIL_H */
+
+--- ./modules/struct/graph/walk.c.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/struct/graph/walk.c 2022-05-12 07:00:40.003767000 +0000
+@@ -1,9 +1,9 @@
+
+-#include "tcl.h"
+ #include <string.h>
+-#include <graph.h>
+-#include <util.h>
+-#include <walk.h>
++#include <tcl.h>
++#include "graph.h"
++#include "util.h"
++#include "walk.h"
+
+ /* .................................................. */
+
+@@ -23,7 +23,7 @@
+ static int walk_invoke (Tcl_Interp* interp, GN* n,
+ int cc, Tcl_Obj** ev, Tcl_Obj* action);
+
+-static int walk_neighbours (GN* n, Tcl_HashTable* v, int dir,
++static void walk_neighbours (GN* n, Tcl_HashTable* v, int dir,
+ int* nc, GN*** nv);
+
+ /* .................................................. */
+@@ -288,7 +288,7 @@
+
+ /* .................................................. */
+
+-static int
++static void
+ walk_neighbours (GN* n, Tcl_HashTable* vn, int dir,
+ int* nc, GN*** nv)
+ {
+--- ./modules/struct/queue/ms.c.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/queue/ms.c 2022-05-12 07:00:40.004897000 +0000
+@@ -41,7 +41,7 @@
+ M_CLEAR, M_DESTROY, M_GET,
+ M_PEEK, M_PUT, M_SIZE,
+ M_UNGET
+- };
++ } method;
+
+ if (objc < 2) {
+ Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+@@ -55,7 +55,7 @@
+ * the requested functionality
+ */
+
+- switch (m) {
++ switch (method = m) {
+ case M_CLEAR: return qum_CLEAR (q, interp, objc, objv);
+ case M_DESTROY: return qum_DESTROY (q, interp, objc, objv);
+ case M_GET: return qum_PEEK (q, interp, objc, objv, 1 /* get */);
+--- ./modules/struct/stack/ms.c.orig 2019-08-23 04:55:09.000000000 +0000
++++ ./modules/struct/stack/ms.c 2022-05-12 07:00:40.007279000 +0000
+@@ -39,7 +39,7 @@
+ enum methods {
+ M_CLEAR, M_DESTROY, M_GET, M_GETR, M_PEEK, M_PEEKR,
+ M_POP, M_PUSH, M_ROTATE, M_SIZE, M_TRIM, M_TRIMV
+- };
++ } method;
+
+ if (objc < 2) {
+ Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?");
+@@ -53,7 +53,7 @@
+ * the requested functionality
+ */
+
+- switch (m) {
++ switch (method = m) {
+ case M_CLEAR: return stm_CLEAR (s, interp, objc, objv);
+ case M_DESTROY: return stm_DESTROY (s, interp, objc, objv);
+ case M_GET: return stm_GET (s, interp, objc, objv, 0 ); /* get */
+--- ./modules/struct/queue_c.tcl.orig 2021-10-28 21:08:34.000000000 +0000
++++ ./modules/struct/queue_c.tcl 2022-05-12 07:00:40.004223000 +0000
+@@ -35,7 +35,7 @@
+ */
+
+ typedef struct QDg {
+- long int counter;
++ size_t counter;
+ char buf [50];
+ } QDg;
+
+--- ./modules/struct/sets_c.tcl.orig 2021-10-28 20:35:34.000000000 +0000
++++ ./modules/struct/sets_c.tcl 2022-05-12 07:00:40.005270000 +0000
+@@ -53,7 +53,7 @@
+ S_equal,S_exclude, S_include, S_intersect,
+ S_intersect3, S_size, S_subsetof, S_subtract,
+ S_symdiff, S_union
+- };
++ } method;
+
+ int m;
+
+@@ -69,7 +69,7 @@
+ * the requested functionality
+ */
+
+- switch (m) {
++ switch (method = m) {
+ case S_add: return sm_ADD (NULL, interp, objc, objv);
+ case S_contains: return sm_CONTAINS (NULL, interp, objc, objv);
+ case S_difference: return sm_DIFFERENCE (NULL, interp, objc, objv);
+--- ./modules/struct/stack_c.tcl.orig 2021-10-28 21:08:34.000000000 +0000
++++ ./modules/struct/stack_c.tcl 2022-05-12 07:00:40.006760000 +0000
+@@ -40,7 +40,7 @@
+ */
+
+ typedef struct SDg {
+- long int counter;
++ size_t counter;
+ char buf [50];
+ } SDg;
+
+--- ./modules/struct/tree_c.tcl.orig 2021-10-28 21:08:34.000000000 +0000
++++ ./modules/struct/tree_c.tcl 2022-05-12 07:00:40.007725000 +0000
+@@ -41,7 +41,7 @@
+ */
+
+ typedef struct TDg {
+- long int counter;
++ size_t counter;
+ char buf [50];
+ } TDg;
+
+--- ./modules/sha1/sha1c.tcl.orig 2022-05-03 18:53:00.000000000 +0000
++++ ./modules/sha1/sha1c.tcl 2022-05-12 07:00:35.591089000 +0000
+@@ -32,8 +32,7 @@
+ static void
+ sha1_free_rep(Tcl_Obj* obj)
+ {
+- SHA1_CTX* mp = (SHA1_CTX*) obj->internalRep.otherValuePtr;
+- Tcl_Free ((char*)mp);
++ Tcl_Free(obj->internalRep.otherValuePtr);
+ }
+
+ static void
+--- ./modules/md5crypt/md5cryptc.tcl.orig 2021-10-28 21:08:52.000000000 +0000
++++ ./modules/md5crypt/md5cryptc.tcl 2022-05-12 07:00:35.561245000 +0000
+@@ -57,8 +57,9 @@
+ const char *salt,
+ const char *magic)
+ {
+- static char passwd[120], *p;
+- static const unsigned char *sp,*ep;
++ static char passwd[120];
++ char *p;
++ const unsigned char *sp,*ep;
+ unsigned char final[16];
+ int sl,pl,i;
+ MD5_CTX ctx,ctx1;
+@@ -113,7 +114,7 @@
+ }
+
+ /* Now make the output string */
+- snprintf(passwd, sizeof(passwd), "%s%.*s$", (char *)magic,
++ p = passwd + snprintf(passwd, sizeof(passwd), "%s%.*s$", (char *)magic,
+ sl, (const char *)sp);
+
+ MD5Final(final,&ctx);
+@@ -143,8 +144,6 @@
+ MD5Final(final,&ctx1);
+ }
+
+- p = passwd + strlen(passwd);
+-
+ l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4;
+ l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4;
+ l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
+--- ./modules/pt/rde_critcl/p.c.orig 2019-08-23 04:55:08.000000000 +0000
++++ ./modules/pt/rde_critcl/p.c 2022-05-12 07:00:35.565397000 +0000
+@@ -2,9 +2,10 @@
+ * (c) PARAM functions
+ */
+
+-#include <pInt.h> /* Our public and internal APIs */
+-#include <util.h> /* Allocation macros */
++#include <stdint.h>
+ #include <string.h>
++#include "pInt.h" /* Our public and internal APIs */
++#include "util.h" /* Allocation macros */
+
+ /* .................................................. */
+
+@@ -132,7 +133,7 @@
+ hPtr = Tcl_CreateHashEntry(&p->str, literal, &isnew);
+ ASSERT (isnew, "Should have found entry");
+
+- Tcl_SetHashValue (hPtr, p->numstr);
++ Tcl_SetHashValue (hPtr, (intptr_t)p->numstr);
+
+ if (p->numstr >= p->maxnum) {
+ long int new;
+--- ./modules/pt/rde_critcl/param.c.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/pt/rde_critcl/param.c 2022-05-12 07:00:35.566472000 +0000
+@@ -672,7 +672,7 @@
+
+ ASSERT_BOUNDS(s,p->numstr);
+
+- rde_stack_push (p->ER->msg, (void*) s);
++ rde_stack_push (p->ER->msg, (void*)(intptr_t)s);
}
static void
-@@ -820,7 +822,7 @@ rde_param_i_symbol_restore (RDE_PARAM p,
+@@ -822,7 +822,7 @@
if (!hPtr) { return 0; }
tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
@@ -246,7 +500,7 @@
if (!hPtr) { return 0; }
/*
-@@ -861,7 +863,7 @@ rde_param_i_symbol_save (RDE_PARAM p, lo
+@@ -863,7 +863,7 @@
* 2-level hash table keyed by location, and symbol ...
*/
@@ -255,7 +509,7 @@
if (isnew) {
tablePtr = ALLOC (Tcl_HashTable);
-@@ -871,7 +873,7 @@ rde_param_i_symbol_save (RDE_PARAM p, lo
+@@ -873,7 +873,7 @@
tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
}
@@ -264,7 +518,7 @@
if (isnew) {
/*
-@@ -1071,13 +1073,15 @@ UniCharIsAscii (int character)
+@@ -1073,13 +1073,15 @@
static int
UniCharIsHexDigit (int character)
{
@@ -282,8 +536,8 @@
}
/*
---- modules/pt/rde_critcl/param.h.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/rde_critcl/param.h
+--- ./modules/pt/rde_critcl/param.h.orig 2019-08-23 04:55:08.000000000 +0000
++++ ./modules/pt/rde_critcl/param.h 2022-05-12 07:00:35.567038000 +0000
@@ -9,6 +9,7 @@
#include "tcl.h"
#include <util.h> /* Scoping */
@@ -292,18 +546,18 @@
/*
* The state structure is opaque, its internals are known only to the
---- modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic
-@@ -45,6 +45,8 @@ namespace eval ::PARSER {
+--- ./modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic 2022-05-12 07:00:35.568151000 +0000
+@@ -45,6 +45,8 @@
critcl::ccode {
/* -*- c -*- */
+ #include <stdint.h>
+ #include <stdlib.h>
#include <string.h>
- #define SCOPE static
-
-@@ -896,7 +898,7 @@ namespace eval ::PARSER {
+ #include <ctype.h> /* is... */
+ #include <stdlib.h> /* qsort */
+@@ -898,7 +900,7 @@
p->ER->loc = p->CL;
p->ER->msg = rde_stack_new (NULL);
ASSERT_BOUNDS(s,p->numstr);
@@ -312,7 +566,7 @@
}
static void
error_state_free (void* esx)
-@@ -986,7 +988,7 @@ namespace eval ::PARSER {
+@@ -988,7 +990,7 @@
hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL);
if (!hPtr) { return 0; }
tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
@@ -321,7 +575,7 @@
if (!hPtr) { return 0; }
scs = Tcl_GetHashValue (hPtr);
-@@ -1011,7 +1013,7 @@ namespace eval ::PARSER {
+@@ -1013,7 +1015,7 @@
TRACE (("RDE_PARAM %p",p));
TRACE (("INT %d",s));
@@ -330,7 +584,7 @@
if (isnew) {
tablePtr = ALLOC (Tcl_HashTable);
Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS);
-@@ -1019,7 +1021,7 @@ namespace eval ::PARSER {
+@@ -1021,7 +1023,7 @@
} else {
tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
}
@@ -339,7 +593,7 @@
if (isnew) {
scs = ALLOC (NC_STATE);
-@@ -1169,12 +1171,14 @@ namespace eval ::PARSER {
+@@ -1171,12 +1173,14 @@
static int
UniCharIsHexDigit (int character)
{
@@ -356,18 +610,18 @@
}
SCOPE void
rde_param_i_value_clear (RDE_PARAM p)
---- modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead
-@@ -45,6 +45,8 @@ namespace eval ::PARSER {
+--- ./modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead 2022-05-12 07:00:35.569227000 +0000
+@@ -45,6 +45,8 @@
critcl::ccode {
/* -*- c -*- */
+ #include <stdint.h>
+ #include <stdlib.h>
#include <string.h>
- #define SCOPE static
-
-@@ -896,7 +898,7 @@ namespace eval ::PARSER {
+ #include <ctype.h> /* is... */
+ #include <stdlib.h> /* qsort */
+@@ -898,7 +900,7 @@
p->ER->loc = p->CL;
p->ER->msg = rde_stack_new (NULL);
ASSERT_BOUNDS(s,p->numstr);
@@ -376,7 +630,7 @@
}
static void
error_state_free (void* esx)
-@@ -986,7 +988,7 @@ namespace eval ::PARSER {
+@@ -988,7 +990,7 @@
hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL);
if (!hPtr) { return 0; }
tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
@@ -385,7 +639,7 @@
if (!hPtr) { return 0; }
scs = Tcl_GetHashValue (hPtr);
-@@ -1011,7 +1013,7 @@ namespace eval ::PARSER {
+@@ -1013,7 +1015,7 @@
TRACE (("RDE_PARAM %p",p));
TRACE (("INT %d",s));
@@ -394,7 +648,7 @@
if (isnew) {
tablePtr = ALLOC (Tcl_HashTable);
Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS);
-@@ -1019,7 +1021,7 @@ namespace eval ::PARSER {
+@@ -1021,7 +1023,7 @@
} else {
tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
}
@@ -403,7 +657,7 @@
if (isnew) {
scs = ALLOC (NC_STATE);
-@@ -1169,12 +1171,14 @@ namespace eval ::PARSER {
+@@ -1171,12 +1173,14 @@
static int
UniCharIsHexDigit (int character)
{
@@ -420,18 +674,18 @@
}
SCOPE void
rde_param_i_value_clear (RDE_PARAM p)
---- modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon
-@@ -45,6 +45,8 @@ namespace eval ::PARSER {
+--- ./modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon 2022-05-12 07:00:35.570230000 +0000
+@@ -45,6 +45,8 @@
critcl::ccode {
/* -*- c -*- */
+ #include <stdint.h>
+ #include <stdlib.h>
#include <string.h>
- #define SCOPE static
-
-@@ -896,7 +898,7 @@ namespace eval ::PARSER {
+ #include <ctype.h> /* is... */
+ #include <stdlib.h> /* qsort */
+@@ -898,7 +900,7 @@
p->ER->loc = p->CL;
p->ER->msg = rde_stack_new (NULL);
ASSERT_BOUNDS(s,p->numstr);
@@ -440,7 +694,7 @@
}
static void
error_state_free (void* esx)
-@@ -986,7 +988,7 @@ namespace eval ::PARSER {
+@@ -988,7 +990,7 @@
hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL);
if (!hPtr) { return 0; }
tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
@@ -449,7 +703,7 @@
if (!hPtr) { return 0; }
scs = Tcl_GetHashValue (hPtr);
-@@ -1011,7 +1013,7 @@ namespace eval ::PARSER {
+@@ -1013,7 +1015,7 @@
TRACE (("RDE_PARAM %p",p));
TRACE (("INT %d",s));
@@ -458,7 +712,7 @@
if (isnew) {
tablePtr = ALLOC (Tcl_HashTable);
Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS);
-@@ -1019,7 +1021,7 @@ namespace eval ::PARSER {
+@@ -1021,7 +1023,7 @@
} else {
tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr);
}
@@ -467,7 +721,7 @@
if (isnew) {
scs = ALLOC (NC_STATE);
-@@ -1169,12 +1171,14 @@ namespace eval ::PARSER {
+@@ -1171,12 +1173,14 @@
static int
UniCharIsHexDigit (int character)
{
@@ -484,18 +738,18 @@
}
SCOPE void
rde_param_i_value_clear (RDE_PARAM p)
---- modules/pt/tests/data/ok/peg_cparam-critcl/1_functions.orig 2016-02-04 05:14:14 UTC
-+++ modules/pt/tests/data/ok/peg_cparam-critcl/1_functions
-@@ -45,6 +45,8 @@ namespace eval ::PARSER {
+--- ./modules/pt/tests/data/ok/peg_cparam-critcl/1_functions.orig 2021-04-14 16:57:28.000000000 +0000
++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/1_functions 2022-05-12 07:00:35.571208000 +0000
+@@ -45,6 +45,8 @@
critcl::ccode {
/* -*- c -*- */
+ #include <stdint.h>
+ #include <stdlib.h>
#include <string.h>
- #define SCOPE static
-
-@@ -896,7 +898,7 @@ namespace eval ::PARSER {
+ #include <ctype.h> /* is... */
*** 1858 LINES SKIPPED ***