Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
05a6556
)
minor cleanups (unused variables etc)
author
rsync-bugs
<rsync-bugs>
Mon, 15 Dec 1997 19:11:24 +0000
(19:11 +0000)
committer
rsync-bugs
<rsync-bugs>
Mon, 15 Dec 1997 19:11:24 +0000
(19:11 +0000)
match.c
patch
|
blob
|
blame
|
history
rsync.c
patch
|
blob
|
blame
|
history
diff --git
a/match.c
b/match.c
index
a353c83
..
33fc6e1
100644
(file)
--- a/
match.c
+++ b/
match.c
@@
-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 n = offset - last_match;
int offset,int i)
{
int n = offset - last_match;
@@
-180,7
+179,7
@@
static void hash_search(int f,struct sum_struct *s,
done_csum2 = 1;
}
if (memcmp(sum2,s->sums[i].sum2,csum_length) == 0) {
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 = (signed char *)map_ptr(buf,offset,k);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
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)
fprintf(FERROR,"done hash search\n");
} else {
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);
}
sum_end(file_sum);
diff --git
a/rsync.c
b/rsync.c
index
790631f
..
90214a8
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-147,7
+147,6
@@
static struct sum_struct *receive_sums(int f)
struct sum_struct *s;
int i;
off_t offset = 0;
struct sum_struct *s;
int i;
off_t offset = 0;
- int block_len;
s = (struct sum_struct *)malloc(sizeof(*s));
if (!s) out_of_memory("receive_sums");
s = (struct sum_struct *)malloc(sizeof(*s));
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",
s->count,s->n,s->remainder);
fprintf(FERROR,"count=%d n=%d rem=%d\n",
s->count,s->n,s->remainder);
- block_len = s->n;
-
if (s->count == 0)
return(s);
if (s->count == 0)
return(s);