This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 3/3] remove VA_* from binutils
- From: Tom Tromey <tromey at redhat dot com>
- To: binutils at sourceware dot org
- Cc: Tom Tromey <tromey at redhat dot com>
- Date: Mon, 6 Jan 2014 12:31:28 -0700
- Subject: [PATCH 3/3] remove VA_* from binutils
- Authentication-results: sourceware.org; auth=none
- References: <1389036688-14196-1-git-send-email-tromey at redhat dot com>
This removes the last uses of the obsolete VA_* macros from binutils.
All the binutils and bfd changes were tested by rebuilding.
I didn't rebuild the gas change but I think it is obviously correct.
2014-01-06 Tom Tromey <tromey@redhat.com>
* elf32-xtensa.c (vsprint_msg): Don't use old VA_* compatibility
wrappers.
2014-01-06 Tom Tromey <tromey@redhat.com>
* bucomm.c (fatal, non_fatal): Replace obsolete VA_* macros with
stdarg macros.
* dlltool.c (inform): Replace obsolete VA_* macros with stdarg
macros.
* dllwrap.c (inform, warn): Replace obsolete VA_* macros with
stdarg macros.
2014-01-06 Tom Tromey <tromey@redhat.com>
* config/tc-tic30.c (debug): Avoid old VA_* compatibility
wrappers.
---
bfd/ChangeLog | 5 +++++
bfd/elf32-xtensa.c | 8 ++++----
binutils/ChangeLog | 9 +++++++++
binutils/bucomm.c | 20 +++++++++++---------
binutils/dlltool.c | 11 ++++++-----
binutils/dllwrap.c | 20 +++++++++++---------
gas/ChangeLog | 5 +++++
gas/config/tc-tic30.c | 8 ++++----
8 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 75ccefe..c5c8b9d 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -1,5 +1,5 @@
/* Xtensa-specific support for 32-bit ELF.
- Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
@@ -2161,9 +2161,9 @@ vsprint_msg (const char *origmsg, const char *fmt, int arglen, ...)
static char *message = NULL;
bfd_size_type orig_len, len = 0;
bfd_boolean is_append;
+ va_list ap;
- VA_OPEN (ap, arglen);
- VA_FIXEDARG (ap, const char *, origmsg);
+ va_start (ap, arglen);
is_append = (origmsg == message);
@@ -2180,7 +2180,7 @@ vsprint_msg (const char *origmsg, const char *fmt, int arglen, ...)
memcpy (message, origmsg, orig_len);
vsprintf (message + orig_len, fmt, ap);
}
- VA_CLOSE (ap);
+ va_end (ap);
return message;
}
diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index bb3fb3f..3f83b75 100644
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -1,6 +1,6 @@
/* bucomm.c -- Bin Utils COMmon code.
Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002,
- 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
Free Software Foundation, Inc.
This file is part of GNU Binutils.
@@ -127,24 +127,26 @@ report (const char * format, va_list args)
}
void
-fatal VPARAMS ((const char *format, ...))
+fatal (const char *format, ...)
{
- VA_OPEN (args, format);
- VA_FIXEDARG (args, const char *, format);
+ va_list args;
+
+ va_start (args, format);
report (format, args);
- VA_CLOSE (args);
+ va_end (args);
xexit (1);
}
void
-non_fatal VPARAMS ((const char *format, ...))
+non_fatal (const char *format, ...)
{
- VA_OPEN (args, format);
- VA_FIXEDARG (args, const char *, format);
+ va_list args;
+
+ va_start (args, format);
report (format, args);
- VA_CLOSE (args);
+ va_end (args);
}
/* Set the default BFD target based on the configured target. Doing
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 0da0011..af4cc03 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -1,6 +1,6 @@
/* dlltool.c -- tool to generate stuff for PE style DLLs
Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013 Free Software Foundation, Inc.
This file is part of GNU Binutils.
@@ -881,17 +881,18 @@ dlltmp (char **buf, const char *fmt)
}
static void
-inform VPARAMS ((const char * message, ...))
+inform (const char * message, ...)
{
- VA_OPEN (args, message);
- VA_FIXEDARG (args, const char *, message);
+ va_list args;
+
+ va_start (args, message);
if (!verbose)
return;
report (message, args);
- VA_CLOSE (args);
+ va_end (args);
}
static const char *
diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index a6dae90..03eb3fe 100644
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -1,6 +1,6 @@
/* dllwrap.c -- wrapper for DLLTOOL and GCC to generate PE style DLLs
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009,
- 2011, 2012 Free Software Foundation, Inc.
+ 2011, 2012, 2013 Free Software Foundation, Inc.
Contributed by Mumit Khan (khan@xraylith.wisc.edu).
This file is part of GNU Binutils.
@@ -144,28 +144,30 @@ display (const char * message, va_list args)
static void
-inform VPARAMS ((const char *message, ...))
+inform (const char *message, ...)
{
- VA_OPEN (args, message);
- VA_FIXEDARG (args, const char *, message);
+ va_list args;
+
+ va_start (args, message);
if (!verbose)
return;
display (message, args);
- VA_CLOSE (args);
+ va_end (args);
}
static void
-warn VPARAMS ((const char *format, ...))
+warn (const char *format, ...)
{
- VA_OPEN (args, format);
- VA_FIXEDARG (args, const char *, format);
+ va_list args;
+
+ va_start (args, format);
display (format, args);
- VA_CLOSE (args);
+ va_end (args);
}
/* Look for the program formed by concatenating PROG_NAME and the
diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c
index 570c833..53fbf3b 100644
--- a/gas/config/tc-tic30.c
+++ b/gas/config/tc-tic30.c
@@ -1,5 +1,5 @@
/* tc-c30.c -- Assembly code for the Texas Instruments TMS320C30
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2013
Free Software Foundation, Inc.
Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
@@ -85,11 +85,11 @@ debug (const char *string, ...)
if (flag_debug)
{
char str[100];
+ va_list argptr;
- VA_OPEN (argptr, string);
- VA_FIXEDARG (argptr, const char *, string);
+ va_start (argptr, string);
vsprintf (str, string, argptr);
- VA_CLOSE (argptr);
+ va_end (argptr);
if (str[0] == '\0')
return (0);
fputs (str, USE_STDOUT ? stdout : stderr);
--
1.8.1.4