diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
| commit | 89963b524d211e1aec12b72b3725be05ee95c8cf (patch) | |
| tree | 48590aef62b7ee7686b7898256f29def8d9c50b9 /coreutils/od_bloaty.c | |
| parent | 9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff) | |
| parent | 2b7c1aa92c68524559a2067609d09309d5c09adc (diff) | |
| download | busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.gz busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.bz2 busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/od_bloaty.c')
| -rw-r--r-- | coreutils/od_bloaty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index ea1ab9de8..76ee5137a 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c | |||
| @@ -634,7 +634,7 @@ decode_one_format(const char *s_orig, const char *s, struct tspec *tspec) | |||
| 634 | bytes_to_unsigned_dec_digits, | 634 | bytes_to_unsigned_dec_digits, |
| 635 | bytes_to_hex_digits, | 635 | bytes_to_hex_digits, |
| 636 | }; | 636 | }; |
| 637 | static const char doux_fmtstring[][sizeof(" %%0%u%s")] = { | 637 | static const char doux_fmtstring[][sizeof(" %%0%u%s")] ALIGN1 = { |
| 638 | " %%%u%s", | 638 | " %%%u%s", |
| 639 | " %%0%u%s", | 639 | " %%0%u%s", |
| 640 | " %%%u%s", | 640 | " %%%u%s", |
| @@ -1155,7 +1155,7 @@ dump_strings(off_t address, off_t end_offset) | |||
| 1155 | static int | 1155 | static int |
| 1156 | parse_old_offset(const char *s, off_t *offset) | 1156 | parse_old_offset(const char *s, off_t *offset) |
| 1157 | { | 1157 | { |
| 1158 | static const struct suffix_mult Bb[] = { | 1158 | static const struct suffix_mult Bb[] ALIGN_SUFFIX = { |
| 1159 | { "B", 1024 }, | 1159 | { "B", 1024 }, |
| 1160 | { "b", 512 }, | 1160 | { "b", 512 }, |
| 1161 | { "", 0 } | 1161 | { "", 0 } |