mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-18 15:21:16 +02:00
Code Releases Activity

49612: avoid startup error with clashing non-local module parameter name

Browse source
This commit is contained in:
Oliver Kiddle 2021-11-30 18:36:57 +01:00
parent b3519a9603
commit ba225155e4
2 changed files with 4 additions and 1 deletions

3
ChangeLog
View file

@ -1,5 +1,8 @@
2021-11-30 Oliver Kiddle <opk@zsh.org> 2021-11-30 Oliver Kiddle <opk@zsh.org>
* 49612: Src/module.c: avoid startup error with clashing non-local
module parameter name
* 49611 based on 49590 (Martijn Dekker): Src/math.c: disable Inf * 49611 based on 49590 (Martijn Dekker): Src/math.c: disable Inf
and NaN in math expressions for sh emulation and NaN in math expressions for sh emulation

2
Src/module.c
View file

@ -1039,7 +1039,7 @@ checkaddparam(const char *nam, int opt_i)
* non-autoloadable parameter already there. This * non-autoloadable parameter already there. This
* is consistent with the way add_auto* functions work. * is consistent with the way add_auto* functions work.
*/ */
if (!opt_i || !pm->level) { if (!opt_i || pm->level) {
zwarn("Can't add module parameter `%s': %s", zwarn("Can't add module parameter `%s': %s",
nam, pm->level ? nam, pm->level ?
"local parameter exists" : "local parameter exists" :