From owner-cvs-src@FreeBSD.ORG Sun Jul 3 01:10:35 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C362E16A508; Sun, 3 Jul 2005 00:58:33 +0000 (GMT) (envelope-from ps@mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id A787D44673; Sun, 3 Jul 2005 00:42:40 +0000 (GMT) (envelope-from ps@mu.org) Received: by elvis.mu.org (Postfix, from userid 1000) id 0F6876DCC2; Sat, 2 Jul 2005 17:38:10 -0700 (PDT) X-Original-To: ps@mu.org Delivered-To: ps@mu.org Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by elvis.mu.org (Postfix) with ESMTP id E609E5C98A for ; Tue, 25 Jan 2005 00:14:08 -0800 (PST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C301055937 for ; Tue, 25 Jan 2005 08:14:08 +0000 (GMT) (envelope-from owner-src-committers@FreeBSD.org) Received: by hub.freebsd.org (Postfix) id 636A116A53A; Tue, 25 Jan 2005 08:14:04 +0000 (GMT) Delivered-To: ps@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 538) id 6E7CB16A4D0; Tue, 25 Jan 2005 08:14:02 +0000 (GMT) Delivered-To: src-committers@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 To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Sender: owner-src-committers@FreeBSD.org Precedence: bulk X-Loop: FreeBSD.ORG X-Spam-Checker-Version: SpamAssassin 3.0.1 (2004-10-22) on elvis.mu.org X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.1 X-Spam-Level: Cc: Subject: cvs commit: src/sbin/reboot Makefile reboot.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sun, 03 Jul 2005 01:10:36 -0000 X-Original-Date: Tue, 25 Jan 2005 08:14:00 +0000 (UTC) X-List-Received-Date: Sun, 03 Jul 2005 01:10:36 -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