Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iproute2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
iproute2
Commits
46ac8a55
Commit
46ac8a55
authored
Feb 12, 2013
by
Stephen Hemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib: make string arguments const
For lookup routines, make arguments const where possible.
parent
d1f28cf1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
42 additions
and
43 deletions
+42
-43
include/rt_names.h
include/rt_names.h
+17
-16
lib/inet_proto.c
lib/inet_proto.c
+3
-2
lib/ll_addr.c
lib/ll_addr.c
+1
-1
lib/ll_proto.c
lib/ll_proto.c
+2
-2
lib/rt_names.c
lib/rt_names.c
+19
-22
No files found.
include/rt_names.h
View file @
46ac8a55
...
...
@@ -3,29 +3,30 @@
#include <asm/types.h>
char
*
rtnl_rtprot_n2a
(
int
id
,
char
*
buf
,
int
len
);
char
*
rtnl_rtscope_n2a
(
int
id
,
char
*
buf
,
int
len
);
char
*
rtnl_rttable_n2a
(
__u32
id
,
char
*
buf
,
int
len
);
char
*
rtnl_rtrealm_n2a
(
int
id
,
char
*
buf
,
int
len
);
char
*
rtnl_dsfield_n2a
(
int
id
,
char
*
buf
,
int
len
);
int
rtnl_rtprot_a2n
(
__u32
*
id
,
char
*
arg
);
int
rtnl_rtscope_a2n
(
__u32
*
id
,
char
*
arg
);
int
rtnl_rttable_a2n
(
__u32
*
id
,
char
*
arg
);
int
rtnl_rtrealm_a2n
(
__u32
*
id
,
char
*
arg
);
int
rtnl_dsfield_a2n
(
__u32
*
id
,
char
*
arg
);
int
rtnl_group_a2n
(
int
*
id
,
char
*
arg
);
const
char
*
rtnl_rtprot_n2a
(
int
id
,
char
*
buf
,
int
len
);
const
char
*
rtnl_rtscope_n2a
(
int
id
,
char
*
buf
,
int
len
);
const
char
*
rtnl_rttable_n2a
(
__u32
id
,
char
*
buf
,
int
len
);
const
char
*
rtnl_rtrealm_n2a
(
int
id
,
char
*
buf
,
int
len
);
const
char
*
rtnl_dsfield_n2a
(
int
id
,
char
*
buf
,
int
len
);
int
rtnl_rtprot_a2n
(
__u32
*
id
,
const
char
*
arg
);
int
rtnl_rtscope_a2n
(
__u32
*
id
,
const
char
*
arg
);
int
rtnl_rttable_a2n
(
__u32
*
id
,
const
char
*
arg
);
int
rtnl_rtrealm_a2n
(
__u32
*
id
,
const
char
*
arg
);
int
rtnl_dsfield_a2n
(
__u32
*
id
,
const
char
*
arg
);
int
rtnl_group_a2n
(
int
*
id
,
const
char
*
arg
);
const
char
*
inet_proto_n2a
(
int
proto
,
char
*
buf
,
int
len
);
int
inet_proto_a2n
(
char
*
buf
);
int
inet_proto_a2n
(
c
onst
c
har
*
buf
);
const
char
*
ll_type_n2a
(
int
type
,
char
*
buf
,
int
len
);
const
char
*
ll_addr_n2a
(
unsigned
char
*
addr
,
int
alen
,
int
type
,
char
*
buf
,
int
blen
);
int
ll_addr_a2n
(
char
*
lladdr
,
int
len
,
char
*
arg
);
const
char
*
ll_addr_n2a
(
unsigned
char
*
addr
,
int
alen
,
int
type
,
char
*
buf
,
int
blen
);
int
ll_addr_a2n
(
char
*
lladdr
,
int
len
,
c
onst
c
har
*
arg
);
const
char
*
ll_proto_n2a
(
unsigned
short
id
,
char
*
buf
,
int
len
);
int
ll_proto_a2n
(
unsigned
short
*
id
,
char
*
buf
);
int
ll_proto_a2n
(
unsigned
short
*
id
,
c
onst
c
har
*
buf
);
#endif
lib/inet_proto.c
View file @
46ac8a55
...
...
@@ -20,9 +20,10 @@
#include <netdb.h>
#include <string.h>
#include "rt_names.h"
#include "utils.h"
char
*
inet_proto_n2a
(
int
proto
,
char
*
buf
,
int
len
)
c
onst
c
har
*
inet_proto_n2a
(
int
proto
,
char
*
buf
,
int
len
)
{
static
char
ncache
[
16
];
static
int
icache
=
-
1
;
...
...
@@ -42,7 +43,7 @@ char *inet_proto_n2a(int proto, char *buf, int len)
return
buf
;
}
int
inet_proto_a2n
(
char
*
buf
)
int
inet_proto_a2n
(
c
onst
c
har
*
buf
)
{
static
char
ncache
[
16
];
static
int
icache
=
-
1
;
...
...
lib/ll_addr.c
View file @
46ac8a55
...
...
@@ -57,7 +57,7 @@ const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int
}
/*NB: lladdr is char * (rather than u8 *) because sa_data is char * (1003.1g) */
int
ll_addr_a2n
(
char
*
lladdr
,
int
len
,
char
*
arg
)
int
ll_addr_a2n
(
char
*
lladdr
,
int
len
,
c
onst
c
har
*
arg
)
{
if
(
strchr
(
arg
,
'.'
))
{
inet_prefix
pfx
;
...
...
lib/ll_proto.c
View file @
46ac8a55
...
...
@@ -100,10 +100,10 @@ const char * ll_proto_n2a(unsigned short id, char *buf, int len)
return
buf
;
}
int
ll_proto_a2n
(
unsigned
short
*
id
,
char
*
buf
)
int
ll_proto_a2n
(
unsigned
short
*
id
,
c
onst
c
har
*
buf
)
{
int
i
;
for
(
i
=
0
;
i
<
sizeof
(
llproto_names
)
/
sizeof
(
llproto_names
[
0
]);
i
++
)
{
for
(
i
=
0
;
i
<
sizeof
(
llproto_names
)
/
sizeof
(
llproto_names
[
0
]);
i
++
)
{
if
(
strcasecmp
(
llproto_names
[
i
].
name
,
buf
)
==
0
)
{
*
id
=
htons
(
llproto_names
[
i
].
id
);
return
0
;
...
...
lib/rt_names.c
View file @
46ac8a55
...
...
@@ -29,12 +29,12 @@
struct
rtnl_hash_entry
{
struct
rtnl_hash_entry
*
next
;
c
har
*
name
;
c
onst
char
*
name
;
unsigned
int
id
;
};
static
void
rtnl_hash_initialize
(
char
*
file
,
struct
rtnl_hash_entry
**
hash
,
int
size
)
rtnl_hash_initialize
(
c
onst
c
har
*
file
,
struct
rtnl_hash_entry
**
hash
,
int
size
)
{
struct
rtnl_hash_entry
*
entry
;
char
buf
[
512
];
...
...
@@ -73,7 +73,7 @@ rtnl_hash_initialize(char *file, struct rtnl_hash_entry **hash, int size)
fclose
(
fp
);
}
static
void
rtnl_tab_initialize
(
char
*
file
,
char
**
tab
,
int
size
)
static
void
rtnl_tab_initialize
(
c
onst
c
har
*
file
,
char
**
tab
,
int
size
)
{
char
buf
[
512
];
FILE
*
fp
;
...
...
@@ -127,7 +127,6 @@ static char * rtnl_rtprot_tab[256] = {
};
static
int
rtnl_rtprot_init
;
static
void
rtnl_rtprot_initialize
(
void
)
...
...
@@ -137,10 +136,10 @@ static void rtnl_rtprot_initialize(void)
rtnl_rtprot_tab
,
256
);
}
char
*
rtnl_rtprot_n2a
(
int
id
,
char
*
buf
,
int
len
)
c
onst
c
har
*
rtnl_rtprot_n2a
(
int
id
,
char
*
buf
,
int
len
)
{
if
(
id
<
0
||
id
>=
256
)
{
snprintf
(
buf
,
len
,
"%
d
"
,
id
);
snprintf
(
buf
,
len
,
"%
u
"
,
id
);
return
buf
;
}
if
(
!
rtnl_rtprot_tab
[
id
])
{
...
...
@@ -149,11 +148,11 @@ char * rtnl_rtprot_n2a(int id, char *buf, int len)
}
if
(
rtnl_rtprot_tab
[
id
])
return
rtnl_rtprot_tab
[
id
];
snprintf
(
buf
,
len
,
"%
d
"
,
id
);
snprintf
(
buf
,
len
,
"%
u
"
,
id
);
return
buf
;
}
int
rtnl_rtprot_a2n
(
__u32
*
id
,
char
*
arg
)
int
rtnl_rtprot_a2n
(
__u32
*
id
,
c
onst
c
har
*
arg
)
{
static
char
*
cache
=
NULL
;
static
unsigned
long
res
;
...
...
@@ -186,7 +185,6 @@ int rtnl_rtprot_a2n(__u32 *id, char *arg)
}
static
char
*
rtnl_rtscope_tab
[
256
]
=
{
"global"
,
};
...
...
@@ -204,7 +202,7 @@ static void rtnl_rtscope_initialize(void)
rtnl_rtscope_tab
,
256
);
}
c
har
*
rtnl_rtscope_n2a
(
int
id
,
char
*
buf
,
int
len
)
c
onst
char
*
rtnl_rtscope_n2a
(
int
id
,
char
*
buf
,
int
len
)
{
if
(
id
<
0
||
id
>=
256
)
{
snprintf
(
buf
,
len
,
"%d"
,
id
);
...
...
@@ -220,9 +218,9 @@ char * rtnl_rtscope_n2a(int id, char *buf, int len)
return
buf
;
}
int
rtnl_rtscope_a2n
(
__u32
*
id
,
char
*
arg
)
int
rtnl_rtscope_a2n
(
__u32
*
id
,
c
onst
c
har
*
arg
)
{
static
char
*
cache
=
NULL
;
static
c
onst
c
har
*
cache
=
NULL
;
static
unsigned
long
res
;
char
*
end
;
int
i
;
...
...
@@ -253,7 +251,6 @@ int rtnl_rtscope_a2n(__u32 *id, char *arg)
}
static
char
*
rtnl_rtrealm_tab
[
256
]
=
{
"unknown"
,
};
...
...
@@ -267,7 +264,7 @@ static void rtnl_rtrealm_initialize(void)
rtnl_rtrealm_tab
,
256
);
}
c
har
*
rtnl_rtrealm_n2a
(
int
id
,
char
*
buf
,
int
len
)
c
onst
char
*
rtnl_rtrealm_n2a
(
int
id
,
char
*
buf
,
int
len
)
{
if
(
id
<
0
||
id
>=
256
)
{
snprintf
(
buf
,
len
,
"%d"
,
id
);
...
...
@@ -284,7 +281,7 @@ char * rtnl_rtrealm_n2a(int id, char *buf, int len)
}
int
rtnl_rtrealm_a2n
(
__u32
*
id
,
char
*
arg
)
int
rtnl_rtrealm_a2n
(
__u32
*
id
,
c
onst
c
har
*
arg
)
{
static
char
*
cache
=
NULL
;
static
unsigned
long
res
;
...
...
@@ -336,7 +333,7 @@ static void rtnl_rttable_initialize(void)
rtnl_rttable_hash
,
256
);
}
char
*
rtnl_rttable_n2a
(
__u32
id
,
char
*
buf
,
int
len
)
c
onst
c
har
*
rtnl_rttable_n2a
(
__u32
id
,
char
*
buf
,
int
len
)
{
struct
rtnl_hash_entry
*
entry
;
...
...
@@ -355,9 +352,9 @@ char * rtnl_rttable_n2a(__u32 id, char *buf, int len)
return
buf
;
}
int
rtnl_rttable_a2n
(
__u32
*
id
,
char
*
arg
)
int
rtnl_rttable_a2n
(
__u32
*
id
,
c
onst
c
har
*
arg
)
{
static
char
*
cache
=
NULL
;
static
c
onst
c
har
*
cache
=
NULL
;
static
unsigned
long
res
;
struct
rtnl_hash_entry
*
entry
;
char
*
end
;
...
...
@@ -404,7 +401,7 @@ static void rtnl_rtdsfield_initialize(void)
rtnl_rtdsfield_tab
,
256
);
}
c
har
*
rtnl_dsfield_n2a
(
int
id
,
char
*
buf
,
int
len
)
c
onst
char
*
rtnl_dsfield_n2a
(
int
id
,
char
*
buf
,
int
len
)
{
if
(
id
<
0
||
id
>=
256
)
{
snprintf
(
buf
,
len
,
"%d"
,
id
);
...
...
@@ -421,7 +418,7 @@ char * rtnl_dsfield_n2a(int id, char *buf, int len)
}
int
rtnl_dsfield_a2n
(
__u32
*
id
,
char
*
arg
)
int
rtnl_dsfield_a2n
(
__u32
*
id
,
c
onst
c
har
*
arg
)
{
static
char
*
cache
=
NULL
;
static
unsigned
long
res
;
...
...
@@ -469,9 +466,9 @@ static void rtnl_group_initialize(void)
rtnl_group_hash
,
256
);
}
int
rtnl_group_a2n
(
int
*
id
,
char
*
arg
)
int
rtnl_group_a2n
(
int
*
id
,
c
onst
c
har
*
arg
)
{
static
char
*
cache
=
NULL
;
static
c
onst
c
har
*
cache
=
NULL
;
static
unsigned
long
res
;
struct
rtnl_hash_entry
*
entry
;
char
*
end
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment