CVS commit: src/sys/netinet

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Fri Sep  5 06:03:51 UTC 2014

Modified Files:
        src/sys/netinet: tcp_vtw.c

Log Message:
Don't use C++ keywords (class, template) as variables


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet/tcp_vtw.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.10 src/sys/netinet/tcp_vtw.c:1.11
--- src/sys/netinet/tcp_vtw.c:1.10	Sun Sep 15 14:47:40 2013
+++ src/sys/netinet/tcp_vtw.c	Fri Sep  5 06:03:51 2014
@@ -124,7 +124,7 @@
 
 #include <netinet/tcp_vtw.h>
 
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.10 2013/09/15 14:47:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.11 2014/09/05 06:03:51 matt Exp $");
 
 #define db_trace(__a, __b)	do { } while (/*CONSTCOND*/0)
 
@@ -1342,9 +1342,9 @@ vtw_init(fatp_ctl_t *fat, vtw_ctl_t *ctl
 /*!\brief	map class to TCP MSL
  */
 static inline uint32_t
-class_to_msl(int class)
+class_to_msl(int msl_class)
 {
-	switch (class) {
+	switch (msl_class) {
 	case 0:
 	case 1:
 		return tcp_msl_remote ? tcp_msl_remote : (TCPTV_MSL >> 0);
@@ -1875,7 +1875,7 @@ vtw_control(int af, uint32_t msl)
 {
 	fatp_ctl_t	*fat;
 	vtw_ctl_t	*ctl;
-	int		class	= msl_to_class(msl);
+	int		msl_class = msl_to_class(msl);
 
 	if (!vtw_select(af, &fat, &ctl))
 		return NULL;
@@ -1893,7 +1893,7 @@ vtw_control(int af, uint32_t msl)
 		tcbtable.vestige = &tcp_hooks;
 	}
 
-	return ctl + class;
+	return ctl + msl_class;
 }
 
 /*!\brief	add TCP pcb to vestigial timewait
@@ -2249,12 +2249,12 @@ vtw_earlyinit(void)
 /*!\brief	add lalp, fafp entries for debug
  */
 int
-vtw_debug_add(int af, sin_either_t *la, sin_either_t *fa, int msl, int class)
+vtw_debug_add(int af, sin_either_t *la, sin_either_t *fa, int msl, int msl_class)
 {
 	vtw_ctl_t	*ctl;
 	vtw_t		*vtw;
 
-	ctl = vtw_control(af, msl ? msl : class_to_msl(class));
+	ctl = vtw_control(af, msl ? msl : class_to_msl(msl_class));
 	if (!ctl)
 		return 0;