diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-12-04 10:44:33 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-12-04 10:44:33 +0000 |
| commit | e40a14c5e4f24f45446e47176c699c586c46d624 (patch) | |
| tree | b7b7b720c372e0cc5726982d2c138ed8cdbab5ac /Src/params.c | |
| parent | 04479a56e09b92b893230c715e434f95e77c09b5 (diff) | |
| download | zsh-e40a14c5e4f24f45446e47176c699c586c46d624.tar.gz zsh-e40a14c5e4f24f45446e47176c699c586c46d624.zip | |
37202: suppress WARN_CREATE_GLOBAL warnings after a fork
Diffstat (limited to 'Src/params.c')
| -rw-r--r-- | Src/params.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Src/params.c b/Src/params.c index 142697f20..aed72d447 100644 --- a/Src/params.c +++ b/Src/params.c @@ -2868,7 +2868,7 @@ mod_export Param setsparam(char *s, char *val) { return assignsparam( - s, val, isset(WARNCREATEGLOBAL) && locallevel > 0 ? + s, val, isset(WARNCREATEGLOBAL) && locallevel > forklevel ? ASSPM_WARN_CREATE : 0); } @@ -2966,7 +2966,7 @@ mod_export Param setaparam(char *s, char **aval) { return assignaparam( - s, aval, isset(WARNCREATEGLOBAL) && locallevel >0 ? + s, aval, isset(WARNCREATEGLOBAL) && locallevel > forklevel ? ASSPM_WARN_CREATE : 0); } @@ -2997,7 +2997,7 @@ sethparam(char *s, char **val) if (!(v = fetchvalue(&vbuf, &s, 1, SCANPM_ASSIGNING))) { DPUTS(!v, "BUG: assigning to undeclared associative array"); createparam(t, PM_HASHED); - checkcreate = isset(WARNCREATEGLOBAL) && locallevel > 0; + checkcreate = isset(WARNCREATEGLOBAL) && locallevel > forklevel; } else if (!(PM_TYPE(v->pm->node.flags) & PM_HASHED) && !(v->pm->node.flags & PM_SPECIAL)) { unsetparam(t); @@ -3075,7 +3075,7 @@ setnparam(char *s, mnumber val) /* errflag |= ERRFLAG_ERROR; */ return NULL; } - if (!was_unset && isset(WARNCREATEGLOBAL) && locallevel > 0) + if (!was_unset && isset(WARNCREATEGLOBAL) && locallevel > forklevel) check_warn_create(v->pm, "numeric"); } setnumvalue(v, val); @@ -3113,7 +3113,8 @@ setiparam_no_convert(char *s, zlong val) convbase(buf, val, 10); return assignsparam( s, ztrdup(buf), - isset(WARNCREATEGLOBAL) && locallevel > 0 ? ASSPM_WARN_CREATE : 0); + isset(WARNCREATEGLOBAL) && locallevel > forklevel ? + ASSPM_WARN_CREATE : 0); } /* Unset a parameter */ |