From owner-svn-soc-all@FreeBSD.ORG  Mon Aug  4 13:10:16 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F23B2CC5
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 13:10:16 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E08372A0C
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 13:10:16 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s74DAGgV006300
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Aug 2014 13:10:16 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s74DAGAu006283
 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 13:10:16 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Mon, 4 Aug 2014 13:10:16 GMT
Message-Id: <201408041310.s74DAGAu006283@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271847 - soc2014/dpl/netmap-ipfwjit/extra
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 13:10:17 -0000

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) {