From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 10 Mar 2013 19:08:15 +0000 (+0100)
Subject: 	* grub-core/lib/arg.c (grub_arg_list_alloc): Use shifts rather
X-Git-Tag: grub-2.02-beta1~1255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea811130ea2ef4e00144dd2ced2b6ae8b010e84d;p=thirdparty%2Fgrub.git

	* grub-core/lib/arg.c (grub_arg_list_alloc): Use shifts rather
	than divisions.
---

diff --git a/ChangeLog b/ChangeLog
index c2821c956..8f8de8bfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/arg.c (grub_arg_list_alloc): Use shifts rather
+	than divisions.
+
 2013-03-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/verify.c (grub_verify_signature): Use unsigned
diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
index da44e3025..7492ac6a8 100644
--- a/grub-core/lib/arg.c
+++ b/grub-core/lib/arg.c
@@ -428,7 +428,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc,
 {
   int i;
   char **args;
-  unsigned argcnt;
+  grub_size_t argcnt;
   struct grub_arg_list *list;
   const struct grub_arg_option *options;
 
@@ -440,7 +440,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc,
   for (i = 0; options[i].doc; i++)
     {
       if (options[i].flags & GRUB_ARG_OPTION_REPEATABLE)
-	argcnt += (argc + 1) / 2 + 1; /* max possible for any option */
+	argcnt += ((grub_size_t) argc + 1) / 2 + 1; /* max possible for any option */
     }
 
   list = grub_zalloc (sizeof (*list) * i + sizeof (char*) * argcnt);
@@ -456,7 +456,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc,
       if (options[i].flags & GRUB_ARG_OPTION_REPEATABLE)
 	{
 	  list[i].args = args;
-	  args += argc / 2 + 1;
+	  args += (grub_size_t) argc / 2 + 1;
 	}
     }
   return list;