From a966dba9daedf21904c2be865c97aee21d6eca0d Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 6 Sep 2000 00:22:01 +0000 Subject: [PATCH] `template' isn't a very good name for a variable. Who invented c++ anyway? --- bfd/ChangeLog | 6 ++++++ bfd/bfd-in2.h | 2 +- bfd/section.c | 12 ++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f110a0cf70..0d65780d25 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2000-09-06 Alan Modra + + * section.c (bfd_get_unique_section_name): Avoid c++ reserved + word for variable name. + * bfd-in2.h: Regenerate. + 2000-09-05 Nick Clifton * config.in: Regenerate. diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 66081e8f39..ca6e36b2ee 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1284,7 +1284,7 @@ bfd_get_section_by_name PARAMS ((bfd *abfd, const char *name)); char * bfd_get_unique_section_name PARAMS ((bfd *abfd, - const char *template, + const char *templat, int *count)); asection * diff --git a/bfd/section.c b/bfd/section.c index 69d80cfb5e..6064924b43 100644 --- a/bfd/section.c +++ b/bfd/section.c @@ -649,30 +649,30 @@ FUNCTION SYNOPSIS char *bfd_get_unique_section_name(bfd *abfd, - const char *template, + const char *templat, int *count); DESCRIPTION Invent a section name that is unique in @var{abfd} by tacking - a digit suffix onto the original @var{template}. If @var{count} + a digit suffix onto the original @var{templat}. If @var{count} is non-NULL, then it specifies the first number tried as a suffix to generate a unique name. The value pointed to by @var{count} will be incremented in this case. */ char * -bfd_get_unique_section_name (abfd, template, count) +bfd_get_unique_section_name (abfd, templat, count) bfd *abfd; - const char *template; + const char *templat; int *count; { int num; unsigned int len; char *sname; - len = strlen (template); + len = strlen (templat); sname = bfd_malloc (len + 7); - strcpy (sname, template); + strcpy (sname, templat); num = 1; if (count != NULL) num = *count;