svn commit: r243802 - in user/ed/newcons/sys: dev/vt kern

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Dec  2 22:21:40 2012
New Revision: 243802
URL: http://svnweb.freebsd.org/changeset/base/243802

Log:
  Squash clang warnings.

Modified:
  user/ed/newcons/sys/dev/vt/vt_core.c
  user/ed/newcons/sys/kern/subr_terminal.c

Modified: user/ed/newcons/sys/dev/vt/vt_core.c
==============================================================================
--- user/ed/newcons/sys/dev/vt/vt_core.c	Sun Dec  2 22:18:01 2012	(r243801)
+++ user/ed/newcons/sys/dev/vt/vt_core.c	Sun Dec  2 22:21:40 2012	(r243802)
@@ -207,7 +207,7 @@ vt_kbdevent(keyboard_t *kbd, int event, 
 			shutdown_nice(RB_HALT|RB_POWEROFF);
 			break;
 		case SLK: {
-			int state;
+			int state = 0;
 
 			kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
 			VT_LOCK(vd);
@@ -660,7 +660,7 @@ vtterm_cngetc(struct terminal *tm)
 
 		switch (c) {
 		case SLK: {
-			int state;
+			int state = 0;
 
 			kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
 			if (state & SLKED) {

Modified: user/ed/newcons/sys/kern/subr_terminal.c
==============================================================================
--- user/ed/newcons/sys/kern/subr_terminal.c	Sun Dec  2 22:18:01 2012	(r243801)
+++ user/ed/newcons/sys/kern/subr_terminal.c	Sun Dec  2 22:21:40 2012	(r243802)
@@ -183,7 +183,7 @@ terminal_maketty(struct terminal *tm, co
 	va_end(ap);
 
 	tp = tty_alloc(&terminal_tty_class, tm);
-	tty_makedev(tp, NULL, name);
+	tty_makedev(tp, NULL, "%s", name);
 	tm->tm_tty = tp;
 	terminal_sync_ttysize(tm);
 }