PERFORCE change 100758 for review

[Paolo Pisati]

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

Change 100758 by piso at 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);