diff options
| author | Nick Clifton <nickc@redhat.com> | 2006-09-28 12:59:25 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2006-09-28 12:59:25 +0000 |
| commit | ea9986ff0085095cd23ec95dc0e42177c062e117 (patch) | |
| tree | 82db9fd23cc38c85fa029aaf30bbf5196b9ed5e1 /binutils/prdbg.c | |
| parent | 2642de2a6c63f6a5710395e0ab502d6929d2ffd6 (diff) | |
| download | binutils-ea9986ff0085095cd23ec95dc0e42177c062e117.zip binutils-ea9986ff0085095cd23ec95dc0e42177c062e117.tar.gz binutils-ea9986ff0085095cd23ec95dc0e42177c062e117.tar.bz2 | |
* bfd-in.h (CONST_STRNCPY) : Delete.
(LITSTRCPY) : New.
(LITMEMCPY) : New.
* bfd-in2.h : Regenerate.
* elflink.c (bfd_elf_gc_sections) : Use LITMEMCPY. Don't manually calculate string lengths.
* nlmcode.h (nlm_swap_auxiliary_headers_in) : Use LITMEMCPY.
* nlmconv.c (main) : Use LITMEMCPY.
* prdbg.c (tg_class_static_member) : Use LITSTRCPY.
Diffstat (limited to 'binutils/prdbg.c')
| -rw-r--r-- | binutils/prdbg.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/binutils/prdbg.c b/binutils/prdbg.c index 5b89595..7a0af83 100644 --- a/binutils/prdbg.c +++ b/binutils/prdbg.c @@ -724,8 +724,8 @@ pr_function_type (void *p, int argcount, bfd_boolean varargs) /* Now the return type is on the top of the stack. */ - s = (char *) xmalloc (len); - strcpy (s, "(|) ("); + s = xmalloc (len); + LITSTRCPY (s, "(|) ("); if (argcount < 0) strcat (s, "/* unknown */"); @@ -2153,12 +2153,10 @@ tg_class_static_member (void *p, const char *name, len_var = strlen (name); len_class = strlen (info->stack->next->type); - full_name = (char *) xmalloc (len_var + len_class + 3); + full_name = xmalloc (len_var + len_class + 3); if (! full_name) return FALSE; - memcpy (full_name, info->stack->next->type, len_class); - memcpy (full_name + len_class, STRING_COMMA_LEN ("::")); - memcpy (full_name + len_class + 2, name, len_var + 1); + sprintf (full_name, "%s::%s", info->stack->next->type, name); if (! substitute_type (info, full_name)) return FALSE; |