diff options
| author | Nick Clifton <nickc@redhat.com> | 2006-09-16 18:12:17 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2006-09-16 18:12:17 +0000 |
| commit | 0112cd268b205d8176b8b4d00988a334822956cf (patch) | |
| tree | 67d11340ff93c7dbc29c8917bc03d9d24555f43d /bfd/linker.c | |
| parent | 4fa3602bd53183badf1d259128a5f951f32db8cb (diff) | |
| download | gdb-0112cd268b205d8176b8b4d00988a334822956cf.zip gdb-0112cd268b205d8176b8b4d00988a334822956cf.tar.gz gdb-0112cd268b205d8176b8b4d00988a334822956cf.tar.bz2 | |
* bfd-in.h (STRING_AND_COMMA): New macro. Takes one constant string as its
argument and emits the string followed by a comma and then the length of
the string.
(CONST_STRNEQ): New macro. Checks to see if a variable string has a constant
string as its initial characters.
(CONST_STRNCPY): New macro. Copies a constant string to the start of a
variable string.
* bfd-in2.h: Regenerate.
* <remainign files>: Make use of the new macros.
Diffstat (limited to 'bfd/linker.c')
| -rw-r--r-- | bfd/linker.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bfd/linker.c b/bfd/linker.c index 14eeae4..ea14d76 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -562,11 +562,11 @@ bfd_wrapped_link_hash_lookup (bfd *abfd, #undef WRAP -#undef REAL +#undef REAL #define REAL "__real_" if (*l == '_' - && strncmp (l, REAL, sizeof REAL - 1) == 0 + && CONST_STRNEQ (l, REAL) && bfd_hash_lookup (info->wrap_hash, l + sizeof REAL - 1, FALSE, FALSE) != NULL) { @@ -1659,8 +1659,7 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info, s = name + 1; while (*s == '_') ++s; - if (s[0] == 'G' - && strncmp (s, CONS_PREFIX, CONS_PREFIX_LEN - 1) == 0) + if (s[0] == 'G' && CONST_STRNEQ (s, CONS_PREFIX)) { char c; |