From: nasm-bot f. C. G. <gor...@gm...> - 2014-08-29 17:21:29
|
Commit-ID: 9b76c802ae6f7e85c1e0b1b15696149297ae243d Gitweb: http://repo.or.cz/w/nasm.git?a=commitdiff;h=9b76c802ae6f7e85c1e0b1b15696149297ae243d Author: Cyrill Gorcunov <gor...@gm...> AuthorDate: Fri, 29 Aug 2014 20:24:24 +0400 Committer: Cyrill Gorcunov <gor...@gm...> CommitDate: Fri, 29 Aug 2014 20:24:24 +0400 output: elf -- Rename section_attrib to elf_section_attrib Global section_attrib name is too general. Signed-off-by: Cyrill Gorcunov <gor...@gm...> --- output/outelf.c | 6 +++--- output/outelf.h | 6 +++--- output/outelf32.c | 4 ++-- output/outelf64.c | 4 ++-- output/outelfx32.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/output/outelf.c b/output/outelf.c index 61ae1fc..19fc99f 100644 --- a/output/outelf.c +++ b/output/outelf.c @@ -65,9 +65,9 @@ const struct elf_known_section elf_known_sections[] = { }; /* parse section attributes */ -void section_attrib(char *name, char *attr, int pass, - uint32_t *flags_and, uint32_t *flags_or, - uint64_t *align, int *type) +void elf_section_attrib(char *name, char *attr, int pass, + uint32_t *flags_and, uint32_t *flags_or, + uint64_t *align, int *type) { char *opt, *val, *next; diff --git a/output/outelf.h b/output/outelf.h index 8ab76b0..fbf23fb 100644 --- a/output/outelf.h +++ b/output/outelf.h @@ -101,9 +101,9 @@ struct stabentry { #define sec_debug_frame (nsections-2) #define sec_debug_loc (nsections-1) -void section_attrib(char *name, char *attr, int pass, - uint32_t *flags_and, uint32_t *flags_or, - uint64_t *align, int *type); +void elf_section_attrib(char *name, char *attr, int pass, + uint32_t *flags_and, uint32_t *flags_or, + uint64_t *align, int *type); #define WRITE_STAB(p,n_strx,n_type,n_other,n_desc,n_value) \ do { \ diff --git a/output/outelf32.c b/output/outelf32.c index 413270b..83aedb0 100644 --- a/output/outelf32.c +++ b/output/outelf32.c @@ -343,8 +343,8 @@ static int32_t elf_section_names(char *name, int pass, int *bits) *p++ = '\0'; flags_and = flags_or = type = align = 0; - section_attrib(name, p, pass, &flags_and, - &flags_or, &align, &type); + elf_section_attrib(name, p, pass, &flags_and, + &flags_or, &align, &type); if (!strcmp(name, ".shstrtab") || !strcmp(name, ".symtab") || diff --git a/output/outelf64.c b/output/outelf64.c index 9f93fc8..40d5f1e 100644 --- a/output/outelf64.c +++ b/output/outelf64.c @@ -351,8 +351,8 @@ static int32_t elf_section_names(char *name, int pass, int *bits) *p++ = '\0'; flags_and = flags_or = type = align = 0; - section_attrib(name, p, pass, &flags_and, - &flags_or, &align, &type); + elf_section_attrib(name, p, pass, &flags_and, + &flags_or, &align, &type); if (!strcmp(name, ".shstrtab") || !strcmp(name, ".symtab") || diff --git a/output/outelfx32.c b/output/outelfx32.c index bbedc48..1f1ed4d 100644 --- a/output/outelfx32.c +++ b/output/outelfx32.c @@ -349,8 +349,8 @@ static int32_t elf_section_names(char *name, int pass, int *bits) *p++ = '\0'; flags_and = flags_or = type = align = 0; - section_attrib(name, p, pass, &flags_and, - &flags_or, &align, &type); + elf_section_attrib(name, p, pass, &flags_and, + &flags_or, &align, &type); if (!strcmp(name, ".shstrtab") || !strcmp(name, ".symtab") || |