Changeset 975 for trunk/client/src/dircache.h

Timestamp:

Aug 26, 2016, 6:57:36 PM (9 years ago)

Author:

Yuri Dario

Message:

Made code completely independent from samba data structures. ticket#274.

File:

• trunk/client/src/dircache.h (modified) (6 diffs)

trunk/client/src/dircache.h

@@ -13 +13 @@
 #include <ndextpl2.h>
 
-//
-// enable if not defined in your plugin
-//
-// dircache code uses only the fname field to scan the directory listing.
-// other fields are just passed to FNADD callback as are.
-//
-#if 0
-typedef struct smbwrp_fileinfo
+
+/* callback for fsphAddFile32L */
+typedef void FNADDDIRENTRY(void *plist, void *finfo);
+typedef FNADDDIRENTRY *PFNADDDIRENTRY;
+
+/* callback for releasing memory */
+typedef void FNFREEDIRENTRY(void *finfo);
+typedef FNFREEDIRENTRY *PFNFREEDIRENTRY;
+
+
+/*
+ * An entry holds file name and a pointer to custom data
+ */
+typedef struct DirectoryCacheEntryData
 {
-    unsigned long long size;
-    unsigned long mtime;
-    unsigned type;
-    char fname[PATH_MAX];
-} smbwrp_fileinfo;
-#else
-
-// define as forward reference here
-typedef struct smbwrp_fileinfo smbwrp_fileinfo;
-
-#endif
+    const char  fname[PATH_MAX];
+    const void* customData;
+} DirectoryCacheEntryData;
 
 /*
@@ -42 +40 @@
     struct DirectoryCacheEntry *pPrev;
 
-    smbwrp_fileinfo *aInfos;
+    DirectoryCacheEntryData *aInfos;
     int cInfos;
     int cInfosAllocated;
@@ -64 +62 @@
     // resource handle, used only for per-share logging
     void* resource;
+    // callback called to release data structures
+    PFNFREEDIRENTRY release;
+
 } DirectoryCache;
 
@@ -73 +74 @@
 
 /* Directory cache helpers. */
-int dircache_create(DirectoryCache **ppdc, void* pRes, int cachetimeout, int cachedepth);
+int dircache_create(DirectoryCache **ppdc, void* pRes, int cachetimeout, int cachedepth,
+                    PFNFREEDIRENTRY fn);
 void dircache_delete(DirectoryCache *pdc);
-
-/* callback for fsphAddFile32L */
-typedef void FNADDDIRENTRY(const char *mnt, smbwrp_fileinfo *finfo,
-                           const char *mask, void *state);
-typedef FNADDDIRENTRY *PFNADDDIRENTRY;
 
 /* directory cache scanning */
@@ -88 +85 @@
 int dircache_find_path(DirectoryCache *pdc,
                        const char *path,
-                       smbwrp_fileinfo *finfo,
+                       void **finfo,
                        unsigned long *pulAge);
 
@@ -96 +93 @@
                            int cFiles);
 void dircache_write_entry(DirectoryCache *pdc, void *dircachectx,
-                          const smbwrp_fileinfo *finfo);
+                          const char *fname, const void *finfo);
 void dircache_write_end(DirectoryCache *pdc, void *dircachectx);