[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
aCaB
acab at clamav.net
Sun Apr 4 01:23:20 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 6eaca76eb0a2adf09a2d6b2b33c3d3c66661e597
Author: aCaB <acab at clamav.net>
Date: Sun Mar 21 17:18:57 2010 +0100
pool size recalculated, win32 VI bumped
diff --git a/libclamav/mpool.c b/libclamav/mpool.c
index 1be63c4..7a3efd2 100644
--- a/libclamav/mpool.c
+++ b/libclamav/mpool.c
@@ -65,58 +65,73 @@ static inline void spam(const char *fmt, ...) { fmt = fmt; } /* gcc STFU */
#if SIZEOF_VOID_P==8
static const unsigned int fragsz[] = {
-/* SIZE PERM TEMP ACT! */
- 16, /* 7631 7189 USE/POW2 */
- 24, /* 81785 114 USE */
- 32, /* 1099428 78 USE/POW2 */
- 40, /* 22466 69 USE */
- 48, /* 7438 37 USE */
- 56, /* 5567 32 USE */
- 64, /* 2801 31 USE/POW2 */
- 72, /* 610137 29 USE */
- 80, /* 3579 28 USE */
- 88, /* 2603 28 USE */
- 96, /* 3535 27 USE */
- 104, /* 3669 24 USE */
- 112, /* 3897 23 USE */
- 120, /* 5105 22 USE */
- 128, /* 3097 22 USE/POW2 */
- 136, /* 3977 21 USE */
- 144, /* 32225 21 USE */
- 152, /* 12384 20 USE */
- 160, /* 17258 20 USE */
- 176, /* 504 20 USE */
- 192, /* 324 20 USE */
- 216, /* 363 20 USE */
- 240, /* 478 19 USE */
- 256, /* 516 19 USE/POW2 */
- 288, /* 249 19 USE */
- 312, /* 741 18 USE */
- 336, /* 47 18 USE */
- 512, /* 1 18 POW2 */
- 1024, /* 0 17 POW2 */
- 2048, /* 0 16 POW2 */
- 2056, /* 11408 16 USE */
- 4096, /* 0 16 POW2 */
- 8192, /* 0 14 POW2 */
- 8736, /* 1 12 USE */
- 10240, /* 1 11 USE */
- 16384, /* 0 8 POW2 */
- 20536, /* 1 7 USE */
- 33704, /* 1 6 USE */
- 37312, /* 1 5 USE */
- 43800, /* 1 3 USE */
- 63504, /* 9 3 USE */
- 65536, /* 0 3 POW2 */
- 89800, /* 1 2 USE */
- 102624, /* 1 1 USE */
- 131072, /* 0 1 POW2 */
- 147296, /* 1 1 USE */
- 262144, /* 0 1 POW2 */
- 369280, /* 1 0 USE */
- 507976, /* 9 0 USE */
- 525976, /* 1 0 USE */
-1048576, /* 0 0 USE/POW2 */
+/* SIZE PERM TEMP MAX ACT! */
+ 16, /* 1487281 7051 1487281 USE */
+ 24, /* 89506 103 89510 USE */
+ 32, /* 1313968 65 1313969 USE */
+ 40, /* 23221 43 23222 USE */
+ 48, /* 800586 87 800588 USE */
+ 56, /* 5634 32 5634 USE */
+ 64, /* 2762 31 2762 USE */
+ 72, /* 2343 29 2343 USE */
+ 80, /* 1857605 32 1857606 USE */
+ 88, /* 2619 28 2619 USE */
+ 96, /* 3556 27 3556 USE */
+ 104, /* 3670 24 3670 USE */
+ 112, /* 3998 23 3998 USE */
+ 120, /* 5100 22 5100 USE */
+ 128, /* 3092 22 3092 USE */
+ 136, /* 4075 22 4075 USE */
+ 144, /* 4412 22 4412 USE */
+ 152, /* 41875 21 41875 USE */
+ 160, /* 17264 21 17264 USE */
+ 176, /* 517 20 517 USE */
+ 192, /* 332 20 332 USE */
+ 208, /* 451 20 451 USE */
+ 216, /* 408 20 408 USE */
+ 224, /* 276 20 276 USE */
+ 240, /* 484 19 484 USE */
+ 256, /* 529 19 529 USE */
+ 264, /* 219 19 219 USE */
+ 272, /* 368 19 368 USE */
+ 280, /* 239 19 239 USE */
+ 288, /* 252 19 252 USE */
+ 312, /* 744 19 744 USE */
+ 352, /* 23 19 23 USE */
+ 384, /* 11 18 11 USE */
+ 408, /* 11 18 11 USE */
+ 512, /* 1 18 2 USE */
+ 520, /* 3 18 4 USE */
+ 632, /* 2 18 3 USE */
+ 1024, /* 0 17 1 USE */
+ 2048, /* 0 17 1 USE */
+ 2056, /* 11920 16 11920 USE */
+ 4096, /* 0 16 1 USE */
+ 6144, /* 1 15 1 USE */
+ 8192, /* 0 14 1 USE */
+ 8816, /* 1 13 1 USE */
+ 8872, /* 1 12 1 USE */
+ 11376, /* 1 10 1 USE */
+ 16384, /* 0 8 1 USE */
+ 16392, /* 256 8 257 USE */
+ 21096, /* 1 7 1 USE */
+ 32768, /* 0 7 1 USE */
+ 34752, /* 1 6 2 USE */
+ 44736, /* 1 4 1 USE */
+ 48384, /* 1 3 1 USE */
+ 63504, /* 9 3 10 USE */
+ 65536, /* 0 3 1 USE */
+ 91624, /* 1 2 1 USE */
+ 105568, /* 1 1 1 USE */
+ 131072, /* 0 1 1 USE */
+ 131088, /* 6 1 7 USE */
+ 131784, /* 1 1 2 USE */
+ 154896, /* 1 1 1 USE */
+ 262144, /* 0 1 1 USE */
+ 372712, /* 1 0 1 USE */
+ 507976, /* 9 0 9 USE */
+ 524288, /* 0 0 0 USE */
+1048576,
2097152,
4194304,
8388608,
@@ -125,66 +140,81 @@ static const unsigned int fragsz[] = {
#else
-static const unsigned int fragsz[] = {
+static const unsigned int fragsz[] = {
/* SIZE PERM TEMP ACT! */
- 8, /* 1992 7188 USE/POW2 */
- 16, /* 49976 172 USE/POW2 */
- 24, /* 995096 121 USE */
- 32, /* 151077 68 USE/POW2 */
- 40, /* 15175 58 USE */
- 48, /* 7231 55 USE */
- 56, /* 613432 47 USE */
- 64, /* 1925 44 USE/POW2 */
- 72, /* 3192 42 USE */
- 80, /* 2782 40 USE */
- 88, /* 3524 40 USE */
- 96, /* 3395 40 USE */
- 104, /* 3593 40 USE */
- 112, /* 31850 40 USE */
- 120, /* 5260 38 USE */
- 128, /* 3231 38 USE/POW2 */
- 136, /* 4785 38 USE */
- 144, /* 3000 38 USE */
- 152, /* 13384 38 USE */
- 160, /* 14915 36 USE */
- 168, /* 485 36 USE */
- 176, /* 379 36 USE */
- 184, /* 322 36 USE */
- 192, /* 260 36 USE */
- 200, /* 410 36 USE */
- 208, /* 388 36 USE */
- 216, /* 262 36 USE */
- 224, /* 256 36 USE */
- 232, /* 475 36 USE */
- 248, /* 544 36 USE */
- 256, /* 206 36 POW2 */
- 264, /* 352 36 USE */
- 280, /* 258 36 USE */
- 296, /* 283 36 USE */
- 304, /* 308 36 USE */
- 312, /* 566 36 USE */
- 328, /* 53 36 USE */
- 376, /* 18 36 USE */
- 616, /* 7 34 USE */
- 1032, /* 11408 32 USE */
- 2048, /* 0 32 POW2 */
- 4096, /* 0 28 POW2 */
- 5456, /* 1 20 USE */
- 8192, /* 0 16 POW2 */
- 10272, /* 1 14 USE */
- 18656, /* 1 11 USE */
- 21904, /* 1 6 USE */
- 32768, /* 0 6 POW2 */
- 44864, /* 1 4 USE */
- 51240, /* 1 2 USE */
- 65536, /* 0 2 POW2 */
- 131072, /* 0 2 POW2 */
- 147288, /* 1 2 USE */
- 184624, /* 1 0 USE */
- 253992, /* 9 0 USE */
- 262144, /* 0 0 POW2 */
- 525752, /* 1 0 USE */
-1048576, /* 0 0 USE/POW2 */
+ 16, /* 1487589 7134 1487589 USE */
+ 24, /* 116448 127 116452 USE */
+ 32, /* 1287128 95 1287134 USE */
+ 40, /* 23174 60 23174 USE */
+ 48, /* 800778 81 800779 USE */
+ 56, /* 5633 51 5633 USE */
+ 64, /* 1857039 49 1857040 USE */
+ 72, /* 2341 44 2341 USE */
+ 80, /* 3702 43 3702 USE */
+ 88, /* 2619 41 2619 USE */
+ 96, /* 3563 40 3563 USE */
+ 104, /* 3667 40 3667 USE */
+ 112, /* 3997 40 3997 USE */
+ 120, /* 34560 40 34560 USE */
+ 128, /* 3093 38 3093 USE */
+ 136, /* 3988 38 3988 USE */
+ 144, /* 4412 38 4412 USE */
+ 152, /* 12413 38 12413 USE */
+ 160, /* 17264 38 17264 USE */
+ 168, /* 397 38 397 USE */
+ 176, /* 517 38 517 USE */
+ 184, /* 328 37 328 USE */
+ 192, /* 332 36 332 USE */
+ 208, /* 451 36 451 USE */
+ 216, /* 408 36 408 USE */
+ 224, /* 276 36 276 USE */
+ 240, /* 483 36 483 USE */
+ 248, /* 254 36 254 USE */
+ 256, /* 529 36 529 USE */
+ 264, /* 219 36 219 USE */
+ 272, /* 368 36 368 USE */
+ 288, /* 252 36 252 USE */
+ 304, /* 315 36 315 USE */
+ 312, /* 744 36 744 USE */
+ 336, /* 51 36 51 USE */
+ 352, /* 23 36 23 USE */
+ 368, /* 29 36 29 USE */
+ 408, /* 11 36 11 USE */
+ 440, /* 11 34 11 USE */
+ 512, /* 1 34 1 USE */
+ 520, /* 3 34 4 USE */
+ 592, /* 10 34 10 USE */
+ 632, /* 2 34 3 USE */
+ 736, /* 1 34 2 USE */
+ 1024, /* 0 34 1 USE */
+ 1032, /* 11920 33 11920 USE */
+ 2048, /* 0 32 2 USE */
+ 3080, /* 1 30 1 USE */
+ 4096, /* 0 28 1 USE */
+ 4416, /* 1 26 1 USE */
+ 4440, /* 1 25 1 USE */
+ 5696, /* 1 20 1 USE */
+ 8192, /* 0 16 1 USE */
+ 10248, /* 1 16 2 USE */
+ 11272, /* 256 14 257 USE */
+ 16384, /* 0 14 1 USE */
+ 17384, /* 1 12 2 USE */
+ 22376, /* 1 8 1 USE */
+ 24200, /* 1 6 1 USE */
+ 32768, /* 0 6 1 USE */
+ 45816, /* 1 5 1 USE */
+ 52792, /* 1 2 1 USE */
+ 63504, /* 9 2 10 USE */
+ 65536, /* 0 2 1 USE */
+ 131072, /* 0 2 1 USE */
+ 131088, /* 6 2 7 USE */
+ 131528, /* 1 2 2 USE */
+ 154896, /* 1 2 1 USE */
+ 186360, /* 1 1 1 USE */
+ 253992, /* 9 0 9 USE */
+ 262144, /* 0 0 0 USE */
+ 525752,
+1048576,
2097152,
4194304,
8388608,
diff --git a/win32/res/common.rc b/win32/res/common.rc
index 55ae11a..aa4c3ea 100644
--- a/win32/res/common.rc
+++ b/win32/res/common.rc
@@ -6,7 +6,7 @@
#define REPO_VERSION VERSION
#endif
-#define RES_VER_Q 0,96,0,0
+#define RES_VER_Q 0,96,0,2
#define RES_VER_S "ClamAV 0.96"
VS_VERSION_INFO VERSIONINFO
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list