RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MINOR] fixed useless memory allocation in str2net() 

It was not necessary anymore to allocate memory in str2net().
Moreover, some calls to free() were missing in case of errors.
This commit is contained in:
Willy Tarreau 2007-05-08 18:28:09 +02:00
parent 58ef70227a
commit d077a8e67c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common/standard.h
View File

@ -80,12 +80,12 @@ extern int ishex(char s);
struct sockaddr_in *str2sa(char *str);
/*
* converts <str> to a two struct in_addr* which are locally allocated.
* converts <str> to two struct in_addr* which must be pre-allocated.
* The format is "addr[/mask]", where "addr" cannot be empty, and mask
* is optionnal and either in the dotted or CIDR notation.
* Note: "addr" can also be a hostname. Returns 1 if OK, 0 if error.
*/
int str2net(char *str, struct in_addr *addr, struct in_addr *mask);
int str2net(const char *str, struct in_addr *addr, struct in_addr *mask);
/* will try to encode the string <string> replacing all characters tagged in
* <map> with the hexadecimal representation of their ASCII-code (2 digits)

8
src/standard.c
View File

@ -127,21 +127,18 @@ struct sockaddr_in *str2sa(char *str)
}
/*
* converts <str> to a two struct in_addr* which are locally allocated.
* converts <str> to two struct in_addr* which must be pre-allocated.
* The format is "addr[/mask]", where "addr" cannot be empty, and mask
* is optionnal and either in the dotted or CIDR notation.
* Note: "addr" can also be a hostname. Returns 1 if OK, 0 if error.
*/
int str2net(char *str, struct in_addr *addr, struct in_addr *mask)
int str2net(const char *str, struct in_addr *addr, struct in_addr *mask)
{
char *c;
unsigned long len;
memset(mask, 0, sizeof(*mask));
memset(addr, 0, sizeof(*addr));
str = strdup(str);
if (str == NULL)
return 0;
if ((c = strrchr(str, '/')) != NULL) {
*c++ = '\0';
@ -173,7 +170,6 @@ int str2net(char *str, struct in_addr *addr, struct in_addr *mask)
else
*addr = *(struct in_addr *) *(he->h_addr_list);
}
free(str);
return 1;
}