From owner-svn-src-all@FreeBSD.ORG Fri Apr 27 19:26:20 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62504106566B; Fri, 27 Apr 2012 19:26:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3385C8FC12; Fri, 27 Apr 2012 19:26:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3RJQKpX021070; Fri, 27 Apr 2012 19:26:20 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3RJQJQZ021065; Fri, 27 Apr 2012 19:26:19 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201204271926.q3RJQJQZ021065@svn.freebsd.org> From: Dimitry Andric Date: Fri, 27 Apr 2012 19:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234737 - stable/9/usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Apr 2012 19:26:20 -0000 Author: dim Date: Fri Apr 27 19:26:19 2012 New Revision: 234737 URL: http://svn.freebsd.org/changeset/base/234737 Log: 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/9/usr.sbin/sysinstall/dispatch.c stable/9/usr.sbin/sysinstall/install.c stable/9/usr.sbin/sysinstall/label.c stable/9/usr.sbin/sysinstall/modules.c Modified: stable/9/usr.sbin/sysinstall/dispatch.c ============================================================================== --- stable/9/usr.sbin/sysinstall/dispatch.c Fri Apr 27 18:21:45 2012 (r234736) +++ stable/9/usr.sbin/sysinstall/dispatch.c Fri Apr 27 19:26:19 2012 (r234737) @@ -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/9/usr.sbin/sysinstall/install.c ============================================================================== --- stable/9/usr.sbin/sysinstall/install.c Fri Apr 27 18:21:45 2012 (r234736) +++ stable/9/usr.sbin/sysinstall/install.c Fri Apr 27 19:26:19 2012 (r234737) @@ -1017,10 +1017,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/9/usr.sbin/sysinstall/label.c ============================================================================== --- stable/9/usr.sbin/sysinstall/label.c Fri Apr 27 18:21:45 2012 (r234736) +++ stable/9/usr.sbin/sysinstall/label.c Fri Apr 27 19:26:19 2012 (r234737) @@ -978,7 +978,7 @@ diskLabel(Device *dev) } if (msg) { if (req) { - msgConfirm(msg); + msgConfirm("%s", msg); clear_wins(); msg = NULL; } Modified: stable/9/usr.sbin/sysinstall/modules.c ============================================================================== --- stable/9/usr.sbin/sysinstall/modules.c Fri Apr 27 18:21:45 2012 (r234736) +++ stable/9/usr.sbin/sysinstall/modules.c Fri Apr 27 19:26:19 2012 (r234737) @@ -198,7 +198,7 @@ kldBrowser(dialogMenuItem *self) if (err != NULL) { what |= DITEM_FAILURE; if (!variable_get(VAR_NO_ERROR)) - msgConfirm(err); + msgConfirm("%s", err); } return (what);