From owner-p4-projects@FreeBSD.ORG  Fri Dec 29 17:48:02 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B76E416A516; Fri, 29 Dec 2006 17:48:02 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 72FF516A512
	for <perforce@freebsd.org>; Fri, 29 Dec 2006 17:48:02 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6383113C45A
	for <perforce@freebsd.org>; Fri, 29 Dec 2006 17:48:02 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBTHm2WS089967
	for <perforce@freebsd.org>; Fri, 29 Dec 2006 17:48:02 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBTHm22G089964
	for perforce@freebsd.org; Fri, 29 Dec 2006 17:48:02 GMT
	(envelope-from piso@freebsd.org)
Date: Fri, 29 Dec 2006 17:48:02 GMT
Message-Id: <200612291748.kBTHm22G089964@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112292 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Dec 2006 17:48:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=112292

Change 112292 by piso@piso_newluxor on 2006/12/29 17:47:08

	o spacing.
	o s/u_int/uint/g.
	o anticipate a couple of mtx_unlock().

Affected files ...

.. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#15 edit
.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#34 edit

Differences ...

==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#15 (text+ko) ====

@@ -5860,7 +5860,7 @@
 	struct cfg_redir *e;
 	int cmd, i, nbytes, do_cfg, do_rule, frule, lrule, nalloc, size;
 	int nat_cnt, r;
-	u_int8_t *data, *p;
+	uint8_t *data, *p;
 	char **lav, *endptr;
 
 	do_rule = 0;

==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#34 (text+ko) ====

@@ -4580,17 +4580,17 @@
 			/* New rule: allocate and init new instance. */
 			ptr = malloc(sizeof(struct cfg_nat), 
 		            M_IPFW, M_NOWAIT | M_ZERO);
-			if (ptr == NULL) {		
+			if (ptr == NULL) {
+				IPFW_WUNLOCK(&layer3_chain);				
 				free(buf, M_IPFW);
-				IPFW_WUNLOCK(&layer3_chain);				
 				return (ENOSPC);				
 			}
 			ptr->lib = LibAliasInit(NULL);
-			if (ptr->lib == NULL) {		
+			if (ptr->lib == NULL) {
+				IPFW_WUNLOCK(&layer3_chain);
 				free(ptr, M_IPFW);
-				free(buf, M_IPFW);
-				IPFW_WUNLOCK(&layer3_chain);	
-				return(EINVAL);
+				free(buf, M_IPFW);		
+				return (EINVAL);
 			}
 			LIST_INIT(&ptr->redir_chain);
 		} else {
@@ -4654,7 +4654,7 @@
 
 	case IP_FW_NAT_GET_CONFIG:
 	{
-		u_int8_t *data;
+		uint8_t *data;
 		struct cfg_nat *n;
 		struct cfg_redir *r;
 		struct cfg_spool *s;
@@ -4713,7 +4713,7 @@
 
 	case IP_FW_NAT_GET_LOG:
 	{
-		u_int8_t *data;
+		uint8_t *data;
 		struct cfg_nat *ptr;
 		int i, size, cnt, sof;