Merge branch 'master' into phcoder/ports/alpha

ChangeLog

@@ -1,3 +1,14 @@
+2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/cmdline.c (grub_history_get): Make argument into
+	unsigned.
+	(grub_history_replace): Likewise.
+
+2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/raid6_recover.c: Use unsigned arithmetics when
+	appropriate.
+
 2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/video/bitmap_scale.c: Use unsigned arithmetics when

grub-core/disk/raid6_recover.c

@@ -30,11 +30,11 @@ GRUB_MOD_LICENSE ("GPLv3+");
 /* x**y.  */
 static grub_uint8_t powx[255 * 2];
 /* Such an s that x**s = y */
-static int powx_inv[256];
+static unsigned powx_inv[256];
 static const grub_uint8_t poly = 0x1d;
 
 static void
-grub_raid_block_mulx (int mul, char *buf, int size)
+grub_raid_block_mulx (unsigned mul, char *buf, int size)
 {
   int i;
   grub_uint8_t *p;
@@ -48,7 +48,7 @@ grub_raid_block_mulx (int mul, char *buf, int size)
 static void
 grub_raid6_init_table (void)
 {
-  int i;
+  unsigned i;
 
   grub_uint8_t cur = 1;
   for (i = 0; i < 255; i++)
@@ -148,7 +148,7 @@ grub_raid6_recover (struct grub_diskfilter_segment *array, int disknr, int p,
   else
     {
       /* Two bad devices */
-      int c;
+      unsigned c;
 
       if (grub_diskfilter_read_node (&array->nodes[p], sector,
 				     size >> GRUB_DISK_SECTOR_BITS, buf))
@@ -162,10 +162,11 @@ grub_raid6_recover (struct grub_diskfilter_segment *array, int disknr, int p,
 
       grub_crypto_xor (qbuf, qbuf, buf, size);
 
-      c = (255 - bad1 + (255 - powx_inv[(powx[bad2 - bad1 + 255] ^ 1)])) % 255;
+      c = ((255 ^ bad1)
+	   + (255 ^ powx_inv[(powx[bad2 + (bad1 ^ 255)] ^ 1)])) % 255;
       grub_raid_block_mulx (c, qbuf, size);
 
-      c = (bad2 + c) % 255;
+      c = ((unsigned) bad2 + c) % 255;
       grub_raid_block_mulx (c, pbuf, size);
 
       grub_crypto_xor (pbuf, pbuf, qbuf, size);

grub-core/normal/cmdline.c

@@ -92,7 +92,7 @@ grub_set_history (int newsize)
 /* Get the entry POS from the history where `0' is the newest
    entry.  */
 static grub_uint32_t *
-grub_history_get (int pos)
+grub_history_get (unsigned pos)
 {
   pos = (hist_pos + pos) % hist_size;
   return hist_lines[pos];
@@ -154,7 +154,7 @@ grub_history_add (grub_uint32_t *s, grub_size_t len)
 
 /* Replace the history entry on position POS with the string S.  */
 static void
-grub_history_replace (int pos, grub_uint32_t *s, grub_size_t len)
+grub_history_replace (unsigned pos, grub_uint32_t *s, grub_size_t len)
 {
   grub_history_set ((hist_pos + pos) % hist_size, s, len);
 }