[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 d982ac65e333e6357fb81c2a12737c806fc792ac
Author: aCaB <acab at clamav.net>
Date:   Thu Jan 14 16:14:07 2010 +0100

    temp

diff --git a/clamscan/clamscan.c b/clamscan/clamscan.c
index 9808527..ecd41e7 100644
--- a/clamscan/clamscan.c
+++ b/clamscan/clamscan.c
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
 
     gettimeofday(&t1, NULL);
 
-    cl_cache_init(256);
+    cl_cache_init(512);
 
     ret = scanmanager(opts);
 
diff --git a/libclamav/cache.c b/libclamav/cache.c
index 8fec98c..4d8028a 100644
--- a/libclamav/cache.c
+++ b/libclamav/cache.c
@@ -291,12 +291,6 @@ static int cacheset_init(struct cache_set *cs, unsigned int entries) {
     return 0;
 }
 
-/* static inline int64_t cmp(int64_t *a, int64_t *b) { */
-/*     int64_t ret = a[1] - b[1]; */
-/*     if(!ret) ret = a[0] - b[0]; */
-/*     return ret; */
-/* } */
-
 static inline int cmp(int64_t *a, int64_t *b) {
     if(a[1] < b[1]) return -1;
     if(a[1] > b[1]) return 1;
@@ -305,6 +299,10 @@ static inline int cmp(int64_t *a, int64_t *b) {
     return 1;
 }
 
+/* static inline int cmp(int64_t *a, int64_t *b) { */
+/*     return memcmp(a, b, 16); */
+/* } */
+
 
 //#define PRINT_TREE
 #ifdef PRINT_TREE
@@ -606,11 +604,11 @@ static void cacheset_add(struct cache_set *cs, unsigned char *md5, size_t size)
 }
 #endif /* USE_SPLAY */
 
-#define TREES 1
-static inline unsigned int getkey(uint8_t *hash) { return 0; }
+/* #define TREES 1 */
+/* static inline unsigned int getkey(uint8_t *hash) { return 0; } */
 
-/* #define TREES 256 */
-/* static inline unsigned int getkey(uint8_t *hash) { return *hash; } */
+#define TREES 256
+static inline unsigned int getkey(uint8_t *hash) { return *hash; }
 
 /* #define TREES 4096 */
 /* static inline unsigned int getkey(uint8_t *hash) { return hash[0] | ((unsigned int)(hash[1] & 0xf)<<8) ; } */

-- 
Debian repository for ClamAV