warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace index() with strchr()

Browse Source
This commit is contained in:
Ronnie Sahlberg
2011-01-09 09:46:42 +11:00
parent f1996d26a6
commit 5e11bb17b1
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/init.c
+6 -6
View File
@@ -314,20 +314,20 @@ iscsi_parse_full_url(struct iscsi_context *iscsi, const char *url)
user = getenv("LIBISCSI_CHAP_USERNAME"); user = getenv("LIBISCSI_CHAP_USERNAME");
passwd = getenv("LIBISCSI_CHAP_PASSWORD"); passwd = getenv("LIBISCSI_CHAP_PASSWORD");
tmp = index(portal, '@'); tmp = strchr(portal, '@');
if (tmp != NULL) { if (tmp != NULL) {
user = portal; user = portal;
*tmp++ = 0; *tmp++ = 0;
portal = tmp; portal = tmp;
tmp = index(user, '%'); tmp = strchr(user, '%');
if (tmp != NULL) { if (tmp != NULL) {
*tmp++ = 0; *tmp++ = 0;
passwd = tmp; passwd = tmp;
} }
} }
target = index(portal, '/'); target = strchr(portal, '/');
if (target == NULL) { if (target == NULL) {
iscsi_set_error(iscsi, "Invalid URL %s\nCould not parse " iscsi_set_error(iscsi, "Invalid URL %s\nCould not parse "
"'<target-iqn>'\niSCSI URL must be of the " "'<target-iqn>'\niSCSI URL must be of the "
@@ -349,7 +349,7 @@ iscsi_parse_full_url(struct iscsi_context *iscsi, const char *url)
return NULL; return NULL;
} }
lun = index(target, '/'); lun = strchr(target, '/');
if (lun == NULL) { if (lun == NULL) {
iscsi_set_error(iscsi, "Invalid URL %s\nCould not parse <lun>\n" iscsi_set_error(iscsi, "Invalid URL %s\nCould not parse <lun>\n"
"iSCSI URL must be of the form: %s", "iSCSI URL must be of the form: %s",
@@ -445,13 +445,13 @@ iscsi_parse_portal_url(struct iscsi_context *iscsi, const char *url)
user = getenv("LIBISCSI_CHAP_USERNAME"); user = getenv("LIBISCSI_CHAP_USERNAME");
passwd = getenv("LIBISCSI_CHAP_PASSWORD"); passwd = getenv("LIBISCSI_CHAP_PASSWORD");
tmp = index(portal, '@'); tmp = strchr(portal, '@');
if (tmp != NULL) { if (tmp != NULL) {
user = portal; user = portal;
*tmp++ = 0; *tmp++ = 0;
portal = tmp; portal = tmp;
tmp = index(user, '%'); tmp = strchr(user, '%');
if (tmp != NULL) { if (tmp != NULL) {
*tmp++ = 0; *tmp++ = 0;
passwd = tmp; passwd = tmp;
lib/socket.c
+2 -2
View File
@@ -73,7 +73,7 @@ iscsi_connect_async(struct iscsi_context *iscsi, const char *portal,
str = rindex(host, ':'); str = rindex(host, ':');
if (str != NULL) { if (str != NULL) {
if (index(str, ']') == NULL) { if (strchr(str, ']') == NULL) {
if (str != NULL) { if (str != NULL) {
port = atoi(str+1); port = atoi(str+1);
str[0] = 0; str[0] = 0;
@@ -84,7 +84,7 @@ iscsi_connect_async(struct iscsi_context *iscsi, const char *portal,
/* ipv6 in [...] form ? */ /* ipv6 in [...] form ? */
if (host[0] == '[') { if (host[0] == '[') {
host ++; host ++;
str = index(host, ']'); str = strchr(host, ']');
if (str == NULL) { if (str == NULL) {
free(addr); free(addr);
iscsi_set_error(iscsi, "Invalid target:%s " iscsi_set_error(iscsi, "Invalid target:%s "