[2198] 2009-05-08 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 2198
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2198
Author:   proski
Date:     2009-05-08 19:29:04 +0000 (Fri, 08 May 2009)
Log Message:
-----------
2009-05-08  Pavel Roskin  <address@hidden>

        * disk/raid.c (grub_raid_block_xor): Make buf2 constant, it's
        not modified.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/disk/raid.c
    trunk/grub2/include/grub/raid.h

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-05-08 19:21:26 UTC (rev 2197)
+++ trunk/grub2/ChangeLog       2009-05-08 19:29:04 UTC (rev 2198)
@@ -1,5 +1,8 @@
 2009-05-08  Pavel Roskin  <address@hidden>
 
+       * disk/raid.c (grub_raid_block_xor): Make buf2 constant, it's
+       not modified.
+
        * disk/raid6_recover.c (grub_raid6_recover): Fix warnings about
        uninitialized err[0] and err[1].  Rename them to bad1 and bad2.
        Initialize them with -1.  Add sanity check for bad1.  Eliminate

Modified: trunk/grub2/disk/raid.c
===================================================================
--- trunk/grub2/disk/raid.c     2009-05-08 19:21:26 UTC (rev 2197)
+++ trunk/grub2/disk/raid.c     2009-05-08 19:29:04 UTC (rev 2198)
@@ -172,12 +172,13 @@
 }
 
 void
-grub_raid_block_xor (char *buf1, char *buf2, int size)
+grub_raid_block_xor (char *buf1, const char *buf2, int size)
 {
-  grub_size_t *p1, *p2;
+  grub_size_t *p1;
+  const grub_size_t *p2;
 
   p1 = (grub_size_t *) buf1;
-  p2 = (grub_size_t *) buf2;
+  p2 = (const grub_size_t *) buf2;
   size /= GRUB_CPU_SIZEOF_VOID_P;
 
   while (size)

Modified: trunk/grub2/include/grub/raid.h
===================================================================
--- trunk/grub2/include/grub/raid.h     2009-05-08 19:21:26 UTC (rev 2197)
+++ trunk/grub2/include/grub/raid.h     2009-05-08 19:29:04 UTC (rev 2198)
@@ -68,7 +68,7 @@
 void grub_raid_unregister (grub_raid_t raid);
 
 void grub_raid_rescan (void);
-void grub_raid_block_xor (char *buf1, char *buf2, int size);
+void grub_raid_block_xor (char *buf1, const char *buf2, int size);
 
 typedef grub_err_t (*grub_raid5_recover_func_t) (struct grub_raid_array *array,
                                                  int disknr, char *buf,