From 1335cbd1d7ec20184eb9bfa2982f58b9beaa701c Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Sun, 7 Aug 2022 15:03:32 +0100 Subject: [PATCH] remove ${.sh.pool} predefined variable entry (re: 3613da42) This entry was doing nothing, because it is another overlooked remnant of the removed libcoshell code. --- src/cmd/ksh93/data/variables.c | 1 - src/cmd/ksh93/include/variables.h | 9 ++++----- src/cmd/ksh93/tests/variables.sh | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/cmd/ksh93/data/variables.c b/src/cmd/ksh93/data/variables.c index 9693f219c..61467aa69 100644 --- a/src/cmd/ksh93/data/variables.c +++ b/src/cmd/ksh93/data/variables.c @@ -97,7 +97,6 @@ const struct shtable2 shtab_variables[] = ".sh.lineno", NV_INTEGER|NV_NOFREE, (char*)0, ".sh.stats", 0, (char*)0, ".sh.math", 0, (char*)0, - ".sh.pool", 0, (char*)0, ".sh.pid", NV_PID|NV_NOFREE, (char*)0, ".sh.ppid", NV_PID|NV_NOFREE, (char*)0, ".sh.tilde", 0, (char*)0, diff --git a/src/cmd/ksh93/include/variables.h b/src/cmd/ksh93/include/variables.h index 989c0e31f..821d86011 100644 --- a/src/cmd/ksh93/include/variables.h +++ b/src/cmd/ksh93/include/variables.h @@ -107,10 +107,9 @@ extern void sh_save_rand_seed(struct rand *, int); #define SH_LINENO (sh.bltin_nodes+59) #define SH_STATS (sh.bltin_nodes+60) #define SH_MATHNOD (sh.bltin_nodes+61) -#define SH_JOBPOOL (sh.bltin_nodes+62) -#define SH_PIDNOD (sh.bltin_nodes+63) -#define SH_PPIDNOD (sh.bltin_nodes+64) -#define SH_TILDENOD (sh.bltin_nodes+65) -#define SHLVL (sh.bltin_nodes+66) +#define SH_PIDNOD (sh.bltin_nodes+62) +#define SH_PPIDNOD (sh.bltin_nodes+63) +#define SH_TILDENOD (sh.bltin_nodes+64) +#define SHLVL (sh.bltin_nodes+65) #endif /* SH_VALNOD */ diff --git a/src/cmd/ksh93/tests/variables.sh b/src/cmd/ksh93/tests/variables.sh index 2c807a88c..6dace72dc 100755 --- a/src/cmd/ksh93/tests/variables.sh +++ b/src/cmd/ksh93/tests/variables.sh @@ -1004,7 +1004,7 @@ set -- $( [[ -n $varname && $varname != '.sh' ]] && print -r -- "$varname" done ) -(($# >= 65)) || err_exit "could not read shtab_variables[]; adjust test script ($# items read)" +(($# >= 64)) || err_exit "could not read shtab_variables[]; adjust test script ($# items read)" # ... unset $SHELL -c '