From 58b0912674b214ab6fd1db3af99b033ba961b1b6 Mon Sep 17 00:00:00 2001
From: Richard Basch <probe@mit.edu>
Date: Fri, 19 Nov 1993 10:35:30 +0000
Subject: Removed extra #include (done by <zephyr/zephyr.h>) Changed index to
 strchr, bzero to memset [ANSI]

---
 clients/zctl/zctl.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'clients/zctl')

diff --git a/clients/zctl/zctl.c b/clients/zctl/zctl.c
index 3a582de..08d2819 100644
--- a/clients/zctl/zctl.c
+++ b/clients/zctl/zctl.c
@@ -11,9 +11,6 @@
  *	"mit-copyright.h". 
  */
 
-#ifdef POSIX
-#include <unistd.h>
-#endif
 #include <zephyr/zephyr.h>
 #include <ss/ss.h>
 #include <com_err.h>
@@ -196,7 +193,7 @@ wgc_control(argc,argv)
 		return;
 	}
 
-	(void) _BZERO((char *)&notice, sizeof(notice));
+	(void) memset((char *)&notice, 0, sizeof(notice));
 	notice.z_kind = UNSAFE;
 	notice.z_port = 0;
 	notice.z_class = WG_CTL_CLASS;
@@ -239,7 +236,7 @@ hm_control(argc,argv)
 		return;
 	}
 	
-	(void) _BZERO((char *)&notice, sizeof(notice));
+	(void) memset((char *)&notice, 0, sizeof(notice));
 	notice.z_kind = HMCTL;
 	notice.z_port = 0;
 	notice.z_class = HM_CTL_CLASS;
@@ -692,9 +689,9 @@ load_subs(argc,argv)
 		if (*subline == '#' || !*subline)
 			continue;
 		subline[strlen(subline)-1] = '\0'; /* nuke newline */
-		comma = index(subline,',');
+		comma = strchr(subline,',');
 		if (comma)
-			comma2 = index(comma+1,',');
+			comma2 = strchr(comma+1,',');
 		else
 			comma2 = 0;
 		if (!comma || !comma2) {
-- 
cgit v1.2.3