From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sun, 17 Oct 2010 06:22:58 +0000 (-0600)
Subject: portability: smblib: replace bzero with memset
X-Git-Tag: take1~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ab648c97787987dfec2808d2a241c2bfcdba3a6;p=thirdparty%2Fsquid.git

portability: smblib: replace bzero with memset
---

diff --git a/lib/rfcnb/rfcnb-util.c b/lib/rfcnb/rfcnb-util.c
index fab179321b..f548b491e0 100644
--- a/lib/rfcnb/rfcnb-util.c
+++ b/lib/rfcnb/rfcnb-util.c
@@ -417,7 +417,7 @@ int RFCNB_IP_Connect(struct in_addr Dest_IP, int port)
         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/lib/smblib/bad-chain.c b/lib/smblib/bad-chain.c
index 56f6ec2983..388a7f1de3 100644
--- a/lib/smblib/bad-chain.c
+++ b/lib/smblib/bad-chain.c
@@ -1,3 +1,4 @@
+#include "config.h"
 /* UNIX SMBlib NetBIOS implementation
 
    Version 1.0
@@ -23,12 +24,13 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib-priv.h"
-
-#include "../rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
+#include "rfcnb/rfcnb.h"
 
 #include <signal.h>
-
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 
 /* Logon and tree connect to the server                                 */
 
@@ -75,7 +77,7 @@ int SMB_Logon_And_TCon(SMB_Handle_Type Con_Handle, char *UserName,
 
         }
 
-        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);
@@ -144,7 +146,7 @@ int SMB_Logon_And_TCon(SMB_Handle_Type Con_Handle, char *UserName,
 
         }
 
-        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/lib/smblib/exper.c b/lib/smblib/exper.c
index b85f85a320..dcfbc36ce8 100644
--- a/lib/smblib/exper.c
+++ b/lib/smblib/exper.c
@@ -1,3 +1,4 @@
+#include "config.h"
 /* UNIX SMBlib NetBIOS implementation
 
    Version 1.0
@@ -23,12 +24,13 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib-priv.h"
-
-#include "../rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
+#include "rfcnb/rfcnb.h"
 
 #include <signal.h>
-
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 
 /* Logon and tree connect to the server. If a tree handle was given to us, */
 /* we use it and return it, otherwise we create one ...                    */
@@ -115,7 +117,7 @@ SMB_Tree_Handle SMB_Logon_And_TCon(SMB_Handle_Type Con_Handle,
 
         }
 
-        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);
@@ -187,7 +189,7 @@ SMB_Tree_Handle SMB_Logon_And_TCon(SMB_Handle_Type Con_Handle,
 
         }
 
-        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);
@@ -448,7 +450,7 @@ int SMB_Logon_TCon_Open(SMB_Handle_Type Con_Handle, char *UserName,
 
         }
 
-        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);
@@ -519,7 +521,7 @@ int SMB_Logon_TCon_Open(SMB_Handle_Type Con_Handle, char *UserName,
 
         }
 
-        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/lib/smblib/file.c b/lib/smblib/file.c
index 34bb6312a1..da841331f0 100644
--- a/lib/smblib/file.c
+++ b/lib/smblib/file.c
@@ -1,3 +1,4 @@
+#include "config.h"
 /* UNIX SMBlib NetBIOS implementation
 
    Version 1.0
@@ -23,9 +24,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib-priv.h"
+#include "smblib/smblib-priv.h"
+#include "rfcnb/rfcnb.h"
 
-#include "../rfcnb/rfcnb.h"
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 
 /* Open a file with file_name using desired mode and search attr  */
 /* If File_Handle is null, then create and populate a file handle */
@@ -82,7 +86,7 @@ SMB_File *SMB_Open(SMB_Tree_Handle Tree_Handle,
 
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_open_len);
+    memset(SMB_Hdr(pkt), 0, SMB_open_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBopen;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Tree_Handle -> con -> pid);
@@ -206,7 +210,7 @@ int SMB_Close(SMB_File *File_Handle)
 
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_clos_len);
+    memset(SMB_Hdr(pkt), 0, SMB_clos_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBclose;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, File_Handle -> tree -> con -> pid);
@@ -335,7 +339,7 @@ int SMB_Read(SMB_File *File_Handle, char *data, int numbytes)
 
     /* Now build the read request and the receive packet etc ... */
 
-    bzero(SMB_Hdr(snd_pkt), SMB_read_len);
+    memset(SMB_Hdr(snd_pkt), 0, SMB_read_len);
     SIVAL(SMB_Hdr(snd_pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(snd_pkt) + SMB_hdr_com_offset) = SMBread;
     SSVAL(SMB_Hdr(snd_pkt), SMB_hdr_pid_offset, File_Handle -> tree -> con -> pid);
@@ -502,7 +506,7 @@ int SMB_Write(SMB_File *File_Handle, char *data, int numbytes)
     /* Now init the things that will be the same across the possibly multiple
        packets to write this data.                                           */
 
-    bzero(SMB_Hdr(pkt), SMB_write_len);
+    memset(SMB_Hdr(pkt), 0, SMB_write_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBwrite;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, File_Handle -> tree -> con -> pid);
@@ -672,7 +676,7 @@ SMB_File *SMB_Create(SMB_Tree_Handle Tree_Handle,
 
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_creat_len);
+    memset(SMB_Hdr(pkt), 0, SMB_creat_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBcreate;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, Tree_Handle -> con -> pid);
@@ -788,7 +792,7 @@ int SMB_Delete(SMB_Tree_Handle tree, char *file_name, WORD search)
 
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_delet_len);
+    memset(SMB_Hdr(pkt), 0, SMB_delet_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBunlink;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, tree -> con -> pid);
@@ -885,7 +889,7 @@ int SMB_Create_Dir(SMB_Tree_Handle tree, char *dir_name)
 
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_creatdir_len);
+    memset(SMB_Hdr(pkt), 0, SMB_creatdir_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBmkdir;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, tree -> con -> pid);
@@ -981,7 +985,7 @@ int SMB_Delete_Dir(SMB_Tree_Handle tree, char *dir_name)
 
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_deletdir_len);
+    memset(SMB_Hdr(pkt), 0, SMB_deletdir_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBrmdir;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, tree -> con -> pid);
@@ -1077,7 +1081,7 @@ int SMB_Check_Dir(SMB_Tree_Handle tree, char *dir_name)
 
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_checkdir_len);
+    memset(SMB_Hdr(pkt), 0, SMB_checkdir_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBchkpth;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, tree -> con -> pid);
@@ -1194,7 +1198,7 @@ int SMB_Search(SMB_Tree_Handle tree,
 
     /* Now plug in the bits we need */
 
-    bzero(SMB_Hdr(pkt), SMB_search_len);
+    memset(SMB_Hdr(pkt), 0, SMB_search_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBsearch;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, tree -> con -> pid);
diff --git a/lib/smblib/find_password.c b/lib/smblib/find_password.c
index f31be07bd1..a61dc61a88 100644
--- a/lib/smblib/find_password.c
+++ b/lib/smblib/find_password.c
@@ -1,3 +1,4 @@
+#include "config.h"
 /* Find passwords ... */
 /* We do it in a brute force way ... Cycle through all the possible passwords
    sending a logon to see if all it works ... We have to wait for any timeout
@@ -8,8 +9,11 @@
 
 #include <sys/types.h>
 #include <unistd.h>
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 
-#include "smblib.h"
+#include "smblib/smblib.h"
 
 int verbose = FALSE;
 int lotc = FALSE;
@@ -43,7 +47,7 @@ int next_password(char *pw, int pwlen)
     if (pwinit == FALSE) {
 
         pwinit = TRUE;
-        bzero(pw, pwlen + 1);
+        memset(pw, 0, pwlen + 1);
         pwpos = 0;
 
     }
@@ -228,7 +232,7 @@ main(int argc, char *argv[])
 
     /* Now loop through all password possibilities ... */
 
-    bzero(password, sizeof(password));
+    memset(password, 0, sizeof(password));
 
     while (next_password(password, pwlen) == TRUE) {
 
diff --git a/lib/smblib/smblib-api.c b/lib/smblib/smblib-api.c
index 72dce617d5..b02894780b 100644
--- a/lib/smblib/smblib-api.c
+++ b/lib/smblib/smblib-api.c
@@ -1,3 +1,4 @@
+#include "config.h"
 /* UNIX SMBlib NetBIOS implementation
 
    Version 1.0
@@ -23,8 +24,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib-priv.h"
-#include "../rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
+#include "rfcnb/rfcnb.h"
+
+#if HAVE_STRING_H
+#include <string.h>
+#endif
 
 SMB_Tree_Handle SMBapi_Tree = NULL;
 
@@ -75,7 +80,7 @@ int SMBapi_NetUserPasswordSet(SMB_Tree_Handle tree, char *user,
 
     }
 
-    bzero(SMB_Hdr(pkt), SMB_trans_len);
+    memset(SMB_Hdr(pkt), 0, SMB_trans_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBtrans;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, tree -> con -> pid);
@@ -247,7 +252,7 @@ int SMBapi_NetSetUserInfo(SMB_Tree_Handle tree, char *user,
 
     }
 
-    bzero(SMB_Hdr(pkt), SMB_trans_len);
+    memset(SMB_Hdr(pkt), 0, SMB_trans_len);
     SIVAL(SMB_Hdr(pkt), SMB_hdr_idf_offset, SMB_DEF_IDF);  /* Plunk in IDF */
     *(SMB_Hdr(pkt) + SMB_hdr_com_offset) = SMBtrans;
     SSVAL(SMB_Hdr(pkt), SMB_hdr_pid_offset, tree -> con -> pid);