diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /coreutils/od.c | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'coreutils/od.c')
| -rw-r--r-- | coreutils/od.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/od.c b/coreutils/od.c index 9a888dd5f..6f22331e0 100644 --- a/coreutils/od.c +++ b/coreutils/od.c | |||
| @@ -144,7 +144,7 @@ odoffset(dumper_t *dumper, int argc, char ***argvp) | |||
| 144 | } | 144 | } |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | static const char *const add_strings[] = { | 147 | static const char *const add_strings[] ALIGN_PTR = { |
| 148 | "16/1 \"%3_u \" \"\\n\"", /* a */ | 148 | "16/1 \"%3_u \" \"\\n\"", /* a */ |
| 149 | "8/2 \" %06o \" \"\\n\"", /* B, o */ | 149 | "8/2 \" %06o \" \"\\n\"", /* B, o */ |
| 150 | "16/1 \"%03o \" \"\\n\"", /* b */ | 150 | "16/1 \"%03o \" \"\\n\"", /* b */ |