[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 047e50be761a2691bd67de2ce533b04c6b75badb
Author: aCaB <acab at clamav.net>
Date:   Fri Mar 5 17:42:25 2010 +0100

    add the do not cache flag to fmap_t

diff --git a/libclamav/fmap.c b/libclamav/fmap.c
index 14171c7..19d5b4f 100644
--- a/libclamav/fmap.c
+++ b/libclamav/fmap.c
@@ -92,7 +92,8 @@ pthread_mutex_t fmap_mutex = PTHREAD_MUTEX_INITIALIZER;
 ssize_t pread(int fd, void *buf, size_t count, off_t offset);
 
 fmap_t *fmap(int fd, off_t offset, size_t len) {
-    unsigned int pages, mapsz, hdrsz, dumb = 1;
+    unsigned int pages, mapsz, hdrsz;
+    unsigned short dumb = 1;
     int pgsz = cli_getpagesize();
     struct stat st;
     fmap_t *m;
@@ -148,6 +149,7 @@ fmap_t *fmap(int fd, off_t offset, size_t len) {
     m->hdrsz = hdrsz;
     m->pgsz = pgsz;
     m->paged = 0;
+    m->dont_cache_flag = 0;
     return m;
 }
 
@@ -494,7 +496,8 @@ void *fmap_gets(fmap_t *m, char *dst, size_t *at, size_t max_len) {
 /* vvvvv WIN32 STUFF BELOW vvvvv */
 
 fmap_t *fmap(int fd, off_t offset, size_t len) { /* WIN32 */
-    unsigned int pages, mapsz, hdrsz, dumb = 1;
+    unsigned int pages, mapsz, hdrsz;
+    unsigned short dumb = 1;
     int pgsz = cli_getpagesize();
     struct stat st;
     fmap_t *m;
@@ -549,6 +552,7 @@ fmap_t *fmap(int fd, off_t offset, size_t len) { /* WIN32 */
     m->hdrsz = hdrsz;
     m->pgsz = pgsz;
     m->paged = 0;
+    m->dont_cache_flag = 0;
     return m;
 }
 
diff --git a/libclamav/fmap.h b/libclamav/fmap.h
index 3f5bd1a..dc8181b 100644
--- a/libclamav/fmap.h
+++ b/libclamav/fmap.h
@@ -30,7 +30,8 @@
 
 typedef struct {
     int fd;
-    unsigned int dumb;
+    unsigned short dumb;
+    unsigned short dont_cache_flag;
     time_t mtime;
     size_t offset;
     size_t len;

-- 
Debian repository for ClamAV