From owner-p4-projects@FreeBSD.ORG  Thu Jul  6 15:29:50 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 4D8A516A4EC; Thu,  6 Jul 2006 15:29:50 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1101D16A4DD
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 15:29:50 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B943C43E18
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 15:29:12 +0000 (GMT)
	(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 k66FTBPo093727
	for <perforce@freebsd.org>; Thu, 6 Jul 2006 15:29:11 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66FTBaW093724
	for perforce@freebsd.org; Thu, 6 Jul 2006 15:29:11 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 6 Jul 2006 15:29:11 GMT
Message-Id: <200607061529.k66FTBaW093724@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 100758 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: Thu, 06 Jul 2006 15:29:50 -0000

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

Change 100758 by piso@piso_newluxor on 2006/07/06 15:28:32

	C99 struct init: update alias_data to use C99 struct init.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#7 edit

Differences ...

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

@@ -726,13 +726,13 @@
 		int accumulate;
 		int r = 0, error;
 		struct alias_data ad = {
-			lnk, 
-			&original_address, 
-			&alias_address,
-			&alias_port,
-			&ud->uh_sport,
-			&ud->uh_dport,
-			0                  /* Maxpacketsize. */
+			.lnk = lnk, 
+			.oaddr = &original_address, 
+			.aaddr = &alias_address,
+			.aport = &alias_port,
+			.sport = &ud->uh_sport,
+			.dport = &ud->uh_dport,
+			.maxpktsize = 0
 		};
 
 		alias_address = GetAliasAddress(lnk);
@@ -788,13 +788,13 @@
 		u_short alias_port;
 		struct in_addr alias_address;
 		struct alias_data ad = {
-			lnk, 
-			NULL,              /* Original address. */
-			&alias_address,
-			&alias_port,
-			&ud->uh_sport,
-			&ud->uh_dport,
-			0                  /* Maxpacketsize. */
+			.lnk = lnk, 
+			.oaddr = NULL,
+			.aaddr = &alias_address,
+			.aport = &alias_port,
+			.sport = &ud->uh_sport,
+			.dport = &ud->uh_dport,
+			.maxpktsize = 0
 		};
 
 		alias_address = GetAliasAddress(lnk);
@@ -856,13 +856,13 @@
 		 */
 
 		struct alias_data ad = {
-			lnk, 
-			NULL,              /* Original address. */
-			NULL,              /* Alias address. */
-			NULL,              /* Alias port. */
-			&tc->th_sport,
-			&tc->th_dport,
-			0                  /* Maxpacketsize. */
+			.lnk = lnk, 
+			.oaddr = NULL,
+			.aaddr = NULL,
+			.aport = NULL,
+			.sport = &tc->th_sport,
+			.dport = &tc->th_dport,
+			.maxpktsize = 0
 		};
 
 		/* Walk out chain. */		
@@ -882,13 +882,13 @@
 		 */
 #if 0
 				 struct alias_data ad = {
-					lnk,
-					&original_address,
-					&alias_address,
-					&alias_port,
-					&ud->uh_sport,
-					&ud->uh_dport,
-					0                  /* Maxpacketsize. */
+					.lnk = lnk,
+					.oaddr = &original_address,
+					.aaddr = &alias_address,
+					.aport = &alias_port,
+					.sport = &ud->uh_sport,
+					.dport = &ud->uh_dport,
+					.maxpktsize = 0
 				};
 		
 				/* Walk out chain. */
@@ -999,13 +999,13 @@
 		struct in_addr alias_address;
 		int accumulate;
 		struct alias_data ad = {
-			lnk, 
-			NULL, /* Original address. */
-			&alias_address,
-			&alias_port,
-			&tc->th_sport,
-			&tc->th_dport,
-			maxpacketsize
+			.lnk = lnk, 
+			.oaddr = NULL,
+			.aaddr = &alias_address,
+			.aport = &alias_port,
+			.sport = &tc->th_sport,
+			.dport = &tc->th_dport,
+			.maxpktsize = maxpacketsize
 		};
 
 /* Save original destination address, if this is a proxy packet.
@@ -1229,13 +1229,13 @@
  		case IPPROTO_GRE: {
 			int error;
 			struct alias_data ad = {
-				NULL, 
-				NULL, 
-				NULL,
-				NULL,
-				NULL,
-				NULL,
-				0                  
+				.lnk = NULL, 
+				.oaddr = NULL, 
+				.aaddr = NULL,
+				.aport = NULL,
+				.sport = NULL,
+				.dport = NULL,
+				.maxpktsize = 0                  
 			};
 			
 			/* Walk out chain. */		
@@ -1355,13 +1355,13 @@
  		case IPPROTO_GRE: {
 			int error;
 			struct alias_data ad = {
-				NULL, 
-				NULL, 
-				NULL,
-				NULL,
-				NULL,
-				NULL,
-				0                  
+				.lnk = NULL, 
+				.oaddr = NULL, 
+				.aaddr = NULL,
+				.aport = NULL,
+				.sport = NULL,
+				.dport = NULL,
+				.maxpktsize = 0                  
 			};
 			/* Walk out chain. */		
 			error = find_handler(OUT, IP, la, pip, &ad);