diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-15 21:30:45 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-15 21:30:45 +0000 |
commit | 6b06cb80be64fcf207bee734cc678c25434ed1a4 (patch) | |
tree | aebc37ae3a2658fba3f57003102fa0dfb1a10ac8 /networking/libiproute | |
parent | 43d5d429fd7a80ca02eb8388f058fd9654cc118d (diff) | |
download | busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.tar.gz busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.tar.bz2 busybox-w32-6b06cb80be64fcf207bee734cc678c25434ed1a4.zip |
more of -Wall fixes from Cristian Ionescu-Idbohrn.
Some are fixing real bugs.
function old new delta
syslogd_main 938 958 +20
get_signum 136 143 +7
obj_load 777 782 +5
recv_from_to 210 214 +4
get_next_block 1795 1799 +4
display_topmem_process_list 1117 1121 +4
logread_main 484 487 +3
buffer_fill_and_print 73 76 +3
kill_main 687 689 +2
ll_remember_index 240 241 +1
do_stats 452 453 +1
if_readconf 166 165 -1
display_process_list 1192 1191 -1
run_applet_and_exit 507 505 -2
print_signames 33 31 -2
parse_one_line 1092 1090 -2
find_out_spec 57 55 -2
add_ksymoops_symbols 421 419 -2
ash_main 1407 1402 -5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 11/8 up/down: 54/-17) Total: 37 bytes
Diffstat (limited to 'networking/libiproute')
-rw-r--r-- | networking/libiproute/libnetlink.c | 8 | ||||
-rw-r--r-- | networking/libiproute/ll_map.c | 2 | ||||
-rw-r--r-- | networking/libiproute/ll_proto.c | 6 | ||||
-rw-r--r-- | networking/libiproute/ll_types.c | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index d29d035d0..47a055ac0 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c | |||
@@ -265,7 +265,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, | |||
265 | if (msg.msg_namelen != sizeof(nladdr)) { | 265 | if (msg.msg_namelen != sizeof(nladdr)) { |
266 | bb_error_msg_and_die("sender address length == %d", msg.msg_namelen); | 266 | bb_error_msg_and_die("sender address length == %d", msg.msg_namelen); |
267 | } | 267 | } |
268 | for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) { | 268 | for (h = (struct nlmsghdr*)buf; status >= (int)sizeof(*h); ) { |
269 | // int l_err; | 269 | // int l_err; |
270 | int len = h->nlmsg_len; | 270 | int len = h->nlmsg_len; |
271 | int l = len - sizeof(*h); | 271 | int l = len - sizeof(*h); |
@@ -293,7 +293,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, | |||
293 | 293 | ||
294 | if (h->nlmsg_type == NLMSG_ERROR) { | 294 | if (h->nlmsg_type == NLMSG_ERROR) { |
295 | struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h); | 295 | struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h); |
296 | if (l < sizeof(struct nlmsgerr)) { | 296 | if (l < (int)sizeof(struct nlmsgerr)) { |
297 | bb_error_msg("ERROR truncated"); | 297 | bb_error_msg("ERROR truncated"); |
298 | } else { | 298 | } else { |
299 | errno = - err->error; | 299 | errno = - err->error; |
@@ -336,7 +336,7 @@ int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data) | |||
336 | { | 336 | { |
337 | int len = RTA_LENGTH(4); | 337 | int len = RTA_LENGTH(4); |
338 | struct rtattr *rta; | 338 | struct rtattr *rta; |
339 | if (NLMSG_ALIGN(n->nlmsg_len) + len > maxlen) | 339 | if ((int)(NLMSG_ALIGN(n->nlmsg_len) + len) > maxlen) |
340 | return -1; | 340 | return -1; |
341 | rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len)); | 341 | rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len)); |
342 | rta->rta_type = type; | 342 | rta->rta_type = type; |
@@ -351,7 +351,7 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, void *data, int alen) | |||
351 | int len = RTA_LENGTH(alen); | 351 | int len = RTA_LENGTH(alen); |
352 | struct rtattr *rta; | 352 | struct rtattr *rta; |
353 | 353 | ||
354 | if (NLMSG_ALIGN(n->nlmsg_len) + len > maxlen) | 354 | if ((int)(NLMSG_ALIGN(n->nlmsg_len) + len) > maxlen) |
355 | return -1; | 355 | return -1; |
356 | rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len)); | 356 | rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len)); |
357 | rta->rta_type = type; | 357 | rta->rta_type = type; |
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index 3cfc9ccec..031b29a60 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c | |||
@@ -75,7 +75,7 @@ int ll_remember_index(struct sockaddr_nl *who ATTRIBUTE_UNUSED, | |||
75 | if (tb[IFLA_ADDRESS]) { | 75 | if (tb[IFLA_ADDRESS]) { |
76 | int alen; | 76 | int alen; |
77 | im->alen = alen = RTA_PAYLOAD(tb[IFLA_ADDRESS]); | 77 | im->alen = alen = RTA_PAYLOAD(tb[IFLA_ADDRESS]); |
78 | if (alen > sizeof(im->addr)) | 78 | if (alen > (int)sizeof(im->addr)) |
79 | alen = sizeof(im->addr); | 79 | alen = sizeof(im->addr); |
80 | memcpy(im->addr, RTA_DATA(tb[IFLA_ADDRESS]), alen); | 80 | memcpy(im->addr, RTA_DATA(tb[IFLA_ADDRESS]), alen); |
81 | } else { | 81 | } else { |
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c index 62262c9c2..8d9637408 100644 --- a/networking/libiproute/ll_proto.c +++ b/networking/libiproute/ll_proto.c | |||
@@ -98,10 +98,8 @@ __PF(ECONET,econet) | |||
98 | 98 | ||
99 | const char *ll_proto_n2a(unsigned short id, char *buf, int len) | 99 | const char *ll_proto_n2a(unsigned short id, char *buf, int len) |
100 | { | 100 | { |
101 | int i; | 101 | unsigned i; |
102 | |||
103 | id = ntohs(id); | 102 | id = ntohs(id); |
104 | |||
105 | for (i = 0; i < ARRAY_SIZE(llproto_names); i++) { | 103 | for (i = 0; i < ARRAY_SIZE(llproto_names); i++) { |
106 | if (llproto_names[i].id == id) | 104 | if (llproto_names[i].id == id) |
107 | return llproto_names[i].name; | 105 | return llproto_names[i].name; |
@@ -112,7 +110,7 @@ const char *ll_proto_n2a(unsigned short id, char *buf, int len) | |||
112 | 110 | ||
113 | int ll_proto_a2n(unsigned short *id, char *buf) | 111 | int ll_proto_a2n(unsigned short *id, char *buf) |
114 | { | 112 | { |
115 | int i; | 113 | unsigned i; |
116 | for (i = 0; i < ARRAY_SIZE(llproto_names); i++) { | 114 | for (i = 0; i < ARRAY_SIZE(llproto_names); i++) { |
117 | if (strcasecmp(llproto_names[i].name, buf) == 0) { | 115 | if (strcasecmp(llproto_names[i].name, buf) == 0) { |
118 | *id = htons(llproto_names[i].id); | 116 | *id = htons(llproto_names[i].id); |
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c index 60a78c715..50c9f208f 100644 --- a/networking/libiproute/ll_types.c +++ b/networking/libiproute/ll_types.c | |||
@@ -187,7 +187,7 @@ const char *ll_type_n2a(int type, char *buf, int len) | |||
187 | #endif /* FEATURE_IP_RARE_PROTOCOLS */ | 187 | #endif /* FEATURE_IP_RARE_PROTOCOLS */ |
188 | }; | 188 | }; |
189 | 189 | ||
190 | int i; | 190 | unsigned i; |
191 | const char *aname = arphrd_name; | 191 | const char *aname = arphrd_name; |
192 | for (i = 0; i < ARRAY_SIZE(arphrd_type); i++) { | 192 | for (i = 0; i < ARRAY_SIZE(arphrd_type); i++) { |
193 | if (arphrd_type[i] == type) | 193 | if (arphrd_type[i] == type) |