From owner-cvs-all@FreeBSD.ORG Tue Jan 25 08:14:01 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77F7D16A4CE; Tue, 25 Jan 2005 08:14:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63C9243D39; Tue, 25 Jan 2005 08:14:01 +0000 (GMT) (envelope-from delphij@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0P8E1dH023057; Tue, 25 Jan 2005 08:14:01 GMT (envelope-from delphij@repoman.freebsd.org) Received: (from delphij@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0P8E1sZ023056; Tue, 25 Jan 2005 08:14:01 GMT (envelope-from delphij) Message-Id: <200501250814.j0P8E1sZ023056@repoman.freebsd.org> From: Xin LI Date: Tue, 25 Jan 2005 08:14:00 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sbin/reboot Makefile reboot.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jan 2005 08:14:01 -0000 delphij 2005-01-25 08:14:00 UTC FreeBSD src repository Modified files: sbin/reboot Makefile reboot.c Log: The kernel specified in main() of reboot(8) will be initialized with -k option and never be used without kflag. This confuses gcc because we set "kflag" at the same time with "kernel", but the logic is not that apparant for gcc. Since we can initialize "kernel" to NULL then know if "k" option is set through determining whether it is still NULL, don't try to have gcc to guess why we are connecting "kflag" with "kernel" and use "kernel" directly in place of kflag. Bump WARNS?= from 2 to 6 Revision Changes Path 1.14 +1 -0 src/sbin/reboot/Makefile 1.21 +4 -5 src/sbin/reboot/reboot.c