diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-06-25 21:11:42 -0700 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-06-25 21:11:42 -0700 |
| commit | 68e7e5dda04012ed5e95407074d3b9d76f6c3b0c (patch) | |
| tree | a8f275489c2e4b77c72df7cc8491f9afd53e5f8d | |
| parent | 7603a4ef2343b3a73766f56d340acc7b0532ed01 (diff) | |
| download | nasm-68e7e5dda04012ed5e95407074d3b9d76f6c3b0c.tar.gz | |
asm/directiv.c: move "special" in with the other symdef variables
Handle the string pointer "special" just like the other symdef parsing
variables (mangled, sizestr).
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
| -rw-r--r-- | asm/directiv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/asm/directiv.c b/asm/directiv.c index 1d3de141..94f1bf75 100644 --- a/asm/directiv.c +++ b/asm/directiv.c @@ -206,7 +206,7 @@ static enum directive parse_directive_line(char **directive, char **value) bool process_directives(char *directive) { enum directive d; - char *value, *p, *q, *special; + char *value, *p, *q; struct tokenval tokval; bool bad_param = false; int pass2 = passn > 1 ? 2 : 1; @@ -315,10 +315,10 @@ bool process_directives(char *directive) { bool validid = true; int64_t size = 0; - char *mangled, *sizestr; + char *mangled, *sizestr, *special; bool rn_error; - mangled = sizestr = NULL; + mangled = sizestr = special = NULL; if (*value == '$') value++; /* skip initial $ if present */ @@ -360,8 +360,6 @@ bool process_directives(char *directive) if (q && *q == ':') { *q++ = '\0'; special = q; - } else { - special = NULL; } if (type == LBL_COMMON) { |