From owner-svn-src-all@freebsd.org Wed Feb 27 13:01:18 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C183151C925; Wed, 27 Feb 2019 13:01:18 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0641975713; Wed, 27 Feb 2019 13:01:18 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBB381D0B1; Wed, 27 Feb 2019 13:01:17 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1RD1Hvs070707; Wed, 27 Feb 2019 13:01:17 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1RD1Hw1070706; Wed, 27 Feb 2019 13:01:17 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201902271301.x1RD1Hw1070706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 27 Feb 2019 13:01:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r344619 - stable/11/sys/arm/arm X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/sys/arm/arm X-SVN-Commit-Revision: 344619 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0641975713 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.965,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 27 Feb 2019 13:01:18 -0000 Author: kevans Date: Wed Feb 27 13:01:17 2019 New Revision: 344619 URL: https://svnweb.freebsd.org/changeset/base/344619 Log: MFC r336262: Fix machdep_boot.c A last minute change made this no longer compile. Pass the right arg and eliminate now-unused variables from the code. Modified: stable/11/sys/arm/arm/machdep_boot.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/arm/machdep_boot.c ============================================================================== --- stable/11/sys/arm/arm/machdep_boot.c Wed Feb 27 07:55:53 2019 (r344618) +++ stable/11/sys/arm/arm/machdep_boot.c Wed Feb 27 13:01:17 2019 (r344619) @@ -150,13 +150,11 @@ arm_print_kenv(void) static void cmdline_set_env(char *cmdline, const char *guard) { - char *cmdline_next; - size_t size, guard_len; + size_t guard_len; - size = strlen(cmdline); /* Skip leading spaces. */ - for (; isspace(*cmdline) && (size > 0); cmdline++) - size--; + while (isspace(*cmdline)) + cmdline++; /* Test and remove guard. */ if (guard != NULL && guard[0] != '\0') { @@ -164,10 +162,9 @@ cmdline_set_env(char *cmdline, const char *guard) if (strncasecmp(cmdline, guard, guard_len) != 0) return; cmdline += guard_len; - size -= guard_len; } - boothowto |= boot_parse_cmdline(); + boothowto |= boot_parse_cmdline(cmdline); } /*