diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-09-28 15:13:04 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-09-28 15:13:04 +0200 |
commit | abfa3ec0598ff431407224c6b81682f7d0d35495 (patch) | |
tree | e5387999595e1f0c383c4aced38fe5a24dd90ef0 /util-linux | |
parent | aae428f0bf0fcd6cd0a2503b3a50de43785b8fd0 (diff) | |
download | busybox-w32-abfa3ec0598ff431407224c6b81682f7d0d35495.tar.gz busybox-w32-abfa3ec0598ff431407224c6b81682f7d0d35495.tar.bz2 busybox-w32-abfa3ec0598ff431407224c6b81682f7d0d35495.zip |
move storage helpers to libbb.h
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/mkfs_ext2.c | 17 | ||||
-rw-r--r-- | util-linux/mkfs_reiser.c | 16 | ||||
-rw-r--r-- | util-linux/mkfs_vfat.c | 13 |
3 files changed, 0 insertions, 46 deletions
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index f524bc239..bda168f1e 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c | |||
@@ -78,23 +78,6 @@ | |||
78 | #define EXT2_FLAGS_SIGNED_HASH 0x0001 | 78 | #define EXT2_FLAGS_SIGNED_HASH 0x0001 |
79 | #define EXT2_FLAGS_UNSIGNED_HASH 0x0002 | 79 | #define EXT2_FLAGS_UNSIGNED_HASH 0x0002 |
80 | 80 | ||
81 | // storage helpers | ||
82 | char BUG_wrong_field_size(void); | ||
83 | #define STORE_LE(field, value) \ | ||
84 | do { \ | ||
85 | if (sizeof(field) == 4) \ | ||
86 | field = SWAP_LE32((uint32_t)(value)); \ | ||
87 | else if (sizeof(field) == 2) \ | ||
88 | field = SWAP_LE16((uint16_t)(value)); \ | ||
89 | else if (sizeof(field) == 1) \ | ||
90 | field = (uint8_t)(value); \ | ||
91 | else \ | ||
92 | BUG_wrong_field_size(); \ | ||
93 | } while (0) | ||
94 | |||
95 | #define FETCH_LE32(field) \ | ||
96 | (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) | ||
97 | |||
98 | // All fields are little-endian | 81 | // All fields are little-endian |
99 | struct ext2_dir { | 82 | struct ext2_dir { |
100 | uint32_t inode1; | 83 | uint32_t inode1; |
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c index 390aef86c..b4c8dda6f 100644 --- a/util-linux/mkfs_reiser.c +++ b/util-linux/mkfs_reiser.c | |||
@@ -28,22 +28,6 @@ | |||
28 | #include "libbb.h" | 28 | #include "libbb.h" |
29 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
30 | 30 | ||
31 | char BUG_wrong_field_size(void); | ||
32 | #define STORE_LE(field, value) \ | ||
33 | do { \ | ||
34 | if (sizeof(field) == 4) \ | ||
35 | field = SWAP_LE32(value); \ | ||
36 | else if (sizeof(field) == 2) \ | ||
37 | field = SWAP_LE16(value); \ | ||
38 | else if (sizeof(field) == 1) \ | ||
39 | field = (value); \ | ||
40 | else \ | ||
41 | BUG_wrong_field_size(); \ | ||
42 | } while (0) | ||
43 | |||
44 | #define FETCH_LE32(field) \ | ||
45 | (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) | ||
46 | |||
47 | struct journal_params { | 31 | struct journal_params { |
48 | uint32_t jp_journal_1st_block; /* where does journal start from on its device */ | 32 | uint32_t jp_journal_1st_block; /* where does journal start from on its device */ |
49 | uint32_t jp_journal_dev; /* journal device st_rdev */ | 33 | uint32_t jp_journal_dev; /* journal device st_rdev */ |
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index 92f0e3b1a..6a6dc652f 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c | |||
@@ -206,19 +206,6 @@ static const char boot_code[] ALIGN1 = | |||
206 | #define MARK_CLUSTER(cluster, value) \ | 206 | #define MARK_CLUSTER(cluster, value) \ |
207 | ((uint32_t *)fat)[cluster] = SWAP_LE32(value) | 207 | ((uint32_t *)fat)[cluster] = SWAP_LE32(value) |
208 | 208 | ||
209 | void BUG_unsupported_field_size(void); | ||
210 | #define STORE_LE(field, value) \ | ||
211 | do { \ | ||
212 | if (sizeof(field) == 4) \ | ||
213 | field = SWAP_LE32((uint32_t)(value)); \ | ||
214 | else if (sizeof(field) == 2) \ | ||
215 | field = SWAP_LE16((uint16_t)(value)); \ | ||
216 | else if (sizeof(field) == 1) \ | ||
217 | field = (uint8_t)(value); \ | ||
218 | else \ | ||
219 | BUG_unsupported_field_size(); \ | ||
220 | } while (0) | ||
221 | |||
222 | /* compat: | 209 | /* compat: |
223 | * mkdosfs 2.11 (12 Mar 2005) | 210 | * mkdosfs 2.11 (12 Mar 2005) |
224 | * Usage: mkdosfs [-A] [-c] [-C] [-v] [-I] [-l bad-block-file] | 211 | * Usage: mkdosfs [-A] [-c] [-C] [-v] [-I] [-l bad-block-file] |