aboutsummaryrefslogtreecommitdiffstats
path: root/flist.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-01-28 08:12:16 +0000
committerWayne Davison <wayned@samba.org>2006-01-28 08:12:16 +0000
commit207522aef5774099defb1f8088996f8ae2e671cc (patch)
treefe2459e4f0bb1ca6114fb807924cebed804bcd73 /flist.c
parenta1cc199b34b4bc65cba2dce0cbb04c18f17271ac (diff)
downloadandroid_external_rsync-207522aef5774099defb1f8088996f8ae2e671cc.tar.gz
android_external_rsync-207522aef5774099defb1f8088996f8ae2e671cc.tar.bz2
android_external_rsync-207522aef5774099defb1f8088996f8ae2e671cc.zip
Tweaked a variable name in flist_find().
Diffstat (limited to 'flist.c')
-rw-r--r--flist.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/flist.c b/flist.c
index 06b75ba9..43aa9713 100644
--- a/flist.c
+++ b/flist.c
@@ -1439,7 +1439,7 @@ static int file_compare(struct file_struct **file1, struct file_struct **file2)
int flist_find(struct file_list *flist, struct file_struct *f)
{
int low = flist->low, high = flist->high;
- int ret, mid, mid_up;
+ int diff, mid, mid_up;
while (low <= high) {
mid = (low + high) / 2;
@@ -1469,18 +1469,18 @@ int flist_find(struct file_list *flist, struct file_struct *f)
continue;
}
}
- ret = f_name_cmp(flist->files[mid_up], f);
- if (ret == 0) {
+ diff = f_name_cmp(flist->files[mid_up], f);
+ if (diff == 0) {
if (protocol_version < 29
&& S_ISDIR(flist->files[mid_up]->mode)
!= S_ISDIR(f->mode))
return -1;
return mid_up;
}
- if (ret > 0)
- high = mid - 1;
- else
+ if (diff < 0)
low = mid_up + 1;
+ else
+ high = mid - 1;
}
return -1;
}