diff options
| author | Karel Zak | 2013-07-10 17:10:58 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-16 16:47:07 +0200 |
| commit | 19c2cc4e75e29d31d85969009b12b473257e9d82 (patch) | |
| tree | 0ce242c2dab21e341c69d122d1cdc59c7e806d36 /fdisks/fdiskbsdlabel.c | |
| parent | fdisk: (bsd) remove xbsd_ prefix (diff) | |
| download | kernel-qcow2-util-linux-19c2cc4e75e29d31d85969009b12b473257e9d82.tar.gz kernel-qcow2-util-linux-19c2cc4e75e29d31d85969009b12b473257e9d82.tar.xz kernel-qcow2-util-linux-19c2cc4e75e29d31d85969009b12b473257e9d82.zip | |
fdisk: (bsd) final code clean up
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdiskbsdlabel.c')
| -rw-r--r-- | fdisks/fdiskbsdlabel.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fdisks/fdiskbsdlabel.c b/fdisks/fdiskbsdlabel.c index d8627b053..87688b235 100644 --- a/fdisks/fdiskbsdlabel.c +++ b/fdisks/fdiskbsdlabel.c @@ -59,7 +59,7 @@ #include "fdiskbsdlabel.h" #include "all-io.h" -static char *bsd_dktypenames[] = { +static const char *bsd_dktypenames[] = { "unknown", "SMD", "MSCP", @@ -126,7 +126,6 @@ static void sync_disks(struct fdisk_context *cxt); #define bsd_cround(c, n) \ (fdisk_context_use_cylinders(c) ? ((n)/self_disklabel(c)->d_secpercyl) + 1 : (n)) - static inline struct fdisk_bsd_label *self_label(struct fdisk_context *cxt) { assert(cxt); @@ -146,7 +145,7 @@ static inline struct bsd_disklabel *self_disklabel(struct fdisk_context *cxt) } #if defined (__alpha__) -void alpha_bootblock_checksum (char *boot) +static void alpha_bootblock_checksum (char *boot) { uint64_t *dp = (uint64_t *) boot, sum = 0; int i; @@ -505,7 +504,6 @@ static int bsd_list_disklabel(struct fdisk_context *cxt) return rc; } - static uint32_t ask_uint32(struct fdisk_context *cxt, uint32_t dflt, char *mesg) { @@ -820,7 +818,6 @@ static void sync_disks(struct fdisk_context *cxt) { fdisk_info(cxt, _("Syncing disks.")); sync(); - sleep(4); } static int bsd_translate_fstype (int linux_type) @@ -836,8 +833,10 @@ static int bsd_translate_fstype (int linux_type) case 0x07: /* OS/2 HPFS */ return BSD_FS_HPFS; default: - return BSD_FS_OTHER; + break; } + + return BSD_FS_OTHER; } /* |