fixed a warning

[samba.git] / source3 / smbd / dir.c

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 42ed68f71300ec52e582db560641487d95221c07..5b7b08b4760020159b513ee367be2216888922d2 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -355,7 +355,8 @@ BOOL dptr_fill(char *buf1,unsigned int key)
     return(False);
   }
   offset = TellDir(p);
-  DEBUG(6,("fill on key %d dirptr 0x%x now at %d\n",key,(unsigned)p,offset));
+  DEBUG(6,("fill on key %ld dirptr 0x%lx now at %d\n",key,
+          (long)p,(int)offset));
   buf[0] = key;
   SIVAL(buf,1,offset | DPTR_MASK);
   return(True);
@@ -408,7 +409,7 @@ void *dptr_fetch_lanman2(int dptr_num)
 /****************************************************************************
 check a filetype for being valid
 ****************************************************************************/
-BOOL dir_check_ftype(connection_struct *conn,int mode,struct stat *st,int dirtype)
+BOOL dir_check_ftype(connection_struct *conn,int mode,SMB_STRUCT_STAT *st,int dirtype)
 {
   if (((mode & ~dirtype) & (aHIDDEN | aSYSTEM | aDIR)) != 0)
     return False;
@@ -418,16 +419,16 @@ BOOL dir_check_ftype(connection_struct *conn,int mode,struct stat *st,int dirtyp
 /****************************************************************************
   get a directory entry
 ****************************************************************************/
-BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,int *size,int *mode,time_t *date,BOOL check_descend)
+BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,
+                   SMB_OFF_T *size,int *mode,time_t *date,BOOL check_descend)
 {
   char *dname;
   BOOL found = False;
-  struct stat sbuf;
+  SMB_STRUCT_STAT sbuf;
   pstring path;
   pstring pathreal;
   BOOL isrootdir;
   pstring filename;
-  BOOL matched;
   BOOL needslash;
 
   *path = *pathreal = *filename = 0;
@@ -446,14 +447,12 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,in
     {
       dname = ReadDirName(conn->dirptr);
 
-      DEBUG(6,("readdir on dirptr 0x%x now at offset %d\n",
-              (unsigned)conn->dirptr,TellDir(conn->dirptr)));
+      DEBUG(6,("readdir on dirptr 0x%lx now at offset %d\n",
+              (long)conn->dirptr,TellDir(conn->dirptr)));
       
       if (dname == NULL) 
        return(False);
       
-      matched = False;
-
       pstrcpy(filename,dname);      
 
       if ((strcmp(filename,mask) == 0) ||
@@ -471,7 +470,7 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,in
          pstrcpy(pathreal,path);
          pstrcat(path,fname);
          pstrcat(pathreal,dname);
-         if (sys_stat(pathreal,&sbuf) != 0) 
+         if (dos_stat(pathreal,&sbuf) != 0) 
            {
              DEBUG(5,("Couldn't stat 1 [%s]\n",path));
              continue;
@@ -519,7 +518,7 @@ void *OpenDir(connection_struct *conn, char *name, BOOL use_veto)
 {
   Dir *dirp;
   char *n;
-  void *p = sys_opendir(name);
+  void *p = dos_opendir(name);
   int used=0;
 
   if (!p) return(NULL);