diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2009-10-29 23:09:18 +0300 |
|---|---|---|
| committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2009-10-31 20:02:43 +0300 |
| commit | 917117ff69271fe911e87a6f0e8dfc1f81c3f9b4 (patch) | |
| tree | 7fa504459cecef908ceed5197bf8bab629dc11e9 /output/outelf32.c | |
| parent | bafd877d48b25e576a4c905a14f1301502cca69c (diff) | |
| download | nasm-917117ff69271fe911e87a6f0e8dfc1f81c3f9b4.tar.gz nasm-917117ff69271fe911e87a6f0e8dfc1f81c3f9b4.tar.bz2 nasm-917117ff69271fe911e87a6f0e8dfc1f81c3f9b4.zip | |
stdscan: switch to stdscan_get/set routines
Instead of manipulating stdscan buffer pointer directly
we switch to a routine interface.
This allow us to unify stdscan access: ie caller should
"talk" to stdscan via stdscan_get/set routines.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'output/outelf32.c')
| -rw-r--r-- | output/outelf32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/output/outelf32.c b/output/outelf32.c index 47c9d10..8cb01de 100644 --- a/output/outelf32.c +++ b/output/outelf32.c @@ -495,7 +495,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset, while (*p && nasm_isspace(*p)) p++; stdscan_reset(); - stdscan_bufptr = p; + stdscan_set(p); tokval.t_type = TOKEN_INVALID; e = evaluate(stdscan, NULL, &tokval, NULL, 1, nasm_error, NULL); if (e) { @@ -630,7 +630,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset, struct tokenval tokval; expr *e; int fwd = 0; - char *saveme = stdscan_bufptr; /* bugfix? fbk 8/10/00 */ + char *saveme = stdscan_get(); /* bugfix? fbk 8/10/00 */ while (special[n] && nasm_isspace(special[n])) n++; @@ -639,7 +639,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset, * evaluate it. */ stdscan_reset(); - stdscan_bufptr = special + n; + stdscan_set(special + n); tokval.t_type = TOKEN_INVALID; e = evaluate(stdscan, NULL, &tokval, &fwd, 0, nasm_error, NULL); @@ -654,7 +654,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset, else sym->size = reloc_value(e); } - stdscan_bufptr = saveme; /* bugfix? fbk 8/10/00 */ + stdscan_set(saveme); /* bugfix? fbk 8/10/00 */ } special_used = true; } |