bc: convert to "G trick" - this returns bc to zero bss increase

[oweals/busybox.git] / coreutils / od_bloaty.c

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index f19875c427784b7a0d0cb0430da9f6a8d46a462b..4cae0c5299321feeca7ef7e58b479f519b813a48 100644 (file)
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -211,7 +211,14 @@ struct globals {
 
        bool not_first;
        bool prev_pair_equal;
+
+       char address_fmt[sizeof("%0n"OFF_FMT"xc")];
 } FIX_ALIASING;
+/* Corresponds to 'x' above */
+#define address_base_char G.address_fmt[sizeof(G.address_fmt)-3]
+/* Corresponds to 'n' above */
+#define address_pad_len_char G.address_fmt[2]
+
 #if !ENABLE_LONG_OPTS
 enum { G_pseudo_offset = 0 };
 #endif
@@ -220,6 +227,7 @@ enum { G_pseudo_offset = 0 };
        setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
        G.bytes_per_block = 32; \
+       strcpy(G.address_fmt, "%0n"OFF_FMT"xc"); \
 } while (0)
 
 
@@ -844,18 +852,12 @@ format_address_none(off_t address UNUSED_PARAM, char c UNUSED_PARAM)
 {
 }
 
-static char address_fmt[] ALIGN1 = "%0n"OFF_FMT"xc";
-/* Corresponds to 'x' above */
-#define address_base_char address_fmt[sizeof(address_fmt)-3]
-/* Corresponds to 'n' above */
-#define address_pad_len_char address_fmt[2]
-
 static void
 format_address_std(off_t address, char c)
 {
        /* Corresponds to 'c' */
-       address_fmt[sizeof(address_fmt)-2] = c;
-       printf(address_fmt, address);
+       G.address_fmt[sizeof(G.address_fmt)-2] = c;
+       printf(G.address_fmt, address);
 }
 
 #if ENABLE_LONG_OPTS
@@ -1371,9 +1373,13 @@ int od_main(int argc UNUSED_PARAM, char **argv)
        }
 
 #ifdef DEBUG
-       for (i = 0; i < G.n_specs; i++) {
-               printf("%d: fmt=\"%s\" width=%d\n",
-                       i, spec[i].fmt_string, width_bytes[spec[i].size]);
+       {
+               int i;
+               for (i = 0; i < G.n_specs; i++) {
+                       printf("%d: fmt='%s' width=%d\n",
+                               i, G.spec[i].fmt_string,
+                               width_bytes[G.spec[i].size]);
+               }
        }
 #endif