[src/trunk]: src/sys/netinet Don't use C++ keywords (class, template) as vari...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a5f1c180ff7e
branches:  trunk
changeset: 802184:a5f1c180ff7e
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 05 06:03:51 2014 +0000

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

diffstat:

 sys/netinet/tcp_vtw.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r 2ba86b205b00 -r a5f1c180ff7e sys/netinet/tcp_vtw.c
--- a/sys/netinet/tcp_vtw.c     Fri Sep 05 06:02:11 2014 +0000
+++ b/sys/netinet/tcp_vtw.c     Fri Sep 05 06:03:51 2014 +0000
@@ -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 @@
 /*!\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 @@
 {
        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 @@
                tcbtable.vestige = &tcp_hooks;
        }
 
-       return ctl + class;
+       return ctl + msl_class;
 }
 
 /*!\brief      add TCP pcb to vestigial timewait
@@ -2249,12 +2249,12 @@
 /*!\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;