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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208553 138bc75d-0d04-0410-961f-82ee72b054a4
This commit is contained in:
uros 2014-03-13 18:34:47 +00:00 committed by Tom Tromey
parent abca8d871a
commit 10fe779dd2
2 changed files with 9 additions and 3 deletions

View File

@ -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,

View File

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