testsuite: Replace deprecated bzero with memset

[samba.git] / testsuite / libsmbclient / src / getdents / getdents_3.c

diff --git a/testsuite/libsmbclient/src/getdents/getdents_3.c b/testsuite/libsmbclient/src/getdents/getdents_3.c
index aa22caa4d40521270d739482710c5ec1f0e7b4f3..fefc75676c9a67b459844560129908973663920b 100644 (file)
--- a/testsuite/libsmbclient/src/getdents/getdents_3.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_3.c
@@ -12,7 +12,7 @@ char g_server[MAX_BUFF_SIZE];
 char g_share[MAX_BUFF_SIZE];
 
 
-void auth_fn(const char *server, const char *share, char *workgroup, int wgmaxlen, 
+static void auth_fn(const char *server, const char *share, char *workgroup, int wgmaxlen,
                char *username, int unmaxlen, char *password, int pwmaxlen)
 {
 
@@ -49,11 +49,11 @@ int main(int argc, char** argv)
        char dir_url[MAX_BUFF_SIZE];
        char dirbuff[MAX_BUFF_SIZE];
 
-       bzero(g_workgroup,MAX_BUFF_SIZE);
-       bzero(url,MAX_BUFF_SIZE);
-       bzero(file_url,MAX_BUFF_SIZE);
-       bzero(dir_url,MAX_BUFF_SIZE);
-       bzero(buff,MAX_BUFF_SIZE);
+       memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+       memset(url, '\0', MAX_BUFF_SIZE);
+       memset(file_url, '\0', MAX_BUFF_SIZE);
+       memset(dir_url, '\0', MAX_BUFF_SIZE);
+       memset(buff, '\0', MAX_BUFF_SIZE);
 
        if ( argc == 6 )
        {
@@ -96,13 +96,13 @@ int main(int argc, char** argv)
 
                err = 0;
                i = 0;
-               bzero(buff,MAX_BUFF_SIZE);
-               bzero(tmp_file_ptr,MAX_BUFF_SIZE-9);
+               memset(buff, '\0', MAX_BUFF_SIZE);
+               memset(tmp_file_ptr, '\0', MAX_BUFF_SIZE-9);
 
                while ( diramount > 0 )
                {
                        direntsize = dirptr->dirlen;
-                       //printf("Name: %s\n",dirptr->name);
+                       /* printf("Name: %s\n",dirptr->name); */
                        if ( j == 0 )
                        {
                                if ( !(( strncmp(dirptr->name,".",1) == 0 )) ) 
@@ -125,7 +125,7 @@ int main(int argc, char** argv)
                                        memcpy(tmp_file_ptr,buff,strlen(buff)+4);
                                        strncat(tmp_file_ptr,".txt",4);
 
-                                       if ( !(( strcmp(dirptr->name,file_url) == 0 )) ) // make sure entries match
+                                       if ( !((strcmp(dirptr->name,file_url) == 0 )) ) /* make sure entries match */
                                        {
                                                err = 1;
                                                break;
@@ -135,15 +135,15 @@ int main(int argc, char** argv)
 
                        }
 
-                       (char *)dirptr += direntsize;
-                       (char *)diramount -= direntsize;
+                       dirptr = (struct smbc_dirent *) ((char *) dirptr + direntsize);
+                       diramount -= direntsize;
                        j++;
 
                }
        
                if ( ! err )
                {
-                       if ( (j - 2) != entry_num ) // Make sure that all entries created are counted and returned - minus . and ..
+                       if ( (j - 2) != entry_num ) /* Make sure that all entries created are counted and returned - minus . and .. */
                                err = 1;
                }