void file_checksum(char *fname,char *sum,OFF_T size)
{
- OFF_T i;
struct map_struct *buf;
- int fd;
- OFF_T len = size;
+ OFF_T i, len = size;
struct mdfour m;
+ int32 remainder;
+ int fd;
memset(sum,0,MD4_SUM_LENGTH);
* by failing to call mdfour_tail() for block sizes that
* are multiples of 64. This is fixed by calling mdfour_update()
* even when there are no more bytes. */
- if (len - i > 0 || protocol_version >= 27)
- mdfour_update(&m, (uchar *)map_ptr(buf, i, len-i), len-i);
+ remainder = (int32)(len - i);
+ if (remainder > 0 || protocol_version >= 27)
+ mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
mdfour_result(&m, (uchar *)sum);
window_start = offset;
window_size = map->def_window_size;
if (window_start + window_size > map->file_size)
- window_size = map->file_size - window_start;
+ window_size = (int32)(map->file_size - window_start);
if (len > window_size)
window_size = len;
window_start < map->p_offset + map->p_len &&
window_start + window_size >= map->p_offset + map->p_len) {
read_start = map->p_offset + map->p_len;
- read_offset = read_start - window_start;
+ read_offset = (int32)(read_start - window_start);
read_size = window_size - read_offset;
memmove(map->p, map->p + (map->p_len - read_offset), read_offset);
} else {
if (file->link_u.idev) {
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
- write_int(f, dev);
- write_int(f, file->F_INODE);
+ write_int(f, (int32)dev);
+ write_int(f, (int32)file->F_INODE);
} else {
/* 64-bit dev_t and ino_t */
if (!(flags & XMIT_SAME_DEV))
if (mid_up > high) {
/* If there's nothing left above us, set high to
* a non-empty entry below us and continue. */
- high = mid - flist->files[mid]->length;
+ high = mid - (int)flist->files[mid]->length;
if (!flist->files[high]->basename) {
do {
- high -= flist->files[high]->length;
+ high -= (int)flist->files[high]->length;
} while (!flist->files[high]->basename);
flist->files[mid]->length = mid - high;
}
sum->flength = len;
sum->blength = blength;
sum->s2length = s2length;
- sum->remainder = len % blength;
- sum->count = len / blength + (sum->remainder != 0);
+ sum->remainder = (int32)(len % blength);
+ sum->count = (int32)(len / blength) + (sum->remainder != 0);
if (sum->count && verbose > 2) {
rprintf(FINFO,
static void matched(int f, struct sum_struct *s, struct map_struct *buf,
OFF_T offset, int32 i)
{
- int32 n = offset - last_match; /* max value: block_size (int32) */
+ int32 n = (int32)(offset - last_match); /* max value: block_size (int32) */
int32 j;
if (verbose > 2 && i >= 0) {
static void hash_search(int f,struct sum_struct *s,
struct map_struct *buf, OFF_T len)
{
- OFF_T offset, end, backup;
- int32 k, want_i;
+ OFF_T offset, end;
+ int32 k, want_i, backup;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
int more;
} while ((i = s->sums[i].chain) >= 0);
null_hash:
- backup = offset - last_match;
+ backup = (int32)(offset - last_match);
/* We sometimes read 1 byte prior to last_match... */
if (backup < 0)
backup = 0;
last_match = j;
}
if (last_match < s->flength) {
- int32 len = s->flength - last_match;
+ int32 len = (int32)(s->flength - last_match);
if (buf && do_progress)
show_progress(last_match, buf->file_size);
sum_update(map_ptr(buf, last_match, len), len);
OFF_T num = size;
*s = '\0';
while (num) {
- *--s = (num % 10) + '0';
+ *--s = (char)(num % 10) + '0';
num /= 10;
}
if (!(*size_arg = strdup(s)))
if (!num)
*--s = '0';
while (num) {
- *--s = (num % 10) + '0';
+ *--s = (char)(num % 10) + '0';
num /= 10;
}
return s;