aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-30 00:44:41 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-01-30 00:44:41 +0000
commitc3cbb9c1fefa9e612009cce8c6f2924c8ca8e4a9 (patch)
tree499676f36c1bd490eceb1c127d670f1c2c4f3051
parent9e706c9b41b906302702c34b4af21710eed5c6ff (diff)
downloadbusybox-w32-c3cbb9c1fefa9e612009cce8c6f2924c8ca8e4a9.tar.gz
busybox-w32-c3cbb9c1fefa9e612009cce8c6f2924c8ca8e4a9.tar.bz2
busybox-w32-c3cbb9c1fefa9e612009cce8c6f2924c8ca8e4a9.zip
preparatory patch for -Wwrite-strings #8 (missed part)
git-svn-id: svn://busybox.net/trunk/busybox@17664 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--networking/libiproute/ll_types.c9
-rw-r--r--networking/libiproute/rt_names.h7
2 files changed, 7 insertions, 9 deletions
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c
index a53c89432..416ea6bbe 100644
--- a/networking/libiproute/ll_types.c
+++ b/networking/libiproute/ll_types.c
@@ -11,17 +11,16 @@
11 */ 11 */
12#include <stdio.h> 12#include <stdio.h>
13#include <arpa/inet.h> 13#include <arpa/inet.h>
14
15#include <linux/if_arp.h> 14#include <linux/if_arp.h>
16 15
17#include "rt_names.h" 16#include "rt_names.h"
18 17
19const char * ll_type_n2a(int type, char *buf, int len) 18const char* ll_type_n2a(int type, char *buf, int len)
20{ 19{
21#define __PF(f,n) { ARPHRD_##f, #n }, 20#define __PF(f,n) { ARPHRD_##f, #n },
22static struct { 21static const struct {
23 int type; 22 int type;
24 char *name; 23 const char *name;
25} arphrd_names[] = { 24} arphrd_names[] = {
26{ 0, "generic" }, 25{ 0, "generic" },
27__PF(ETHER,ether) 26__PF(ETHER,ether)
@@ -109,7 +108,7 @@ __PF(VOID,void)
109#undef __PF 108#undef __PF
110 109
111 int i; 110 int i;
112 for (i=0; i<sizeof(arphrd_names)/sizeof(arphrd_names[0]); i++) { 111 for (i = 0; i < sizeof(arphrd_names)/sizeof(arphrd_names[0]); i++) {
113 if (arphrd_names[i].type == type) 112 if (arphrd_names[i].type == type)
114 return arphrd_names[i].name; 113 return arphrd_names[i].name;
115 } 114 }
diff --git a/networking/libiproute/rt_names.h b/networking/libiproute/rt_names.h
index 92b807f3d..98c22b0b0 100644
--- a/networking/libiproute/rt_names.h
+++ b/networking/libiproute/rt_names.h
@@ -16,14 +16,13 @@ extern int rtnl_dsfield_a2n(uint32_t *id, char *arg);
16extern int rtnl_rttable_a2n(uint32_t *id, char *arg); 16extern int rtnl_rttable_a2n(uint32_t *id, char *arg);
17 17
18 18
19extern const char * ll_type_n2a(int type, char *buf, int len); 19extern const char* ll_type_n2a(int type, char *buf, int len);
20 20
21extern const char *ll_addr_n2a(unsigned char *addr, int alen, int type, 21extern const char* ll_addr_n2a(unsigned char *addr, int alen, int type,
22 char *buf, int blen); 22 char *buf, int blen);
23extern int ll_addr_a2n(unsigned char *lladdr, int len, char *arg); 23extern int ll_addr_a2n(unsigned char *lladdr, int len, char *arg);
24 24
25extern const char * ll_proto_n2a(unsigned short id, char *buf, int len); 25extern const char* ll_proto_n2a(unsigned short id, char *buf, int len);
26extern int ll_proto_a2n(unsigned short *id, char *buf); 26extern int ll_proto_a2n(unsigned short *id, char *buf);
27 27
28
29#endif 28#endif