PERFORCE change 166087 for review

[Edward Tomasz Napierala]

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

Change 166087 by trasz at trasz_victim on 2009/07/14 17:22:43

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mklocale/yacc.y#2 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#16 (text+ko) ====

@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.33 2009/07/13 11:51:02 lstewart Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.34 2009/07/14 11:53:21 lstewart Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3585,7 +3585,7 @@
 {
 
 	struct in_conninfo inc;
-	struct toeopt to;
+	struct toeopt toeo;
 	struct tcphdr th;
 	int mss, wsf, sack, ts;
 	struct mbuf *m = NULL;

==== //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mklocale/yacc.y#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.28 2008/01/22 00:04:50 ache Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.29 2009/07/14 09:19:33 ed Exp $");
 
 #include <arpa/inet.h>
 
@@ -730,8 +730,8 @@
     /*
      * PART 6: And finally the variable data
      */
-    if (fwrite(variable,
-	       ntohl(new_locale.variable_len), 1, fp) != 1) {
+    if (new_locale.variable_len != 0 &&
+	fwrite(variable, ntohl(new_locale.variable_len), 1, fp) != 1) {
 	perror(locale_file);
 	exit(1);
     }