more C standard compat fixes from Dan Fandrich

function                                             old     new   delta
docolon                                              207     204      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/coreutils/cut.c b/coreutils/cut.c
index 9cc22be16ef1773c293023a699c87d5ae5f7fa65..240ce4bb9dab2d1cbd5da8ecda20249074d2749a 100644 (file)
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -111,7 +111,10 @@ static void cut_file(FILE *file, char delim, const struct cut_list *cut_lists, u
                        int ndelim = -1;        /* zero-based / one-based problem */
                        int nfields_printed = 0;
                        char *field = NULL;
-                       const char delimiter[2] = { delim, 0 };
+                       char delimiter[2];
+
+                       delimiter[0] = delim;
+                       delimiter[1] = 0;
 
                        /* does this line contain any delimiters? */
                        if (strchr(line, delim) == NULL) {

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 5281d811829077cf7848d9505ceb89fb3067e2ea..3fdfc236a4714caa5f8db23746971a9d18424bf6 100644 (file)
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -29,7 +29,7 @@ static const struct suffix_mult dd_suffixes[] = {
        { "M", 1048576 },
        { "GD", 1000000000 },
        { "G", 1073741824 },
-       { }
+       { "", 0 }
 };
 
 struct globals {

diff --git a/coreutils/expr.c b/coreutils/expr.c
index 54c2ee1655510614319d1f4b49ac4b80c683065e..f5701a460e1b643ff432f6634a55fbe864301013 100644 (file)
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -214,9 +214,9 @@ static arith_t arithmetic_common(VALUE *l, VALUE *r, int op)
 
 static VALUE *docolon(VALUE *sv, VALUE *pv)
 {
+       enum { NMATCH = 2 };
        VALUE *v;
        regex_t re_buffer;
-       const int NMATCH = 2;
        regmatch_t re_regs[NMATCH];
 
        tostring(sv);

diff --git a/coreutils/head.c b/coreutils/head.c
index ac476d09199e93b9967b20202c9b921eb8e353f1..0fab8a8ae75d2db3aafc6d647b39b89b46739a61 100644 (file)
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -25,7 +25,7 @@ static const struct suffix_mult head_suffixes[] = {
        { "b", 512 },
        { "k", 1024 },
        { "m", 1024*1024 },
-       { }
+       { "", 0 }
 };
 #endif
 

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 00efec51c64779aaa7adda5b3483ff8461a519a1..1d5769bd88579b03349aa44a32ea2e31d4cb901a 100644 (file)
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -963,7 +963,7 @@ parse_old_offset(const char *s, off_t *offset)
        static const struct suffix_mult Bb[] = {
                { "B", 1024 },
                { "b", 512 },
-               { }
+               { "", 0 }
        };
        char *p;
        int radix;
@@ -1178,7 +1178,7 @@ int od_main(int argc, char **argv)
                { "b", 512 },
                { "k", 1024 },
                { "m", 1024*1024 },
-               { }
+               { "", 0 }
        };
        enum {
                OPT_A = 1 << 0,

diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index b16d03c2bd57fa9772e9c2e535ce462d1b73c006..399a38dd4eb20ddb1361b186b6d6f126f0fdee12 100644 (file)
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -29,7 +29,7 @@ static const struct suffix_mult sfx[] = {
        { "m", 60 },
        { "h", 60*60 },
        { "d", 24*60*60 },
-       { }
+       { "", 0 }
 };
 #endif
 

diff --git a/coreutils/split.c b/coreutils/split.c
index f1ec64be0248ccae871101892aae1902788ca2a3..2191f30ea94727bcf114673a62c43b7518eeb183 100644 (file)
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -20,7 +20,7 @@ static const struct suffix_mult split_suffices[] = {
 #if ENABLE_FEATURE_SPLIT_FANCY
        { "g", 1024*1024*1024 },
 #endif
-       { }
+       { "", 0 }
 };
 
 /* Increment the suffix part of the filename.

diff --git a/coreutils/stty.c b/coreutils/stty.c
index e02fe7c720f87c8b43b933b9a9ca4658f29d2f64..baa1ec2da78e7d05a35bd9101913a2324662f933 100644 (file)
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -774,7 +774,7 @@ static const struct suffix_mult stty_suffixes[] = {
        { "b",  512 },
        { "k", 1024 },
        { "B", 1024 },
-       { }
+       { "", 0 }
 };
 
 static const struct mode_info *find_mode(const char *name)

diff --git a/coreutils/tail.c b/coreutils/tail.c
index 05dadcd9bd1e34a5aecaca5ddd7386516f69ae91..0be16631509aef0ded97004e9ee64bb3ab526a63 100644 (file)
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -30,7 +30,7 @@ static const struct suffix_mult tail_suffixes[] = {
        { "b", 512 },
        { "k", 1024 },
        { "m", 1024*1024 },
-       { }
+       { "", 0 }
 };
 
 struct globals {

diff --git a/coreutils/uname.c b/coreutils/uname.c
index 8453bcc0171afa6c1679d78fb9b737264821e104..9822e49bd99a87bfa915267e20b1d337f043763f 100644 (file)
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -48,8 +48,9 @@
  *  Fix handling of -a to not print "unknown", add -o and -i support.
  */
 
-#include <sys/utsname.h>
 #include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
 
 typedef struct {
        struct utsname name;

diff --git a/findutils/find.c b/findutils/find.c
index 5e8193ffa487030672c255f4495a65be788aaf52..ba8fa08543ca298cafdf00e9ecb6fdb41844bb7d 100644 (file)
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -782,7 +782,7 @@ static action*** parse_params(char **argv)
                                { "", 512 },
                                { "b", 512 },
                                { "k", 1024 },
-                               { }
+                               { "", 0 }
                        };
                        action_size *ap;
                        ap = ALLOC_ACTION(size);

diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index 8b9c4ec2065f2b360497c30f2f1cdb4aa4fcef7a..937d2dbfbe0fbaf6ca0106a1c5bd05031e7e053f 100644 (file)
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -7,9 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <sys/utsname.h>               /* for uname(2) */
-
 #include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>  /* for uname(2) */
+
 
 /* Returns current kernel version encoded as major*65536 + minor*256 + patch,
  * so, for example,  to check if the kernel is greater than 2.2.11:

diff --git a/libbb/login.c b/libbb/login.c
index ba9f4d2b58b3d27d0b91194ba2e3bcd8f91a4d05..07247a8c54d7a4bf006c97a5d08a382aea3a4bed 100644 (file)
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -9,9 +9,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <sys/param.h>  /* MAXHOSTNAMELEN */
-#include <sys/utsname.h>
 #include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
 
 #define LOGIN " login: "
 

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 85f93b6395a25c8a007b64f2ebd323ad4940d961..a184669356e854fbbdb24901312ef6d39fdc7201 100644 (file)
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -7,6 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
+#include <sys/socket.h> /* netinet/in.h needs it */
 #include <netinet/in.h>
 #include <net/if.h>
 #include <sys/un.h>

diff --git a/miscutils/dc.c b/miscutils/dc.c
index ff2bc3bcef6869eacb8be7799cc97657b65e5d13..3656cddc6ed9bff1566059f490a3e231f6dcdce2 100644 (file)
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -182,7 +182,7 @@ static const struct op operators[] = {
        {"p", print_no_pop},
        {"f", print_stack_no_pop},
        {"o", set_output_base},
-       { /* zero filled */ }
+       { "", NULL }
 };
 
 static void stack_machine(const char *argument)

diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index e334d0189cd5537b77f81c78e6b9d8238f7b6d8d..8e961f0c19a9e31dfcc05ada4d7c62abc6956cdc 100644 (file)
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -33,7 +33,7 @@ int watchdog_main(int argc, char **argv)
        static const struct suffix_mult suffixes[] = {
                { "ms", 1 },
                { "", 1000 },
-               { }
+               { "", 0 }
        };
 
        unsigned opts;

diff --git a/modutils/depmod.c b/modutils/depmod.c
index 5ec2a51dddaf73510c0e1e0f89146c0c1830b352..d6cc8ed59e43e88858ab48aaa610fa0942f8e35b 100644 (file)
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -10,9 +10,9 @@
 
 #undef _GNU_SOURCE
 #define _GNU_SOURCE
-#include <libbb.h>
-#include <sys/utsname.h> /* uname() */
+#include "libbb.h"
 #include "modutils.h"
+#include <sys/utsname.h> /* uname() */
 
 /*
  * Theory of operation:

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index bbd700eb723316497c38b2f47a7ababed5a25c27..02d8fbd40e49bb7ce8d7afbffe71c7301c1b2629 100644 (file)
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -9,7 +9,7 @@
  */
 
 #include "libbb.h"
-
+/* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h> /* uname() */
 #include <fnmatch.h>
 

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 7a9709e403bc557de85f0963c494cbc06bc3c169..6b9449213baef36c01ca62e3b4297cb22da5448d 100644 (file)
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -17,11 +17,11 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
+#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
 #include <fnmatch.h>
 
-#include "libbb.h"
-
 #define MAX_OPT_DEPTH 10
 #define EUNBALBRACK 10001
 #define EUNDEFVAR   10002

diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c
index ddb894432c6bff0066187e01eed2a8657a6e5ddc..38f99196eed06f05178e286c55084ef7f0f330d7 100644 (file)
--- a/networking/udhcp/options.c
+++ b/networking/udhcp/options.c
@@ -57,7 +57,7 @@ const struct dhcp_option dhcp_options[] = {
         * with "option XXX YYY" syntax in dhcpd config file. */
 
        { OPTION_U16                              , 0x39 }, /* DHCP_MAX_SIZE      */
-       { } /* zeroed terminating entry */
+       { 0, 0 } /* zeroed terminating entry */
 };
 
 /* Used for converting options from incoming packets to env variables

diff --git a/runit/svlogd.c b/runit/svlogd.c
index 66a13fbd04b94f374a5005ce95ecc72ac15d6804..34ceadf7280ca78ccf7ed18f8a88085811856432 100644 (file)
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -682,7 +682,7 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
                                static const struct suffix_mult km_suffixes[] = {
                                        { "k", 1024 },
                                        { "m", 1024*1024 },
-                                       { }
+                                       { "", 0 }
                                };
                                ld->sizemax = xatou_sfx(&s[1], km_suffixes);
                                break;
@@ -698,7 +698,7 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
                                        { "m", 60 },
                                        { "h", 60*60 },
                                        /*{ "d", 24*60*60 },*/
-                                       { }
+                                       { "", 0 }
                                };
                                ld->rotate_period = xatou_sfx(&s[1], mh_suffixes);
                                if (ld->rotate_period) {

diff --git a/shell/msh_unused.c b/shell/msh_unused.c
index fe85a8170e4ce514ad311f12170c67dd2cf3eb0a..d4fe3db1bd733ec2f540e961a9702f55edda5bb2 100644 (file)
--- a/shell/msh_unused.c
+++ b/shell/msh_unused.c
@@ -2064,7 +2064,7 @@ static int rlookup(char *n)
                { "{"    , '{'    },
                { "}"    , '}'    },
                { "."    , DOT    },
-               { },
+               { ""     , 0      },
        };
 
        const struct res *rp;

diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 98d1ac2bae672f02c89074d3da449b43567de0df..f3878f44ffefb52d4543bfd1e84780a8a7952b07 100644 (file)
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -47,7 +47,7 @@ static const struct suffix_mult suffixes[] = {
        { "b", 512 },
        { "k", 1024 },
        { "m", 1024*1024 },
-       { }
+       { "", 0 }
 };
 
 int hexdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 2cdb186c51ff226c8e8dce8a77e5d38b290dc30e..6dff57f094a5ff9192337f6c3278938cbf960642 100644 (file)
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -7,8 +7,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
 
-#include <sys/utsname.h>
 #include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
 #include "rtc_.h"
 
 #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
@@ -67,7 +68,10 @@ static void show_clock(int utc)
 static void to_sys_clock(int utc)
 {
        struct timeval tv;
-       const struct timezone tz = { timezone/60 - 60*daylight, 0 };
+       struct timezone tz;
+
+       tz.tz_minuteswest = timezone/60 - 60*daylight;
+       tz.tz_dsttime = 0;
 
        tv.tv_sec = read_rtc(utc);
        tv.tv_usec = 0;