ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

string: make spdk_parse_ip_addr() params non-const

Browse Source 
The host and port output parameters point into the (non-const) char *ip,
so it makes more sense for them to be non-const as well.

This allows the flexibility to pass non-const char pointers as the
output parameters, which will be used in the nvmf_tgt/conf.c parsing
code.

Change-Id: I1d5b102fc389c06d36432904e4fda944437b659e
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-02-10 16:00:51 -07:00 committed by Jim Harris
parent b4572d452b
commit 4404793d09
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/nvmf_tgt/conf.c
View File

@ -384,7 +384,7 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp)
/* Parse Listen sections */ /* Parse Listen sections */
for (i = 0; i < MAX_LISTEN_ADDRESSES; i++) { for (i = 0; i < MAX_LISTEN_ADDRESSES; i++) {
char *transport_name, *listen_addr; char *transport_name, *listen_addr;
const char *traddr, *trsvcid; char *traddr, *trsvcid;
int numa_node = -1; int numa_node = -1;
transport_name = spdk_conf_section_get_nmval(sp, "Listen", i, 0); transport_name = spdk_conf_section_get_nmval(sp, "Listen", i, 0);

2
include/spdk/string.h
View File

@ -126,7 +126,7 @@ size_t spdk_strlen_pad(const void *str, size_t size, int pad);
* *
* \return 0 if successful. -1 on error. * \return 0 if successful. -1 on error.
*/ */
int spdk_parse_ip_addr(char *ip, const char **host, const char **port); int spdk_parse_ip_addr(char *ip, char **host, char **port);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
lib/util/string.c
View File

@ -258,7 +258,7 @@ spdk_strlen_pad(const void *str, size_t size, int pad)
} }
int int
spdk_parse_ip_addr(char *ip, const char **host, const char **port) spdk_parse_ip_addr(char *ip, char **host, char **port)
{ {
char *p; char *p;

4
test/lib/util/string/string_ut.c
View File

@ -41,8 +41,8 @@ static void
test_parse_ip_addr(void) test_parse_ip_addr(void)
{ {
int rc; int rc;
const char *host; char *host;
const char *port; char *port;
char ip[255]; char ip[255];
/* IPv4 */ /* IPv4 */