Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Jul 2019 10:09:19 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r349574 - stable/11/sys/sys
Message-ID:  <201907011009.x61A9JhW054303@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Mon Jul  1 10:09:19 2019
New Revision: 349574
URL: https://svnweb.freebsd.org/changeset/base/349574

Log:
  MFC r348774:
    Use underscores for internal variable name to avoid conflicts.

Modified:
  stable/11/sys/sys/counter.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/sys/counter.h
==============================================================================
--- stable/11/sys/sys/counter.h	Mon Jul  1 10:03:38 2019	(r349573)
+++ stable/11/sys/sys/counter.h	Mon Jul  1 10:09:19 2019	(r349574)
@@ -41,23 +41,23 @@ void		counter_u64_zero(counter_u64_t);
 uint64_t	counter_u64_fetch(counter_u64_t);
 
 #define	COUNTER_ARRAY_ALLOC(a, n, wait)	do {			\
-	for (int i = 0; i < (n); i++)				\
-		(a)[i] = counter_u64_alloc(wait);		\
+	for (int _i = 0; _i < (n); _i++)			\
+		(a)[_i] = counter_u64_alloc(wait);		\
 } while (0)
 
 #define	COUNTER_ARRAY_FREE(a, n)	do {			\
-	for (int i = 0; i < (n); i++)				\
-		counter_u64_free((a)[i]);			\
+	for (int _i = 0; _i < (n); _i++)			\
+		counter_u64_free((a)[_i]);			\
 } while (0)
 
 #define	COUNTER_ARRAY_COPY(a, dstp, n)	do {			\
-	for (int i = 0; i < (n); i++)				\
-		((uint64_t *)(dstp))[i] = counter_u64_fetch((a)[i]);\
+	for (int _i = 0; _i < (n); _i++)			\
+		((uint64_t *)(dstp))[_i] = counter_u64_fetch((a)[_i]);\
 } while (0)
 
 #define	COUNTER_ARRAY_ZERO(a, n)	do {			\
-	for (int i = 0; i < (n); i++)				\
-		counter_u64_zero((a)[i]);			\
+	for (int _i = 0; _i < (n); _i++)			\
+		counter_u64_zero((a)[_i]);			\
 } while (0)
 #endif	/* _KERNEL */
 #endif	/* ! __SYS_COUNTER_H__ */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907011009.x61A9JhW054303>