static void matched(int f,struct sum_struct *s,struct map_struct *buf,
- off_t len,
int offset,int i)
{
int n = offset - last_match;
}
-static inline char *window_ptr(struct map_struct *buf,int off,int len)
-{
- static char *p=NULL;
- static int p_len = 0;
- static int p_off = 0;
-
- if (off == 0) {
- p_off = 0;
- p_len = CHUNK_SIZE;
- p = map_ptr(buf,p_off,p_len);
- }
-
- while (off+len > p_off+p_len) {
- p_off += CHUNK_SIZE;
- p_len = CHUNK_SIZE;
- p = map_ptr(buf,p_off,p_len);
- }
-
- return(p + (off-p_off));
-}
-
-
static void hash_search(int f,struct sum_struct *s,
struct map_struct *buf,off_t len)
{
int end;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
- char *map;
+ signed char *map;
if (verbose > 2)
fprintf(FERROR,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
- map = window_ptr(buf,0,k);
+ map = (signed char *)map_ptr(buf,0,k);
- sum = get_checksum1(map, k);
+ sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
if (!done_csum2) {
int l = MIN(s->n,len-offset);
- map = window_ptr(buf,offset,l);
- get_checksum2(map,l,sum2);
+ map = (signed char *)map_ptr(buf,offset,l);
+ get_checksum2((char *)map,l,sum2);
done_csum2 = 1;
}
if (memcmp(sum2,s->sums[i].sum2,csum_length) == 0) {
- matched(f,s,buf,len,offset,i);
+ matched(f,s,buf,offset,i);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
- map = window_ptr(buf,offset,k);
- sum = get_checksum1(map, k);
+ map = (signed char *)map_ptr(buf,offset,k);
+ sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
++matches;
}
/* Trim off the first byte from the checksum */
- map = window_ptr(buf,offset,k+1);
+ map = (signed char *)map_ptr(buf,offset,k+1);
s1 -= map[0] + CHAR_OFFSET;
s2 -= k * (map[0]+CHAR_OFFSET);
} while (++offset < end);
- matched(f,s,buf,len,len,-1);
- window_ptr(buf,len-1,1);
+ matched(f,s,buf,len,-1);
+ map_ptr(buf,len-1,1);
}
if (verbose > 2)
fprintf(FERROR,"done hash search\n");
} else {
- matched(f,s,buf,len,len,-1);
+ matched(f,s,buf,len,-1);
}
sum_end(file_sum);