From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 1 Aug 2010 19:20:15 +0000 (+0200)
Subject: substitute obsolete function calls(bzero/index)
X-Git-Tag: 4.5.0~668
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45e962edef6acac2b3501382e1528b164d3fbb89;p=thirdparty%2Fstrongswan.git

substitute obsolete function calls(bzero/index)
---

diff --git a/src/pluto/alg_info.c b/src/pluto/alg_info.c
index 32fd46ef4a..d06e090073 100644
--- a/src/pluto/alg_info.c
+++ b/src/pluto/alg_info.c
@@ -414,7 +414,7 @@ struct alg_info_esp *alg_info_esp_create_from_str(char *alg_str)
 	alg_info_esp = malloc_thing (struct alg_info_esp);
 	zero(alg_info_esp);
 
-	pfs_name=index (alg_str, ';');
+	pfs_name=strchr(alg_str, ';');
 	if (pfs_name)
 	{
 		memcpy(esp_buf, alg_str, pfs_name-alg_str);
diff --git a/src/starter/interfaces.c b/src/starter/interfaces.c
index 92b2c74a4e..ef26cdce58 100644
--- a/src/starter/interfaces.c
+++ b/src/starter/interfaces.c
@@ -56,7 +56,7 @@ get_defaultroute(defaultroute_t *defaultroute)
 	ssize_t msglen;
 	int fd;
 
-	bzero(&rtu, sizeof(rtu));
+	memset(&rtu, 0, sizeof(rtu));
 	rtu.m.nh.nlmsg_len = NLMSG_LENGTH(sizeof(rtu.m.rt));
 	rtu.m.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
 	rtu.m.nh.nlmsg_type = RTM_GETROUTE;
@@ -142,7 +142,7 @@ get_defaultroute(defaultroute_t *defaultroute)
 				plog("could not open AF_INET socket");
 				break;
 			}
-			bzero(&req, sizeof(req));
+			memset(&req, 0, sizeof(req));
 			req.ifr_ifindex = iface_idx;
 			if (ioctl(fd, SIOCGIFNAME, &req) < 0 ||
 				ioctl(fd, SIOCGIFADDR, &req) < 0)