restripe: fix compilation of "make test"

Signed-off-by: NeilBrown <neilb@suse.com>

diff --git a/Makefile b/Makefile
index fde2e63af77d3175e123828f7f02f87cc9042bb4..ce2abfa052be4279e5debe170dc1bde74290cdc3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ mdmon : $(MON_OBJS) | check_rundir
 msg.o: msg.c msg.h
 
 test_stripe : restripe.c xmalloc.o mdadm.h
-       $(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe xmalloc.o  -DMAIN restripe.c
+       $(CC) $(CFLAGS) $(CXFLAGS) $(LDFLAGS) -o test_stripe xmalloc.o  -DMAIN restripe.c
 
 raid6check : raid6check.o mdadm.h $(CHECK_OBJS)
        $(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)

diff --git a/restripe.c b/restripe.c
index 4d921904b5e99197504469166fff44891bf29da2..56dca73ea86bc6790cd8c10ed7d3a613e26aa608 100644 (file)
--- a/restripe.c
+++ b/restripe.c
@@ -434,7 +434,7 @@ void raid6_datap_recov(int disks, size_t bytes, int faila, uint8_t **ptrs,
 /* Try to find out if a specific disk has a problem */
 int raid6_check_disks(int data_disks, int start, int chunk_size,
                      int level, int layout, int diskP, int diskQ,
-                     char *p, char *q, char **stripes)
+                     uint8_t *p, uint8_t *q, char **stripes)
 {
        int i;
        int data_id, diskD;
@@ -827,8 +827,8 @@ int test_stripes(int *source, unsigned long long *offsets,
        char *stripe_buf = xmalloc(raid_disks * chunk_size);
        char **stripes = xmalloc(raid_disks * sizeof(char*));
        char **blocks = xmalloc(raid_disks * sizeof(char*));
-       char *p = xmalloc(chunk_size);
-       char *q = xmalloc(chunk_size);
+       uint8_t *p = xmalloc(chunk_size);
+       uint8_t *q = xmalloc(chunk_size);
 
        int i;
        int diskP, diskQ;