From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 13 Mar 2014 18:34:47 +0000 (+0100)
Subject: regex.c (bzero): Define without coma expression.
X-Git-Tag: releases/gcc-4.9.0~463
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52684bb3c8ab4b566cb10d20aa06ab388a4a81c7;p=thirdparty%2Fgcc.git

regex.c (bzero): Define without coma expression.

	* regex.c (bzero) [!_LIBC]: Define without coma expression.
	(regerror): Cast the call to memcpy to (void) to avoid unused
	value warnings.

From-SVN: r208553
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 0a4496bb8ca2..9dab384ccf28 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-13  Uros Bizjak  <ubizjak@gmail.com>
+
+	* regex.c (bzero) [!_LIBC]: Define without coma expression.
+	(regerror): Cast the call to memcpy to (void) to avoid unused
+	value warnings.
+
 2014-01-28  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* cp-demangle.c (d_demangle_callback): Put an abort call in place,
diff --git a/libiberty/regex.c b/libiberty/regex.c
index c11f330273dd..cc9acdc2380c 100644
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -151,7 +151,7 @@ char *realloc ();
 #    include <string.h>
 #    ifndef bzero
 #     ifndef _LIBC
-#      define bzero(s, n)	(memset (s, '\0', n), (s))
+#      define bzero(s, n)	memset (s, '\0', n)
 #     else
 #      define bzero(s, n)	__bzero (s, n)
 #     endif
@@ -8093,12 +8093,12 @@ regerror (int errcode, const regex_t *preg ATTRIBUTE_UNUSED,
 #if defined HAVE_MEMPCPY || defined _LIBC
 	  *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
 #else
-          memcpy (errbuf, msg, errbuf_size - 1);
+          (void) memcpy (errbuf, msg, errbuf_size - 1);
           errbuf[errbuf_size - 1] = 0;
 #endif
         }
       else
-        memcpy (errbuf, msg, msg_size);
+        (void) memcpy (errbuf, msg, msg_size);
     }
 
   return msg_size;