Date: Fri, 27 Apr 2012 19:26:19 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r234737 - stable/9/usr.sbin/sysinstall Message-ID: <201204271926.q3RJQJQZ021065@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204271926.q3RJQJQZ021065>