ld/

	* ldmisc.c (vfinfo): Use Boolean ? "" : ":" in place of ":" + Boolean.
	It silences some compilers' warnings and is much less bizarre to read.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b45aa69dab56db97b8f74dd3e17ded69279c2615..14287ddd3a886421db5eb6d165799d47bc9dab4c 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-10  Roland McGrath  <mcgrathr@google.com>
+
+       * ldmisc.c (vfinfo): Use Boolean ? "" : ":" in place of ":" + Boolean.
+       It silences some compilers' warnings and is much less bizarre to read.
+
 2013-10-09  Roland McGrath  <mcgrathr@google.com>
 
        * emultempl/elf32.em (id_note_section_size): Use ATTRIBUTE_UNUSED

diff --git a/ld/ldmisc.c b/ld/ldmisc.c
index 2569bcc6712675e967b52201ee437af57dde80cf..1b69ab1da46a969cee4999e11abe05faf1d1adf9 100644 (file)
--- a/ld/ldmisc.c
+++ b/ld/ldmisc.c
@@ -1,6 +1,6 @@
 /* ldmisc.c
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012, 2013
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support.
 
@@ -361,7 +361,7 @@ vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning)
                    if (functionname != NULL && fmt[-1] == 'G')
                      lfinfo (fp, "%T", functionname);
                    else if (filename != NULL && linenumber != 0)
-                     fprintf (fp, "%u%s", linenumber, ":" + done);
+                     fprintf (fp, "%u%s", linenumber, done ? "" : ":");
                    else
                      done = FALSE;
                  }