From a6f1df3b966d28d853b3cb7396ff2f7f6eea55c4 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Jun 2020 17:09:37 +0200
Subject: [PATCH 2/3] cmdline: Make arguments const

We already don't modify the strings. This changes just allows the compiler to
check for it and makes tests easier

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
---
 grub-core/lib/cmdline.c    | 9 +++++----
 include/grub/lib/cmdline.h | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
index 7cd695508..dae72925d 100644
--- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c
@@ -20,7 +20,7 @@
 #include <grub/lib/cmdline.h>
 #include <grub/misc.h>
 
-static unsigned int check_arg (char *c, int *has_space, int *has_eq_before_space)
+static unsigned int check_arg (const char *c, int *has_space, int *has_eq_before_space)
 {
   int space = 0;
   unsigned int size = 0;
@@ -50,7 +50,7 @@ static unsigned int check_arg (char *c, int *has_space, int *has_eq_before_space
   return size;
 }
 
-unsigned int grub_loader_cmdline_size (int argc, char *argv[])
+unsigned int grub_loader_cmdline_size (int argc, const char *const argv[])
 {
   int i;
   unsigned int size = 0;
@@ -68,12 +68,13 @@ unsigned int grub_loader_cmdline_size (int argc, char *argv[])
 }
 
 grub_err_t
-grub_create_loader_cmdline (int argc, char *argv[], char *buf,
+grub_create_loader_cmdline (int argc, const char *const argv[], char *buf,
 			    grub_size_t size, enum grub_verify_string_type type)
 {
   int i;
   unsigned int arg_size;
-  char *c, *orig_buf = buf;
+  const char *c;
+  char *orig_buf = buf;
 
   for (i = 0; i < argc; i++)
     {
diff --git a/include/grub/lib/cmdline.h b/include/grub/lib/cmdline.h
index cdca09b7a..302459359 100644
--- a/include/grub/lib/cmdline.h
+++ b/include/grub/lib/cmdline.h
@@ -25,8 +25,8 @@
 
 #define LINUX_IMAGE "BOOT_IMAGE="
 
-unsigned int grub_loader_cmdline_size (int argc, char *argv[]);
-grub_err_t grub_create_loader_cmdline (int argc, char *argv[], char *buf,
+unsigned int grub_loader_cmdline_size (int argc, const char *const argv[]);
+grub_err_t grub_create_loader_cmdline (int argc, const char *const argv[], char *buf,
 				       grub_size_t size, enum grub_verify_string_type type);
 
 #endif /* ! GRUB_CMDLINE_HEADER */
-- 
2.20.1

