*** empty log message ***

svn path=/trunk/; revision=120

3 files changed, 5 insertions, 7 deletions

diff --git a/Makefile.in b/Makefile.in
index 5fb143ef..67d602c5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -199,9 +199,9 @@ $(srcdir)/rcfile_y.c: $(srcdir)/rcfile_y.y
 
 parser = $(srcdir)/rcfile_l.l $(srcdir)/rcfile_y.y
 headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.h
-extra = $(srcdir)/alloca.c $(srcdir)/bzero.[ch] $(srcdir)/errorcodes \
-	$(srcdir)/getopt.[ch] $(srcdir)/getopt1.c $(srcdir)/md5*.[ch] \
-	$(srcdir)/strcasecmp.c $(srcdir)/strdup.c
+extra = $(srcdir)/alloca.c $(srcdir)/errorcodes $(srcdir)/getopt.[ch] \
+	$(srcdir)/getopt1.c $(srcdir)/md5*.[ch] $(srcdir)/strcasecmp.c \
+	$(srcdir)/strdup.c
 docs = $(srcdir)/COPYING $(srcdir)/README $(srcdir)/INSTALL $(srcdir)/NEWS \
 	$(srcdir)/fetchmail.lsm $(srcdir)/RFC/*.txt \
 	$(srcdir)/*.man	$(srcdir)/sample.rcfile
diff --git a/options.c b/options.c
index 305444f4..c9fa747a 100644
--- a/options.c
+++ b/options.c
@@ -17,7 +17,6 @@
 #include <pwd.h>
 #include "getopt.h"
 #include "fetchmail.h"
-#include "bzero.h"
 
 #define LA_VERSION	1 
 #define LA_ALL          2
@@ -108,7 +107,7 @@ struct hostrec *queryctl;
   extern int optind, opterr;     /* defined in getopt(2) */
   extern char *optarg;          /* defined in getopt(2) */
 
-  bzero(queryctl,sizeof(struct hostrec));    /* start clean */
+  memset(queryctl, '\0', sizeof(struct hostrec));    /* start clean */
 
   while (!errflag && 
          (c = getopt_long(argc,argv,shortoptions,
@@ -315,7 +314,7 @@ struct hostrec *queryctl;
 {
     char *user, *home;
 
-    bzero(queryctl,sizeof(*queryctl));
+    memset(queryctl, '\0', sizeof(*queryctl));
 
     if ((user = getenv("USER")) == (char *)NULL
 		|| (home = getenv("HOME")) == (char *)NULL)
diff --git a/socket.c b/socket.c
index b2173755..8b79e818 100644
--- a/socket.c
+++ b/socket.c
@@ -35,7 +35,6 @@
 #endif
 #include <varargs.h>
 #include <errno.h>
-#include "bzero.h"
 #include "socket.h"
 
 /* Size of buffer for internal buffering read function