Author: imp
Date: Fri Jul 13 20:33:10 2018
New Revision: 336262
URL: https://svnweb.freebsd.org/changeset/base/336262

Log:
  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:
  head/sys/arm/arm/machdep_boot.c

Modified: head/sys/arm/arm/machdep_boot.c
==============================================================================
--- head/sys/arm/arm/machdep_boot.c     Fri Jul 13 20:08:18 2018        
(r336261)
+++ head/sys/arm/arm/machdep_boot.c     Fri Jul 13 20:33:10 2018        
(r336262)
@@ -148,13 +148,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') {
@@ -162,10 +160,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);
 }
 
 /*
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to