From 36498496a0600d6dca7df326fb899adea769f3f8 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 25 Jun 2012 17:36:50 +0200 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ grub-core/disk/raid5_recover.c | 2 +- grub-core/disk/raid6_recover.c | 2 +- include/grub/diskfilter.h | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51274db88..c7241bb48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-06-25 Vladimir Serbinenko + + * 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 * 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 62d76d1df..4ace9172e 100644 --- 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 779a39eaa..ba889ba3d 100644 --- 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 38bb3addd..b25807eee 100644 --- 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;