aboutsummaryrefslogtreecommitdiffstats
path: root/receiver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-11-21 08:36:31 +0000
committerWayne Davison <wayned@samba.org>2006-11-21 08:36:31 +0000
commit53593085cf6dbaa141c3b8f45e1883523a8cfe8b (patch)
tree6764259680bf72df5530d4398a1845ef1f04b6a9 /receiver.c
parenteb0144d79b4a52be68dd975cc64149ea4bd9080f (diff)
downloadandroid_external_rsync-53593085cf6dbaa141c3b8f45e1883523a8cfe8b.tar.gz
android_external_rsync-53593085cf6dbaa141c3b8f45e1883523a8cfe8b.tar.bz2
android_external_rsync-53593085cf6dbaa141c3b8f45e1883523a8cfe8b.zip
- Use an explicit cast when a value gets stored in a smaller var.
- The msgtype var should have been an enum.
Diffstat (limited to 'receiver.c')
-rw-r--r--receiver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/receiver.c b/receiver.c
index 4ac407fa..986c5fe5 100644
--- a/receiver.c
+++ b/receiver.c
@@ -164,7 +164,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
offset = j;
}
if (offset < sum.flength) {
- int32 len = sum.flength - offset;
+ int32 len = (int32)(sum.flength - offset);
if (do_progress)
show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, len), len);
@@ -660,7 +660,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
send_msg(MSG_SUCCESS, numbuf, 4);
}
} else if (!recv_ok) {
- int msgtype = phase || read_batch ? FERROR : FINFO;
+ enum logcode msgtype = phase || read_batch ? FERROR : FINFO;
if (msgtype == FERROR || verbose) {
char *errstr, *redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)