[Nasm-commits] [nasm:extnames] asm/directiv.c: move "special" in with the other symdef variables
nasm-bot for H. Peter Anvin (Intel)
hpa at zytor.com
Thu Jun 4 19:56:44 PDT 2020
Commit-ID: 68e7e5dda04012ed5e95407074d3b9d76f6c3b0c
Gitweb: http://repo.or.cz/w/nasm.git?a=commitdiff;h=68e7e5dda04012ed5e95407074d3b9d76f6c3b0c
Author: H. Peter Anvin (Intel) <hpa at zytor.com>
AuthorDate: Mon, 25 Jun 2018 21:11:42 -0700
Committer: H. Peter Anvin (Intel) <hpa at zytor.com>
CommitDate: Mon, 25 Jun 2018 21:11:42 -0700
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 at zytor.com>
---
asm/directiv.c | 8 +++-----
1 file 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) {
More information about the Nasm-commits
mailing list