public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
From: Roland McGrath <mcgrathr@google.com>
To: "binutils@sourceware.org" <binutils@sourceware.org>
Subject: [COMMITTED PATCH] avoid strange arithmetic with strings in ldmisc.c
Date: Thu, 10 Oct 2013 22:51:00 -0000	[thread overview]
Message-ID: <CAB=4xhrNbTgXS3rcqnP2RZ-m88f=YDq5YGoPe9490rLE7aJEWg@mail.gmail.com> (raw)

Committed as obvious enough, to trunk and 2.24 branch.

Thanks,
Roland


ld/
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.

--- 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;
 		  }

                 reply	other threads:[~2013-10-10 22:51 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAB=4xhrNbTgXS3rcqnP2RZ-m88f=YDq5YGoPe9490rLE7aJEWg@mail.gmail.com' \
    --to=mcgrathr@google.com \
    --cc=binutils@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).