mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-18 16:25:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

output/outelf32-64: use string helpers

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2009-10-30 09:24:05 +03:00
parent 54e94a56e2
commit a353955a8d
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
output/outelf32.c
View File

@ -359,23 +359,18 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
return def_seg;
}
p = name;
while (*p && !nasm_isspace(*p))
p++;
p = nasm_skip_word(name);
if (*p)
*p++ = '\0';
flags_and = flags_or = type = align = 0;
while (*p && nasm_isspace(*p))
p++;
p = nasm_skip_spaces(p);
while (*p) {
char *q = p;
while (*p && !nasm_isspace(*p))
p++;
p = nasm_skip_word(p);
if (*p)
*p++ = '\0';
while (*p && nasm_isspace(*p))
p++;
p = nasm_skip_spaces(p);
if (!nasm_strnicmp(q, "align=", 6)) {
align = atoi(q + 6);
@ -488,12 +483,8 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
if (!strcmp((*s)->name, name)) {
struct tokenval tokval;
expr *e;
char *p = special;
char *p = nasm_skip_spaces(nasm_skip_word(special));
while (*p && !nasm_isspace(*p))
p++;
while (*p && nasm_isspace(*p))
p++;
stdscan_reset();
stdscan_set(p);
tokval.t_type = TOKEN_INVALID;
@ -609,8 +600,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
n, special);
special += n;
while (nasm_isspace(*special))
++special;
special = nasm_skip_spaces(special);
if (*special) {
n = strcspn(special, " \t");
if (!nasm_strnicmp(special, "default", n))

22
output/outelf64.c
View File

@ -363,23 +363,18 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
return def_seg;
}
p = name;
while (*p && !nasm_isspace(*p))
p++;
p = nasm_skip_word(name);
if (*p)
*p++ = '\0';
flags_and = flags_or = type = align = 0;
while (*p && nasm_isspace(*p))
p++;
p = nasm_skip_spaces(p);
while (*p) {
char *q = p;
while (*p && !nasm_isspace(*p))
p++;
p = nasm_skip_word(p);
if (*p)
*p++ = '\0';
while (*p && nasm_isspace(*p))
p++;
p = nasm_skip_spaces(p);
if (!nasm_strnicmp(q, "align=", 6)) {
align = atoi(q + 6);
@ -492,12 +487,8 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
if (!strcmp((*s)->name, name)) {
struct tokenval tokval;
expr *e;
char *p = special;
char *p = nasm_skip_spaces(nasm_skip_word(special));
while (*p && !nasm_isspace(*p))
p++;
while (*p && nasm_isspace(*p))
p++;
stdscan_reset();
stdscan_set(p);
tokval.t_type = TOKEN_INVALID;
@ -614,8 +605,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
n, special);
special += n;
while (nasm_isspace(*special))
++special;
special = nasm_skip_spaces(special);
if (*special) {
n = strcspn(special, " \t");
if (!nasm_strnicmp(special, "default", n))