summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Kerola2014-04-25 23:08:23 +0200
committerKarel Zak2014-05-06 10:12:14 +0200
commitd38b55375f7fceda03544c355e4b5350100029db (patch)
tree12d99bcab517dab9c91842da890303e6e9cd95d6
parentmkswap: remove legacy swap structure (diff)
downloadkernel-qcow2-util-linux-d38b55375f7fceda03544c355e4b5350100029db.tar.gz
kernel-qcow2-util-linux-d38b55375f7fceda03544c355e4b5350100029db.tar.xz
kernel-qcow2-util-linux-d38b55375f7fceda03544c355e4b5350100029db.zip
include/swapheader.h: ensure type sizes
Use consistently the same type sizes as in libblkid and kernel. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
-rw-r--r--include/swapheader.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/swapheader.h b/include/swapheader.h
index c986202e3..e56d93f3a 100644
--- a/include/swapheader.h
+++ b/include/swapheader.h
@@ -5,15 +5,17 @@
#define SWAP_UUID_LENGTH 16
#define SWAP_LABEL_LENGTH 16
+#include <stdint.h>
+
struct swap_header_v1_2 {
char bootbits[1024]; /* Space for disklabel etc. */
- unsigned int version;
- unsigned int last_page;
- unsigned int nr_badpages;
+ uint32_t version;
+ uint32_t last_page;
+ uint32_t nr_badpages;
unsigned char uuid[SWAP_UUID_LENGTH];
char volume_name[SWAP_LABEL_LENGTH];
- unsigned int padding[117];
- unsigned int badpages[1];
+ uint32_t padding[117];
+ uint32_t badpages[1];
};
#define SWAP_HEADER_SIZE (sizeof(struct swap_header_v1_2))