Release some compile fixes.

[thirdparty/mdadm.git] / bitmap.c

diff --git a/bitmap.c b/bitmap.c
index bc29768ff364225f61bf8708808627e6d8c8588e..b044cd822d57aaedfd4fc79930ea6da1943a585b 100644 (file)
--- a/bitmap.c
+++ b/bitmap.c
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "mdadm.h"
-#include <asm/byteorder.h>
 
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 
@@ -126,8 +125,13 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
 
        info = malloc(sizeof(*info));
        if (info == NULL) {
+#if __GNUC__ < 3
                fprintf(stderr, Name ": failed to allocate %d bytes\n",
+                               (int)sizeof(*info));
+#else
+               fprintf(stderr, Name ": failed to allocate %zd bytes\n",
                                sizeof(*info));
+#endif
                return NULL;
        }
 
@@ -168,7 +172,8 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
 
        if (read_bits < total_bits) { /* file truncated... */
                fprintf(stderr, Name ": WARNING: bitmap file is not large "
-                       "enough for array size %llu!\n\n", info->sb.sync_size);
+                       "enough for array size %llu!\n\n",
+                       (unsigned long long)info->sb.sync_size);
                total_bits = read_bits;
        }
 out:
@@ -263,8 +268,8 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
                                        *(__u32 *)(sb->uuid+8),
                                        *(__u32 *)(sb->uuid+12));
        }
-       printf("          Events : %llu\n", sb->events);
-       printf("  Events Cleared : %llu\n", sb->events_cleared);
+       printf("          Events : %llu\n", (unsigned long long)sb->events);
+       printf("  Events Cleared : %llu\n", (unsigned long long)sb->events_cleared);
        printf("           State : %s\n", bitmap_state(sb->state));
        printf("       Chunksize : %s\n", human_chunksize(sb->chunksize));
        printf("          Daemon : %ds flush period\n", sb->daemon_sleep);
@@ -273,7 +278,7 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
        else
                sprintf(buf, "Normal");
        printf("      Write Mode : %s\n", buf);
-       printf("       Sync Size : %llu%s\n", sb->sync_size/2,
+       printf("       Sync Size : %llu%s\n", (unsigned long long)sb->sync_size/2,
                                        human_size(sb->sync_size * 512));
        if (brief)
                goto free_info;
@@ -351,7 +356,8 @@ int CreateBitmap(char *filename, int force, char uuid[16],
        
        rv = 0;
        /* make the file be the right size (well, to the nearest byte) */
-       ftruncate(fileno(fp), filesize);
+       if (ftruncate(fileno(fp), filesize))
+               perror("ftrunace");
 out:
        fclose(fp);
        if (rv)