diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-12-07 16:24:19 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-12-07 16:24:19 +0000 |
| commit | ab09c24a49951bfafb0ebd075fdd3e99e064f5aa (patch) | |
| tree | 861f2bd493fd5bd50a08756a34585d6b7c151e8f /Src/params.c | |
| parent | 908abba89147f8a4e4991c4464a95ee90d1078f6 (diff) | |
| download | zsh-ab09c24a49951bfafb0ebd075fdd3e99e064f5aa.tar.gz zsh-ab09c24a49951bfafb0ebd075fdd3e99e064f5aa.tar.xz zsh-ab09c24a49951bfafb0ebd075fdd3e99e064f5aa.zip | |
First go at separating errors and keyboard interrupts
This is the first posting exactly as was, with known errors and omissions. Basic strategy is to introduce bits to errflag and to set and reset them separately.
Diffstat (limited to 'Src/params.c')
| -rw-r--r-- | Src/params.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Src/params.c b/Src/params.c index 61edc5d08..bdace7928 100644 --- a/Src/params.c +++ b/Src/params.c @@ -2654,7 +2654,7 @@ assignsparam(char *s, char *val, int flags) if (!isident(s)) { zerr("not an identifier: %s", s); zsfree(val); - errflag = 1; + errflag |= ERRFLAG_ERROR; return NULL; } queue_signals(); @@ -2783,7 +2783,7 @@ assignaparam(char *s, char **val, int flags) if (!isident(s)) { zerr("not an identifier: %s", s); freearray(val); - errflag = 1; + errflag |= ERRFLAG_ERROR; return NULL; } queue_signals(); @@ -2799,7 +2799,7 @@ assignaparam(char *s, char **val, int flags) zerr("%s: attempt to set slice of associative array", v->pm->node.nam); freearray(val); - errflag = 1; + errflag |= ERRFLAG_ERROR; return NULL; } v = NULL; @@ -2870,13 +2870,13 @@ sethparam(char *s, char **val) if (!isident(s)) { zerr("not an identifier: %s", s); freearray(val); - errflag = 1; + errflag |= ERRFLAG_ERROR; return NULL; } if (strchr(s, '[')) { freearray(val); zerr("nested associative arrays not yet supported"); - errflag = 1; + errflag |= ERRFLAG_ERROR; return NULL; } if (unset(EXECOPT)) @@ -2916,7 +2916,7 @@ setnparam(char *s, mnumber val) if (!isident(s)) { zerr("not an identifier: %s", s); - errflag = 1; + errflag |= ERRFLAG_ERROR; return NULL; } if (unset(EXECOPT)) |