d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two cases where "const" were washed off pointers with strchr(3)

Browse Source
This commit is contained in:
Poul-Henning Kamp 2015-09-25 07:37:00 +00:00
parent 21d963e528
commit ef02f85c38
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/natd/natd.c
View File

@ -124,7 +124,7 @@ static void StrToAddr (const char* str, struct in_addr* addr);
static u_short StrToPort (const char* str, const char* proto);
static int StrToPortRange (const char* str, const char* proto, port_range *portRange);
static int StrToProto (const char* str);
static int StrToAddrAndPortRange (const char* str, struct in_addr* addr, char* proto, port_range *portRange);
static int StrToAddrAndPortRange (char* str, struct in_addr* addr, char* proto, port_range *portRange);
static void ParseArgs (int argc, char** argv);
static void SetupPunchFW(const char *strValue);
static void SetupSkinnyPort(const char *strValue);
@ -1896,7 +1896,7 @@ u_short StrToPort (const char* str, const char* proto)
int StrToPortRange (const char* str, const char* proto, port_range *portRange)
{
char* sep;
const char* sep;
struct servent* sp;
char* end;
u_short loPort;
@ -1938,7 +1938,8 @@ int StrToPortRange (const char* str, const char* proto, port_range *portRange)
}
int StrToProto (const char* str)
static int
StrToProto (const char* str)
{
if (!strcmp (str, "tcp"))
return IPPROTO_TCP;
@ -1949,7 +1950,8 @@ int StrToProto (const char* str)
errx (1, "unknown protocol %s. Expected tcp or udp", str);
}
int StrToAddrAndPortRange (const char* str, struct in_addr* addr, char* proto, port_range *portRange)
static int
StrToAddrAndPortRange (char* str, struct in_addr* addr, char* proto, port_range *portRange)
{
char* ptr;