Fix some compiler warnings emitted by gcc-4.8.0

[oweals/busybox.git] / util-linux / fdisk_osf.c

diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index b89a2b2af8952e574dfbbe30662f7f7a59578d83..ff16389bd5a7aa834f3f1f86a151c92beed505af 100644 (file)
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -43,18 +43,15 @@
 
 #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
 
-#if defined(i386) || defined(__sparc__) || defined(__arm__) \
- || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
- || defined(__s390__) || defined(__s390x__) \
- || defined(__sh__) || defined(__x86_64__) || defined(__avr32__)
-# define BSD_LABELSECTOR   1
-# define BSD_LABELOFFSET   0
-#elif defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
+#if defined(__alpha__) \
+ || defined(__powerpc__) \
+ || defined(__ia64__) \
  || defined(__hppa__)
 # define BSD_LABELSECTOR   0
 # define BSD_LABELOFFSET   64
 #else
-# error unknown architecture
+# define BSD_LABELSECTOR   1
+# define BSD_LABELOFFSET   0
 #endif
 
 #define BSD_BBSIZE        8192          /* size of boot area, with label */
@@ -901,8 +898,7 @@ xbsd_initlabel(struct partition *p)
        pp->p_fstype = BSD_FS_UNUSED;
 #else
        d->d_npartitions = 3;
-       pp = &d->d_partitions[2];             /* Partition C should be
-                                                  the whole disk */
+       pp = &d->d_partitions[2]; /* Partition C should be the whole disk */
        pp->p_offset = 0;
        pp->p_size   = d->d_secperunit;
        pp->p_fstype = BSD_FS_UNUSED;
@@ -938,7 +934,7 @@ xbsd_readlabel(struct partition *p)
                fdisk_fatal(unable_to_read);
 
        memmove(d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
-                  sizeof(struct xbsd_disklabel));
+                       sizeof(struct xbsd_disklabel));
 
        if (d->d_magic != BSD_DISKMAGIC || d->d_magic2 != BSD_DISKMAGIC)
                return 0;