@@ -1,3 +1,7 @@

+Fri Apr 17 16:44:50 EEST 2009 (edwin)

+-------------------------------------

+ * libclamav/mpool.c: update mpool frag sizes.

+

 Fri Apr 17 16:44:33 EEST 2009 (edwin)

 -------------------------------------

  * libclamav/mpool.c: fix mpool_realloc to work with shrinked sizes.

@@ -72,94 +72,87 @@ static inline void spam(const char *fmt, ...) { fmt = fmt; } /* gcc STFU */

 #if SIZEOF_VOID_P==8

 static const unsigned int fragsz[] = {

-16, /* (37189) */

-24, /* (94629) */

-32, /* (756188) */

-40, /* (35658) */

-48, /* (6989) */

-56, /* (454597) */

-64, /* (2736) */

-72, /* (2298) */

-80, /* (3664) */

-88, /* (2636) */

-96, /* (3715) */

-104, /* (3732) */

-112, /* (4021) */

-120, /* (5165) */

-128, /* (22788) */

-136, /* (4343) */

-144, /* (4321) */

-152, /* (12196) */

-160, /* (18044) */

-/* 168, /\* (344) *\/ */

-/* 176, /\* (335) *\/ */

-/* 184, /\* (204) *\/ */

-192, /* (226) */

-/* 200, /\* (185) *\/ */

-/* 208, /\* (181) *\/ */

-/* 216, /\* (217) *\/ */

-224, /* (172) */

-/* 232, /\* (175) *\/ */

-/* 240, /\* (178) *\/ */

-/* 248, /\* (135) *\/ */

-256, /* (140) */

-/* 264, /\* (158) *\/ */

-/* 272, /\* (161) *\/ */

-/* 280, /\* (126) *\/ */

-/* 288, /\* (141) *\/ */

-296, /* (101) */

-/* 304, /\* (97) *\/ */

-/* 312, /\* (85) *\/ */

-/* 320, /\* (14) *\/ */

-/* 328, /\* (21) *\/ */

-336, /* (21) */

-/* 344, /\* (12) *\/ */

-/* 352, /\* (10) *\/ */

-/* 360, /\* (7) *\/ */

-/* 368, /\* (14) *\/ */

-376, /* (21) */

-/* 384, /\* (6) *\/ */

-/* 392, /\* (4) *\/ */

-/* 400, /\* (3) *\/ */

-/* 408, /\* (6) *\/ */

-/* 416, /\* (5) *\/ */

-/* 424, /\* (5) *\/ */

-/* 432, /\* (4) *\/ */

-440, /* (19) */

-/* 456, /\* (2) *\/ */

-/* 464, /\* (8) *\/ */

-/* 472, /\* (3) *\/ */

-/* 488, /\* (1) *\/ */

-/* 496, /\* (4) *\/ */

-/* 504, /\* (3) *\/ */

-/* 512, /\* (1) *\/ */

-/* 520, /\* (2) *\/ */

-/* 528, /\* (6) *\/ */

-/* 536, /\* (3) *\/ */

-544, /* (16) */

-/* 560, /\* (4) *\/ */

-/* 576, /\* (3) *\/ */

-/* 592, /\* (8) *\/ */

-/* 616, /\* (2) *\/ */

-/* 624, /\* (5) *\/ */

-/* 648, /\* (1) *\/ */

-/* 656, /\* (1) *\/ */

-/* 680, /\* (1) *\/ */

-/* 704, /\* (1) *\/ */

-/* 720, /\* (1) *\/ */

-/* 776, /\* (2) *\/ */

-1056, /* (15) */

-2056, /* (7585) */

-/* 2064, /\* (14) *\/ */

-2088, /* (14) */

-4128, /* (14) */

-8224, /* (9) */

-16416, /* (6) */

-32800, /* (4) */

-63504, /* (7) */

-136352, /* (1) */

-507976, /* (7) */

-1051032, /* (1) */

+16, /* 34660 */

+24, /* 99132 */

+32, /* 935424 */

+40, /* 20825 */

+48, /* 7338 */

+56, /* 536414 */

+64, /* 2853 */

+72, /* 2355 */

+80, /* 3701 */

+88, /* 2665 */

+96, /* 3719 */

+104, /* 3739 */

+112, /* 4104 */

+120, /* 5151 */

+128, /* 25576 */

+136, /* 4340 */

+144, /* 4308 */

+152, /* 12219 */

+160, /* 18013 */

+168, /* 329 */

+176, /* 343 */

+184, /* 207 */

+192, /* 227 */

+200, /* 169 */

+208, /* 188 */

+216, /* 231 */

+224, /* 175 */

+232, /* 154 */

+240, /* 179 */

+248, /* 140 */

+256, /* 141 */

+264, /* 142 */

+272, /* 163 */

+280, /* 125 */

+288, /* 142 */

+296, /* 102 */

+304, /* 96 */

+312, /* 67 */

+320, /* 15 */

+328, /* 21 */

+336, /* 21 */

+344, /* 12 */

+352, /* 11 */

+360, /* 6 */

+368, /* 15 */

+376, /* 5 */

+384, /* 5 */

+392, /* 4 */

+400, /* 3 */

+408, /* 8 */

+416, /* 5 */

+424, /* 4 */

+432, /* 4 */

+440, /* 3 */

+456, /* 1 */

+464, /* 8 */

+472, /* 3 */

+488, /* 1 */

+496, /* 4 */

+504, /* 3 */

+512, /* 1 */

+520, /* 1 */

+528, /* 6 */

+536, /* 2 */

+544, /* 1 */

+560, /* 4 */

+576, /* 2 */

+592, /* 10 */

+616, /* 2 */

+624, /* 6 */

+656, /* 1 */

+680, /* 1 */

+704, /* 1 */

+720, /* 1 */

+776, /* 1 */

+2056, /* 8545 */

+63504, /* 9 */

+144760, /* 1 */

+507976, /* 9 */

+525800, /* 1 */

+1051032, /* (0) */

 2097152

 /* ^^ This shouldn't be reached but it's a good fall back

  * MAX_ALLOCATION is 184549376 but that's really not need here */

@@ -168,149 +161,143 @@ static const unsigned int fragsz[] = {

 #else

 static const unsigned int fragsz[] = {

-8, /* (6381) */

-12, /* (30903) */

-16, /* (41616) */

-20, /* (69507) */

-24, /* (646497) */

-28, /* (108677) */

-32, /* (458074) */

-36, /* (11537) */

-40, /* (1690) */

-44, /* (5326) */

-48, /* (1505) */

-52, /* (3777) */

-56, /* (1730) */

-60, /* (943) */

-64, /* (963) */

-68, /* (1345) */

-72, /* (1909) */

-76, /* (1765) */

-80, /* (1060) */

-84, /* (1586) */

-88, /* (2082) */

-92, /* (21009) */

-96, /* (1886) */

-100, /* (1869) */

-104, /* (1936) */

-108, /* (2097) */

-112, /* (1736) */

-116, /* (3442) */

-120, /* (2117) */

-124, /* (1317) */

-128, /* (2307) */

-132, /* (2051) */

-136, /* (2839) */

-140, /* (1497) */

-144, /* (1607) */

-148, /* (10604) */

-152, /* (2719) */

-156, /* (15328) */

-160, /* (197) */

-/* 164, /\* (161) *\/ */

-/* 168, /\* (195) *\/ */

-172, /* (156) */

-/* 176, /\* (132) *\/ */

-/* 180, /\* (86) *\/ */

-/* 184, /\* (120) *\/ */

-188, /* (122) */

-/* 192, /\* (84) *\/ */

-/* 196, /\* (84) *\/ */

-/* 200, /\* (95) *\/ */

-/* 204, /\* (86) *\/ */

-208, /* (137) */

-/* 212, /\* (95) *\/ */

-/* 216, /\* (75) *\/ */

-/* 220, /\* (97) *\/ */

-/* 224, /\* (84) *\/ */

-/* 228, /\* (74) *\/ */

-232, /* (114) */

-/* 236, /\* (79) *\/ */

-/* 240, /\* (73) *\/ */

-/* 244, /\* (62) *\/ */

-/* 248, /\* (71) *\/ */

-/* 252, /\* (69) *\/ */

-256, /* (70) */

-/* 260, /\* (86) *\/ */

-/* 264, /\* (92) *\/ */

-/* 268, /\* (69) *\/ */

-/* 272, /\* (56) *\/ */

-/* 276, /\* (70) *\/ */

-280, /* (71) */

-/* 284, /\* (70) *\/ */

-/* 288, /\* (62) *\/ */

-/* 292, /\* (54) *\/ */

-/* 296, /\* (54) *\/ */

-/* 300, /\* (43) *\/ */

-/* 304, /\* (39) *\/ */

-308, /* (30) */

-/* 312, /\* (9) *\/ */

-/* 316, /\* (5) *\/ */

-/* 320, /\* (7) *\/ */

-/* 324, /\* (14) *\/ */

-/* 328, /\* (13) *\/ */

-332, /* (23) */

-/* 336, /\* (6) *\/ */

-/* 340, /\* (6) *\/ */

-/* 344, /\* (3) *\/ */

-/* 348, /\* (7) *\/ */

-/* 352, /\* (3) *\/ */

-/* 356, /\* (4) *\/ */

-/* 360, /\* (12) *\/ */

-/* 364, /\* (2) *\/ */

-/* 368, /\* (3) *\/ */

-372, /* (17) */

-/* 376, /\* (5) *\/ */

-/* 380, /\* (1) *\/ */

-/* 388, /\* (4) *\/ */

-/* 392, /\* (3) *\/ */

-/* 400, /\* (4) *\/ */

-/* 404, /\* (2) *\/ */

-/* 408, /\* (3) *\/ */

-/* 412, /\* (2) *\/ */

-/* 416, /\* (3) *\/ */

-/* 420, /\* (2) *\/ */

-/* 428, /\* (4) *\/ */

-/* 432, /\* (1) *\/ */

-436, /* (18) */

-/* 452, /\* (2) *\/ */

-/* 456, /\* (8) *\/ */

-/* 464, /\* (1) *\/ */

-/* 468, /\* (2) *\/ */

-/* 480, /\* (1) *\/ */

-/* 488, /\* (4) *\/ */

-/* 496, /\* (1) *\/ */

-/* 500, /\* (2) *\/ */

-/* 504, /\* (1) *\/ */

-/* 512, /\* (2) *\/ */

-/* 520, /\* (6) *\/ */

-/* 532, /\* (3) *\/ */

-/* 536, /\* (1) *\/ */

-540, /* (15) */

-/* 552, /\* (4) *\/ */

-/* 572, /\* (3) *\/ */

-/* 584, /\* (7) *\/ */

-/* 588, /\* (1) *\/ */

-/* 608, /\* (1) *\/ */

-/* 612, /\* (1) *\/ */

-/* 616, /\* (5) *\/ */

-/* 644, /\* (1) *\/ */

-/* 648, /\* (1) *\/ */

-/* 676, /\* (1) *\/ */

-/* 700, /\* (1) *\/ */

-/* 712, /\* (1) *\/ */

-/* 768, /\* (1) *\/ */

-/* 772, /\* (1) *\/ */

-1028, /* (7585) */

-1032, /* (14) */

-2084, /* (14) */

-4124, /* (9) */

-8220, /* (6) */

-16412, /* (4) */

-63500, /* (7) */

-136348, /* (1) */

-253988, /* (7) */

-1050860, /* (1) */

+8, /* 2268 */

+12, /* 32386 */

+16, /* 59865 */

+20, /* 58019 */

+24, /* 789268 */

+28, /* 127523 */

+32, /* 539890 */

+36, /* 11729 */

+40, /* 1840 */

+44, /* 5492 */

+48, /* 1662 */

+52, /* 3855 */

+56, /* 1781 */

+60, /* 990 */

+64, /* 984 */

+68, /* 1370 */

+72, /* 1923 */

+76, /* 1778 */

+80, /* 1076 */

+84, /* 1591 */

+88, /* 2084 */

+92, /* 23812 */

+96, /* 1873 */

+100, /* 1863 */

+104, /* 1923 */

+108, /* 2177 */

+112, /* 1724 */

+116, /* 3424 */

+120, /* 2098 */

+124, /* 1308 */

+128, /* 2291 */

+132, /* 2032 */

+136, /* 2825 */

+140, /* 1477 */

+144, /* 1594 */

+148, /* 10617 */

+152, /* 2696 */

+156, /* 15313 */

+160, /* 182 */

+164, /* 144 */

+168, /* 197 */

+172, /* 144 */

+176, /* 118 */

+180, /* 85 */

+184, /* 121 */

+188, /* 105 */

+192, /* 84 */

+196, /* 85 */

+200, /* 97 */

+204, /* 90 */

+208, /* 149 */

+212, /* 83 */

+216, /* 75 */

+220, /* 98 */

+224, /* 83 */

+228, /* 73 */

+232, /* 114 */

+236, /* 63 */

+240, /* 75 */

+244, /* 65 */

+248, /* 72 */

+252, /* 67 */

+256, /* 69 */

+260, /* 73 */

+264, /* 93 */

+268, /* 69 */

+272, /* 56 */

+276, /* 68 */

+280, /* 71 */

+284, /* 72 */

+288, /* 61 */

+292, /* 41 */

+296, /* 53 */

+300, /* 42 */

+304, /* 37 */

+308, /* 30 */

+312, /* 9 */

+316, /* 5 */

+320, /* 6 */

+324, /* 13 */

+328, /* 13 */

+332, /* 8 */

+336, /* 5 */

+340, /* 5 */

+344, /* 3 */

+348, /* 7 */

+352, /* 1 */

+356, /* 4 */

+360, /* 14 */

+364, /* 2 */

+368, /* 3 */

+372, /* 2 */

+376, /* 4 */

+388, /* 4 */

+392, /* 3 */

+400, /* 3 */

+404, /* 3 */

+408, /* 3 */

+412, /* 2 */

+416, /* 3 */

+420, /* 1 */

+428, /* 4 */

+432, /* 1 */

+436, /* 2 */

+452, /* 2 */

+456, /* 8 */

+464, /* 1 */

+468, /* 2 */

+480, /* 1 */

+488, /* 4 */

+496, /* 1 */

+500, /* 1 */

+504, /* 1 */

+512, /* 1 */

+520, /* 6 */

+532, /* 1 */

+536, /* 1 */

+552, /* 4 */

+572, /* 3 */

+584, /* 9 */

+588, /* 1 */

+608, /* 1 */

+612, /* 1 */

+616, /* 6 */

+644, /* 1 */

+648, /* 1 */

+676, /* 1 */

+700, /* 1 */

+712, /* 1 */

+768, /* 1 */

+772, /* 1 */

+1028, /* 8545 */

+63500, /* 9 */

+144752, /* 1 */

+253988, /* 9 */

+525628, /* 1 */

+1051032, /* (0) */

 2097152

 };

 #endif