* include/grub/diskfilter.h (grub_raid5_recover_func_t): Use proper

	type for size.
	(grub_raid6_recover_func_t): Likewise.
	* grub-core/disk/raid5_recover.c (grub_raid5_recover): Likewise.
	* grub-core/disk/raid6_recover.c (grub_raid6_recover): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 51274db88c596adc5100699883cbd05f0d97ce4f..c7241bb48894ee14e6e1a69645bd65fea275e756 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/diskfilter.h (grub_raid5_recover_func_t): Use proper
+       type for size.
+       (grub_raid6_recover_func_t): Likewise.
+       * grub-core/disk/raid5_recover.c (grub_raid5_recover): Likewise.
+       * grub-core/disk/raid6_recover.c (grub_raid6_recover): Likewise.
+
 2012-06-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkimage.c (generate_image): Add Fuloong2F verified hash.

diff --git a/grub-core/disk/raid5_recover.c b/grub-core/disk/raid5_recover.c
index 62d76d1dfebeece04340295746af4783cd17316a..4ace9172e7ff68d75ad1508f85b8db775a891adf 100644 (file)
--- a/grub-core/disk/raid5_recover.c
+++ b/grub-core/disk/raid5_recover.c
@@ -29,7 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 static grub_err_t
 grub_raid5_recover (struct grub_diskfilter_segment *array, int disknr,
-                    char *buf, grub_disk_addr_t sector, int size)
+                    char *buf, grub_disk_addr_t sector, grub_size_t size)
 {
   char *buf2;
   int i;

diff --git a/grub-core/disk/raid6_recover.c b/grub-core/disk/raid6_recover.c
index 779a39eaa97b68d238b8e9a6163b8b951907b7ad..ba889ba3de37cafbb1dba77e54086288516af0bc 100644 (file)
--- a/grub-core/disk/raid6_recover.c
+++ b/grub-core/disk/raid6_recover.c
@@ -65,7 +65,7 @@ grub_raid6_init_table (void)
 
 static grub_err_t
 grub_raid6_recover (struct grub_diskfilter_segment *array, int disknr, int p,
-                    char *buf, grub_disk_addr_t sector, int size)
+                    char *buf, grub_disk_addr_t sector, grub_size_t size)
 {
   int i, q, pos;
   int bad1 = -1, bad2 = -1;

diff --git a/include/grub/diskfilter.h b/include/grub/diskfilter.h
index 38bb3adddc0fb58cdc90148189b94e7f4b1aad60..b25807eeef1ee775163b07494eec35950031377b 100644 (file)
--- a/include/grub/diskfilter.h
+++ b/include/grub/diskfilter.h
@@ -178,12 +178,12 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
 typedef grub_err_t (*grub_raid5_recover_func_t) (struct grub_diskfilter_segment *array,
                                                  int disknr, char *buf,
                                                  grub_disk_addr_t sector,
-                                                 int size);
+                                                 grub_size_t size);
 
 typedef grub_err_t (*grub_raid6_recover_func_t) (struct grub_diskfilter_segment *array,
                                                  int disknr, int p, char *buf,
                                                  grub_disk_addr_t sector,
-                                                 int size);
+                                                 grub_size_t size);
 
 extern grub_raid5_recover_func_t grub_raid5_recover_func;
 extern grub_raid6_recover_func_t grub_raid6_recover_func;