From: serassio <>
Date: Fri, 11 Mar 2005 04:49:19 +0000 (+0000)
Subject: Bug #1256: bzero is a non-standard function not available on all
X-Git-Tag: SQUID_3_0_PRE4~852
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04830959394408b476c1c160bc189902cf2bd4e8;p=thirdparty%2Fsquid.git

Bug #1256: bzero is a non-standard function not available on all
platforms

Substitute bzero by memset
---

diff --git a/TODO b/TODO
index d1bda4d0c6..632054eb34 100644
--- a/TODO
+++ b/TODO
@@ -158,7 +158,6 @@ DONE:
 (2) **	we don't properly handle the HTTP/1.1 'Connection' header (KA)
 (2) **	Code cleanup: (KA)
 		- Make sure the lib/*.c files do not use printf/fprintf.
-		- Replace bzero with memset
 		- Replace bcopy with xmemcpy
 (4) **	FTP PUT (KA)
 (1)	SSL doesn't work with Proxy Authentication
diff --git a/helpers/basic_auth/MSNT/rfcnb-util.c b/helpers/basic_auth/MSNT/rfcnb-util.c
index 9753da86f4..86ae2d0137 100644
--- a/helpers/basic_auth/MSNT/rfcnb-util.c
+++ b/helpers/basic_auth/MSNT/rfcnb-util.c
@@ -410,7 +410,7 @@ RFCNB_IP_Connect(struct in_addr Dest_IP, int port)
 	RFCNB_saved_errno = errno;
 	return (RFCNBE_Bad);
     }
-    bzero((char *) &Socket, sizeof(Socket));
+    memset((char *) &Socket, 0, sizeof(Socket));
     memcpy((char *) &Socket.sin_addr, (char *) &Dest_IP, sizeof(Dest_IP));
 
     Socket.sin_port = htons(port);
diff --git a/helpers/basic_auth/MSNT/smbencrypt.c b/helpers/basic_auth/MSNT/smbencrypt.c
index 9bd4bd333c..0ab8a94123 100644
--- a/helpers/basic_auth/MSNT/smbencrypt.c
+++ b/helpers/basic_auth/MSNT/smbencrypt.c
@@ -158,7 +158,7 @@ nt_lm_owf_gen(char *pwd, char *nt_p16, char *p16)
     E_P16((uchar *) passwd, (uchar *) p16);
 
     /* clear out local copy of user's password (just being paranoid). */
-    bzero(passwd, sizeof(passwd));
+    memset(passwd, 0, sizeof(passwd));
 }
 
 /****************************************************************************
diff --git a/helpers/basic_auth/MSNT/smblib-util.c b/helpers/basic_auth/MSNT/smblib-util.c
index 298b6b21d0..4dd5967cbd 100644
--- a/helpers/basic_auth/MSNT/smblib-util.c
+++ b/helpers/basic_auth/MSNT/smblib-util.c
@@ -146,7 +146,7 @@ SMB_Negotiate(SMB_Handle_Type Con_Handle, const char *Prots[])
     }
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_negp_len);
+    memset(SMB_Hdr(pkt), 0, SMB_negp_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBnegprot;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Con_Handle->pid);
@@ -397,7 +397,7 @@ SMB_TreeConnect(SMB_Handle_Type Con_Handle,
 
     /* Now plug in the values ... */
 
-    bzero(SMB_Hdr(pkt), SMB_tcon_len);
+    memset(SMB_Hdr(pkt), 0, SMB_tcon_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBtcon;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Con_Handle->pid);
diff --git a/helpers/basic_auth/MSNT/smblib.c b/helpers/basic_auth/MSNT/smblib.c
index bba9399cda..be82e009e2 100644
--- a/helpers/basic_auth/MSNT/smblib.c
+++ b/helpers/basic_auth/MSNT/smblib.c
@@ -330,7 +330,7 @@ SMB_Logon_Server(SMB_Handle_Type Con_Handle, char *UserName,
 	    return (SMBlibE_BAD);	/* Should handle the error */
 
 	}
-	bzero(SMB_Hdr(pkt), SMB_ssetpLM_len);
+	memset(SMB_Hdr(pkt), 0, SMB_ssetpLM_len);
 	SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
 	*(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBsesssetupX;
 	SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Con_Handle->pid);
@@ -393,7 +393,7 @@ SMB_Logon_Server(SMB_Handle_Type Con_Handle, char *UserName,
 	    return (-1);	/* Should handle the error */
 
 	}
-	bzero(SMB_Hdr(pkt), SMB_ssetpNTLM_len);
+	memset(SMB_Hdr(pkt), 0, SMB_ssetpNTLM_len);
 	SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
 	*(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBsesssetupX;
 	SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Con_Handle->pid);
diff --git a/helpers/ntlm_auth/SMB/smbval/rfcnb-util.c b/helpers/ntlm_auth/SMB/smbval/rfcnb-util.c
index a293dab9dd..887775ed3e 100644
--- a/helpers/ntlm_auth/SMB/smbval/rfcnb-util.c
+++ b/helpers/ntlm_auth/SMB/smbval/rfcnb-util.c
@@ -385,7 +385,7 @@ RFCNB_IP_Connect(struct in_addr Dest_IP, int port)
 	RFCNB_saved_errno = errno;
 	return (RFCNBE_Bad);
     }
-    bzero((char *) &Socket, sizeof(Socket));
+    memset((char *) &Socket, 0, sizeof(Socket));
     memcpy((char *) &Socket.sin_addr, (char *) &Dest_IP, sizeof(Dest_IP));
 
     Socket.sin_port = htons(port);
diff --git a/helpers/ntlm_auth/SMB/smbval/smbencrypt.c b/helpers/ntlm_auth/SMB/smbval/smbencrypt.c
index 0145b9893a..3aff3cbf1f 100644
--- a/helpers/ntlm_auth/SMB/smbval/smbencrypt.c
+++ b/helpers/ntlm_auth/SMB/smbval/smbencrypt.c
@@ -149,7 +149,7 @@ nt_lm_owf_gen(char *pwd, char *nt_p16, char *p16)
     E_P16((uchar *) passwd, (uchar *) p16);
 
     /* clear out local copy of user's password (just being paranoid). */
-    bzero(passwd, sizeof(passwd));
+    memset(passwd, 0, sizeof(passwd));
 }
 
 /****************************************************************************
diff --git a/helpers/ntlm_auth/SMB/smbval/smblib-util.c b/helpers/ntlm_auth/SMB/smbval/smblib-util.c
index 5c5ea7f8c7..e1ae2b1c24 100644
--- a/helpers/ntlm_auth/SMB/smbval/smblib-util.c
+++ b/helpers/ntlm_auth/SMB/smbval/smblib-util.c
@@ -270,7 +270,7 @@ SMB_Negotiate(SMB_Handle_Type Con_Handle, char *Prots[])
     }
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_negp_len);
+    memset(SMB_Hdr(pkt), 0, SMB_negp_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBnegprot;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Con_Handle->pid);
@@ -521,7 +521,7 @@ SMB_TreeConnect(SMB_Handle_Type Con_Handle,
 
     /* Now plug in the values ... */
 
-    bzero(SMB_Hdr(pkt), SMB_tcon_len);
+    memset(SMB_Hdr(pkt), 0, SMB_tcon_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBtcon;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Con_Handle->pid);
@@ -638,7 +638,7 @@ SMB_TreeDisconnect(SMB_Tree_Handle Tree_Handle, BOOL discard)
     }
     /* Now plug in the values ... */
 
-    bzero(SMB_Hdr(pkt), SMB_tdis_len);
+    memset(SMB_Hdr(pkt), 0, SMB_tdis_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBtdis;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Tree_Handle->con->pid);
diff --git a/helpers/ntlm_auth/SMB/smbval/smblib.c b/helpers/ntlm_auth/SMB/smbval/smblib.c
index 0e71e5db97..d22a01e5f0 100644
--- a/helpers/ntlm_auth/SMB/smbval/smblib.c
+++ b/helpers/ntlm_auth/SMB/smbval/smblib.c
@@ -375,7 +375,7 @@ SMB_Logon_Server(SMB_Handle_Type Con_Handle, char *UserName,
 	    fprintf(stderr, "SMB_Logon_server: Couldn't allocate packet\n");
 	    return (SMBlibE_BAD);	/* Should handle the error */
 	}
-	bzero(SMB_Hdr(pkt), SMB_ssetpLM_len);
+	memset(SMB_Hdr(pkt), 0, SMB_ssetpLM_len);
 	SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
 	*(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBsesssetupX;
 	SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Con_Handle->pid);
@@ -438,7 +438,7 @@ SMB_Logon_Server(SMB_Handle_Type Con_Handle, char *UserName,
 	    fprintf(stderr, "SMB_Logon_server: Couldn't allocate packet\n");
 	    return (-1);	/* Should handle the error */
 	}
-	bzero(SMB_Hdr(pkt), SMB_ssetpNTLM_len);
+	memset(SMB_Hdr(pkt), 0, SMB_ssetpNTLM_len);
 	SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);	/* Plunk in IDF */
 	*(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBsesssetupX;
 	SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Con_Handle->pid);
diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.cc b/src/DiskIO/AIO/AIODiskIOStrategy.cc
index 8fd4c38f7d..c9d37ff1b9 100644
--- a/src/DiskIO/AIO/AIODiskIOStrategy.cc
+++ b/src/DiskIO/AIO/AIODiskIOStrategy.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: AIODiskIOStrategy.cc,v 1.1 2004/12/20 16:30:38 robertc Exp $
+ * $Id: AIODiskIOStrategy.cc,v 1.2 2005/03/10 21:49:20 serassio Exp $
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -160,7 +160,7 @@ AIODiskIOStrategy::callback()
                 }
 
                 /* Free slot */
-                bzero(aqe, sizeof(async_queue_entry_t));
+                memset(aqe, 0, sizeof(async_queue_entry_t));
 
                 aqe->aq_e_state = AQ_ENTRY_FREE;
 
diff --git a/src/comm.cc b/src/comm.cc
index 842d2069ea..cc100a0c44 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.400 2005/02/13 15:49:50 serassio Exp $
+ * $Id: comm.cc,v 1.401 2005/03/10 21:49:19 serassio Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -2679,6 +2679,6 @@ DeferredRead::markCancelled() {
 }
 
 ConnectionDetail::ConnectionDetail() {
-    bzero(&me, sizeof(me));
-    bzero(&peer, sizeof(peer));
+    memset(&me, 0, sizeof(me));
+    memset(&peer, 0, sizeof(peer));
 }