socsvn commit: r271847 - soc2014/dpl/netmap-ipfwjit/extra

[dpl at FreeBSD.org]

Author: dpl
Date: Mon Aug  4 13:10:15 2014
New Revision: 271847
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271847

Log:
  Changed struct element name 'private' to 'priv' to avoid C++ errors

Modified:
  soc2014/dpl/netmap-ipfwjit/extra/missing.h
  soc2014/dpl/netmap-ipfwjit/extra/session.c

Modified: soc2014/dpl/netmap-ipfwjit/extra/missing.h
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/extra/missing.h	Mon Aug  4 12:25:36 2014	(r271846)
+++ soc2014/dpl/netmap-ipfwjit/extra/missing.h	Mon Aug  4 13:10:15 2014	(r271847)
@@ -772,7 +772,7 @@
         handler_t *func;
         void *arg;
         enum flags_t flags;
-        void *private;  /* pointer managed by the session code */
+        void *priv;  /* pointer managed by the session code */
 };
 struct sess *
 new_session(int fd, handler_t *func, void *arg, enum flags_t flags);

Modified: soc2014/dpl/netmap-ipfwjit/extra/session.c
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/extra/session.c	Mon Aug  4 12:25:36 2014	(r271846)
+++ soc2014/dpl/netmap-ipfwjit/extra/session.c	Mon Aug  4 13:10:15 2014	(r271847)
@@ -344,9 +344,9 @@
 	int error = 1;
 
 	ND("sess %p arg %p", sess, arg);
-	if (sess->private == NULL)
-		sess->private = calloc(1, sizeof(struct sockopt_desc));
-	d = sess->private;
+	if (sess->priv == NULL)
+		sess->priv = calloc(1, sizeof(struct sockopt_desc));
+	d = sess->priv;
 	if (d == NULL)
 		goto done;
 	if (sess->flags & WANT_READ) {