ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/liblzf/lzf_c.c
(Generate patch)

Comparing liblzf/lzf_c.c (file contents):
Revision 1.23 by root, Tue Nov 13 10:48:02 2007 UTC vs.
Revision 1.32 by root, Fri May 9 12:42:50 2008 UTC

111 u8 *op = (u8 *)out_data; 111 u8 *op = (u8 *)out_data;
112 const u8 *in_end = ip + in_len; 112 const u8 *in_end = ip + in_len;
113 u8 *out_end = op + out_len; 113 u8 *out_end = op + out_len;
114 const u8 *ref; 114 const u8 *ref;
115 115
116 /* off requires a type wide enough to hold a general pointer difference.
117 * ISO C doesn't have that (size_t might not be enough and ptrdiff_t only
118 * works for differences within a single object). We also assume that no
119 * no bit pattern traps. Since the only platform that is both non-POSIX
120 * and fails to support both assumptions is windows 64 bit, we make a
121 * special workaround for it.
122 */
123#if defined (WIN32) && defined (_M_X64)
124 unsigned _int64 off; /* workaround for missing POSIX compliance */
125#else
126 unsigned long off;
127#endif
116 unsigned int hval; 128 unsigned int hval;
117 unsigned long off;
118 int lit; 129 int lit;
119 130
120 if (!in_len || !out_len) 131 if (!in_len || !out_len)
121 return 0; 132 return 0;
122 133
136 hval = NEXT (hval, ip); 147 hval = NEXT (hval, ip);
137 hslot = htab + IDX (hval); 148 hslot = htab + IDX (hval);
138 ref = *hslot; *hslot = ip; 149 ref = *hslot; *hslot = ip;
139 150
140 if (1 151 if (1
141#if INIT_HTAB && !USE_MEMCPY 152#if INIT_HTAB
142 && ref < ip /* the next test will actually take care of this, but this is faster */ 153 && ref < ip /* the next test will actually take care of this, but this is faster */
143#endif 154#endif
144 && (off = ip - ref - 1) < MAX_OFF 155 && (off = ip - ref - 1) < MAX_OFF
145 && ip + 4 < in_end 156 && ip + 4 < in_end
146 && ref > (u8 *)in_data 157 && ref > (u8 *)in_data
157 /* match found at *ref++ */ 168 /* match found at *ref++ */
158 unsigned int len = 2; 169 unsigned int len = 2;
159 unsigned int maxlen = in_end - ip - len; 170 unsigned int maxlen = in_end - ip - len;
160 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 171 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
161 172
162 if (expect_false (op + 1 + 3 >= out_end))
163 return 0;
164
165 op [- lit - 1] = lit - 1; /* stop run */ 173 op [- lit - 1] = lit - 1; /* stop run */
166 op -= !lit; /* undo run if length is zero */ 174 op -= !lit; /* undo run if length is zero */
175
176 if (expect_false (op + 3 + 1 >= out_end))
177 return 0;
167 178
168 for (;;) 179 for (;;)
169 { 180 {
170 if (expect_true (maxlen > 16)) 181 if (expect_true (maxlen > 16))
171 { 182 {
235 htab[IDX (hval)] = ip; 246 htab[IDX (hval)] = ip;
236 ip++; 247 ip++;
237 } 248 }
238 while (len--); 249 while (len--);
239#endif 250#endif
251
240 lit = 0; op++; /* start run */ 252 lit = 0; op++; /* start run */
241 continue;
242 } 253 }
243 254 else
255 {
244 /* one more literal byte we must copy */ 256 /* one more literal byte we must copy */
245
246 if (expect_false (op >= out_end)) 257 if (expect_false (op >= out_end))
247 return 0; 258 return 0;
248 259
249 lit++; 260 lit++; *op++ = *ip++;
261
262 if (expect_false (lit == MAX_LIT))
263 {
264 op [- lit - 1] = lit - 1; /* stop run */
265 lit = 0; op++; /* start run */
266 }
267 }
268 }
269
270 if (op + 3 > out_end) /* at most 3 bytes can be missing here */
271 return 0;
272
273 while (ip < in_end)
274 {
250 *op++ = *ip++; 275 lit++; *op++ = *ip++;
251 276
252 if (expect_false (lit == MAX_LIT)) 277 if (expect_false (lit == MAX_LIT))
253 { 278 {
254 op [- lit - 1] = lit - 1; /* stop run */ 279 op [- lit - 1] = lit - 1; /* stop run */
255 lit = 0; op++; /* start run */ 280 lit = 0; op++; /* start run */
256 } 281 }
257 } 282 }
258 283
259 if (op + lit + 2 >= out_end)
260 return 0;
261
262 while (ip < in_end)
263 {
264 lit++;
265 *op++ = *ip++;
266 }
267
268 op [- lit - 1] = lit - 1; 284 op [- lit - 1] = lit - 1; /* end run */
285 op -= !lit; /* undo run if length is zero */
269 286
270 return op - (u8 *)out_data; 287 return op - (u8 *)out_data;
271} 288}
272 289

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines