whitespace fixes. no code changes

This commit is contained in:
Denis Vlasenko
2008-06-25 09:53:17 +00:00
parent f26e3d2e41
commit 7049ff8696
23 changed files with 62 additions and 75 deletions

View File

@@ -61,10 +61,9 @@ struct globals {
#define received (G.received )
#define brd_recv (G.brd_recv )
#define req_recv (G.req_recv )
#define INIT_G() \
do { \
count = -1; \
} while (0)
#define INIT_G() do { \
count = -1; \
} while (0)
// If GNUisms are not available...
//static void *mempcpy(void *_dst, const void *_src, int n)

View File

@@ -27,7 +27,7 @@ struct globals {
#define G (*(struct globals*)&bb_common_bufsiz1)
enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) };
struct BUG_G_too_big {
char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
};
#define user (G.user )
#define password (G.password )
@@ -36,8 +36,7 @@ struct BUG_G_too_big {
#define verbose_flag (G.verbose_flag )
#define do_continue (G.do_continue )
#define buf (G.buf )
#define INIT_G() do { \
} while (0)
#define INIT_G() do { } while (0)
static void ftp_die(const char *msg) ATTRIBUTE_NORETURN;

View File

@@ -147,7 +147,7 @@ static int ioctl_on_skfd(unsigned request, struct ifreq *ifr)
static int set_ifrname_and_do_ioctl(unsigned request, struct ifreq *ifr, const char *ifname)
{
strncpy_IFNAMSIZ(ifr->ifr_name, ifname);
strncpy_IFNAMSIZ(ifr->ifr_name, ifname);
return ioctl_on_skfd(request, ifr);
}

View File

@@ -582,7 +582,7 @@ static int iproute_list_or_flush(char **argv, int flush)
if (rtnl_rttable_a2n(&tid, *argv))
invarg(*argv, "table");
filter.tb = tid;
#else
#else
invarg(*argv, "table");
#endif
}

View File

@@ -25,7 +25,7 @@ struct globals {
#define handle (G.handle )
#define saved_disc (G.saved_disc )
#define saved_state (G.saved_state )
#define INIT_G() do {} while (0)
#define INIT_G() do { } while (0)
/*

View File

@@ -59,11 +59,10 @@ struct globals {
#define cmax (G.cmax )
#define env_cur (G.env_cur )
#define env_var (G.env_var )
#define INIT_G() \
do { \
cmax = 30; \
env_cur = &env_var[0]; \
} while (0)
#define INIT_G() do { \
cmax = 30; \
env_cur = &env_var[0]; \
} while (0)
/* We have to be careful about leaking memory in repeated setenv's */

View File

@@ -92,9 +92,7 @@ struct globals {
#define block_buf (G.block_buf )
#define user_opt (G.user_opt )
#define error_pkt (G.error_pkt )
#define INIT_G() \
do { \
} while (0)
#define INIT_G() do { } while (0)
#define error_pkt_reason (error_pkt[3])
#define error_pkt_str (error_pkt + 4)

View File

@@ -64,7 +64,7 @@ static void add_param_req_option(struct dhcpMessage *packet)
for (i = 0; (c = dhcp_options[i].code) != 0; i++) {
if (((dhcp_options[i].flags & OPTION_REQ)
&& !client_config.no_default_options)
&& !client_config.no_default_options)
|| (client_config.opt_mask[c >> 3] & (1 << (c & 7)))
) {
packet->options[end + OPT_DATA + len] = c;