From 8a3ee5a802a89fd12ddc2741d8ac785bb4169bf4 Mon Sep 17 00:00:00 2001 From: Philippe Altherr Date: Wed, 19 Nov 2025 15:25:29 +0100 Subject: 54093 (tweaked per 54101): Cleanup isarr fields and variables --- Src/Modules/db_gdbm.c | 2 +- Src/Modules/mapfile.c | 2 +- Src/Modules/parameter.c | 10 +++++----- Src/Modules/zutil.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Src/Modules') diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c index 3fefd412b..7d1720de5 100644 --- a/Src/Modules/db_gdbm.c +++ b/Src/Modules/db_gdbm.c @@ -517,7 +517,7 @@ gdbmhashsetfn(Param pm, HashTable ht) int umlen = 0; char *umkey, *umval; - v.isarr = v.flags = v.start = 0; + v.scanflags = v.valflags = v.start = 0; v.end = -1; v.arr = NULL; v.pm = (Param) hn; diff --git a/Src/Modules/mapfile.c b/Src/Modules/mapfile.c index 84cdfea18..78f728385 100644 --- a/Src/Modules/mapfile.c +++ b/Src/Modules/mapfile.c @@ -151,7 +151,7 @@ setpmmapfiles(Param pm, HashTable ht) for (hn = ht->nodes[i]; hn; hn = hn->next) { struct value v; - v.isarr = v.flags = v.start = 0; + v.scanflags = v.valflags = v.start = 0; v.end = -1; v.arr = NULL; v.pm = (Param) hn; diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c index 7441c30b8..10e4ffc5c 100644 --- a/Src/Modules/parameter.c +++ b/Src/Modules/parameter.c @@ -189,7 +189,7 @@ setpmcommands(Param pm, HashTable ht) Cmdnam cn = zshcalloc(sizeof(*cn)); struct value v; - v.isarr = v.flags = v.start = 0; + v.scanflags = v.valflags = v.start = 0; v.end = -1; v.arr = NULL; v.pm = (Param) hn; @@ -359,7 +359,7 @@ setfunctions(Param pm, HashTable ht, int dis) for (hn = ht->nodes[i]; hn; hn = hn->next) { struct value v; - v.isarr = v.flags = v.start = 0; + v.scanflags = v.valflags = v.start = 0; v.end = -1; v.arr = NULL; v.pm = (Param) hn; @@ -969,7 +969,7 @@ setpmoptions(Param pm, HashTable ht) struct value v; char *val; - v.isarr = v.flags = v.start = 0; + v.scanflags = v.valflags = v.start = 0; v.end = -1; v.arr = NULL; v.pm = (Param) hn; @@ -1568,7 +1568,7 @@ setpmnameddirs(Param pm, HashTable ht) struct value v; char *val; - v.isarr = v.flags = v.start = 0; + v.scanflags = v.valflags = v.start = 0; v.end = -1; v.arr = NULL; v.pm = (Param) hn; @@ -1799,7 +1799,7 @@ setaliases(HashTable alht, Param pm, HashTable ht, int flags) struct value v; char *val; - v.isarr = v.flags = v.start = 0; + v.scanflags = v.valflags = v.start = 0; v.end = -1; v.arr = NULL; v.pm = (Param) hn; diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c index a129cc5fe..511436564 100644 --- a/Src/Modules/zutil.c +++ b/Src/Modules/zutil.c @@ -1716,7 +1716,7 @@ zalloc_default_array(char ***aval, char *assoc, int keep, int num) struct value vbuf; Value v = fetchvalue(&vbuf, &assoc, 0, SCANPM_WANTKEYS|SCANPM_WANTVALS|SCANPM_MATCHMANY); - if (v && v->isarr) { + if (v && v->scanflags) { char **dp, **dval = getarrvalue(v); int dnum = (dval ? arrlen(dval) : 0) + 1; *aval = (char **) zalloc(((num * 2) + dnum) * sizeof(char *)); -- cgit v1.2.3-70-g09d2