svn commit: r334192 - head/sys/libkern

Warner Losh imp at FreeBSD.org
Thu May 24 23:20:11 UTC 2018


Author: imp
Date: Thu May 24 23:20:10 2018
New Revision: 334192
URL: https://svnweb.freebsd.org/changeset/base/334192

Log:
  Protect bzero call against macro expansion
  
  Shortly, we'll be moving to defining bzero and memset in terms of
  __builting_memset. To do that, we can't have macro calls to bzero in
  the fallback impelmentation of memset. Normal calls to bzero are fine.
  All 4 architectures that use this have their own copies of bzero, so
  there's no mutual recursion issue between memset and bcopy.

Modified:
  head/sys/libkern/memset.c

Modified: head/sys/libkern/memset.c
==============================================================================
--- head/sys/libkern/memset.c	Thu May 24 23:11:25 2018	(r334191)
+++ head/sys/libkern/memset.c	Thu May 24 23:20:10 2018	(r334192)
@@ -38,7 +38,7 @@ memset(void *b, int c, size_t len)
 	char *bb;
 
 	if (c == 0)
-		bzero(b, len);
+		(bzero)(b, len);
 	else
 		for (bb = (char *)b; len--; )
 			*bb++ = c;


More information about the svn-src-head mailing list