minor cleanups (unused variables etc)

This commit is contained in:
rsync-bugs
1997-12-15 19:11:24 +00:00
parent 05a6556d06
commit 58da1efac1
2 changed files with 3 additions and 7 deletions

View File

@@ -91,7 +91,6 @@ static off_t last_match;
static void matched(int f,struct sum_struct *s,struct map_struct *buf, static void matched(int f,struct sum_struct *s,struct map_struct *buf,
off_t len,
int offset,int i) int offset,int i)
{ {
int n = offset - last_match; int n = offset - last_match;
@@ -180,7 +179,7 @@ static void hash_search(int f,struct sum_struct *s,
done_csum2 = 1; done_csum2 = 1;
} }
if (memcmp(sum2,s->sums[i].sum2,csum_length) == 0) { 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; offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n); k = MIN((len-offset), s->n);
map = (signed char *)map_ptr(buf,offset,k); map = (signed char *)map_ptr(buf,offset,k);
@@ -212,7 +211,7 @@ static void hash_search(int f,struct sum_struct *s,
} while (++offset < end); } while (++offset < end);
matched(f,s,buf,len,len,-1); matched(f,s,buf,len,-1);
map_ptr(buf,len-1,1); map_ptr(buf,len-1,1);
} }
@@ -240,7 +239,7 @@ void match_sums(int f,struct sum_struct *s,struct map_struct *buf,off_t len)
if (verbose > 2) if (verbose > 2)
fprintf(FERROR,"done hash search\n"); fprintf(FERROR,"done hash search\n");
} else { } else {
matched(f,s,buf,len,len,-1); matched(f,s,buf,len,-1);
} }
sum_end(file_sum); sum_end(file_sum);

View File

@@ -147,7 +147,6 @@ static struct sum_struct *receive_sums(int f)
struct sum_struct *s; struct sum_struct *s;
int i; int i;
off_t offset = 0; off_t offset = 0;
int block_len;
s = (struct sum_struct *)malloc(sizeof(*s)); s = (struct sum_struct *)malloc(sizeof(*s));
if (!s) out_of_memory("receive_sums"); if (!s) out_of_memory("receive_sums");
@@ -161,8 +160,6 @@ static struct sum_struct *receive_sums(int f)
fprintf(FERROR,"count=%d n=%d rem=%d\n", fprintf(FERROR,"count=%d n=%d rem=%d\n",
s->count,s->n,s->remainder); s->count,s->n,s->remainder);
block_len = s->n;
if (s->count == 0) if (s->count == 0)
return(s); return(s);