From owner-svn-src-stable@FreeBSD.ORG Sun Mar 3 07:45:42 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CB85D7DF; Sun, 3 Mar 2013 07:45:42 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 99AB9960; Sun, 3 Mar 2013 07:45:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r237jf57040066; Sun, 3 Mar 2013 07:45:41 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r237jf8K040062; Sun, 3 Mar 2013 07:45:41 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201303030745.r237jf8K040062@svn.freebsd.org> From: Devin Teske Date: Sun, 3 Mar 2013 07:45:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r247687 - stable/8/usr.sbin/sysinstall X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Mar 2013 07:45:42 -0000 Author: dteske Date: Sun Mar 3 07:45:40 2013 New Revision: 247687 URL: http://svnweb.freebsd.org/changeset/base/247687 Log: MFS 9->8 r234737: Fix several 'format string is not a literal' warnings in sysinstall. Since sysinstall does not exist anymore in head, this is a direct commit. Modified: stable/8/usr.sbin/sysinstall/dispatch.c stable/8/usr.sbin/sysinstall/install.c stable/8/usr.sbin/sysinstall/label.c stable/8/usr.sbin/sysinstall/modules.c Modified: stable/8/usr.sbin/sysinstall/dispatch.c ============================================================================== --- stable/8/usr.sbin/sysinstall/dispatch.c Sun Mar 3 07:27:15 2013 (r247686) +++ stable/8/usr.sbin/sysinstall/dispatch.c Sun Mar 3 07:45:40 2013 (r247687) @@ -591,7 +591,7 @@ dispatch_load_menu(dialogMenuItem *self) if (err != NULL) { what |= DITEM_FAILURE; if (!variable_get(VAR_NO_ERROR)) - msgConfirm(err); + msgConfirm("%s", err); } return (what); Modified: stable/8/usr.sbin/sysinstall/install.c ============================================================================== --- stable/8/usr.sbin/sysinstall/install.c Sun Mar 3 07:27:15 2013 (r247686) +++ stable/8/usr.sbin/sysinstall/install.c Sun Mar 3 07:45:40 2013 (r247687) @@ -1018,10 +1018,10 @@ performNewfs(PartInfo *pi, char *dname, } if (queue == QUEUE_YES) { - command_shell_add(pi->mountpoint, buffer); + command_shell_add(pi->mountpoint, "%s", buffer); return (0); } else - return (vsystem(buffer)); + return (vsystem("%s", buffer)); } return (0); } Modified: stable/8/usr.sbin/sysinstall/label.c ============================================================================== --- stable/8/usr.sbin/sysinstall/label.c Sun Mar 3 07:27:15 2013 (r247686) +++ stable/8/usr.sbin/sysinstall/label.c Sun Mar 3 07:45:40 2013 (r247687) @@ -978,7 +978,7 @@ diskLabel(Device *dev) } if (msg) { if (req) { - msgConfirm(msg); + msgConfirm("%s", msg); clear_wins(); msg = NULL; } Modified: stable/8/usr.sbin/sysinstall/modules.c ============================================================================== --- stable/8/usr.sbin/sysinstall/modules.c Sun Mar 3 07:27:15 2013 (r247686) +++ stable/8/usr.sbin/sysinstall/modules.c Sun Mar 3 07:45:40 2013 (r247687) @@ -199,7 +199,7 @@ kldBrowser(dialogMenuItem *self) if (err != NULL) { what |= DITEM_FAILURE; if (!variable_get(VAR_NO_ERROR)) - msgConfirm(err); + msgConfirm("%s", err); } return (what);