socsvn commit: r225180 - in soc2011/zy/nvi-iconv/head: contrib/nvi2/ex contrib/nvi2/regex usr.bin/vi

[zy at FreeBSD.org]

Author: zy
Date: Wed Aug 17 07:54:44 2011
New Revision: 225180
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=225180

Log:
  WARNS-free with either gcc or clang.
  Pass make buildworld.

Modified:
  soc2011/zy/nvi-iconv/head/contrib/nvi2/ex/ex_print.c
  soc2011/zy/nvi-iconv/head/contrib/nvi2/regex/engine.c
  soc2011/zy/nvi-iconv/head/usr.bin/vi/Makefile

Modified: soc2011/zy/nvi-iconv/head/contrib/nvi2/ex/ex_print.c
==============================================================================
--- soc2011/zy/nvi-iconv/head/contrib/nvi2/ex/ex_print.c	Wed Aug 17 07:38:47 2011	(r225179)
+++ soc2011/zy/nvi-iconv/head/contrib/nvi2/ex/ex_print.c	Wed Aug 17 07:54:44 2011	(r225180)
@@ -116,7 +116,7 @@
 		 */
 		if (LF_ISSET(E_C_HASH)) {
 			if (from <= 999999) {
-				SPRINTF(buf, SIZE(buf), L("%6lu  "), from);
+				SPRINTF(buf, SIZE(buf), L("%6u  "), from);
 				p = buf;
 			} else
 				p = L("TOOBIG  ");

Modified: soc2011/zy/nvi-iconv/head/contrib/nvi2/regex/engine.c
==============================================================================
--- soc2011/zy/nvi-iconv/head/contrib/nvi2/regex/engine.c	Wed Aug 17 07:38:47 2011	(r225179)
+++ soc2011/zy/nvi-iconv/head/contrib/nvi2/regex/engine.c	Wed Aug 17 07:54:44 2011	(r225180)
@@ -686,6 +686,7 @@
 	/* "can't happen" */
 	assert(nope);
 	/* NOTREACHED */
+	return L("shut up clang");
 }
 
 /*

Modified: soc2011/zy/nvi-iconv/head/usr.bin/vi/Makefile
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/vi/Makefile	Wed Aug 17 07:38:47 2011	(r225179)
+++ soc2011/zy/nvi-iconv/head/usr.bin/vi/Makefile	Wed Aug 17 07:54:44 2011	(r225180)
@@ -7,7 +7,7 @@
 #if using ncurses:
 CFLAGS+=	-DSYSV_CURSES
 
-WARNS?=	0
+WARNS?=	1
 
 VI=	nvi
 EX=	nex