fixed a warning

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

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 7c81b826d1a37ce207e001ccb54dd208e00b77b3..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);
@@ -418,7 +419,8 @@ BOOL dir_check_ftype(connection_struct *conn,int mode,SMB_STRUCT_STAT *st,int di
 /****************************************************************************
   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;
@@ -427,7 +429,6 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,in
   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) ||