Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document the latest changes.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
a61eaef
..
5b80f3e
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-255,7
+255,7
@@
static mode_t from_wire_mode(int mode)
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len);
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len);
-static char *flist_dir;
+static c
onst c
har *flist_dir;
static int flist_dir_len;
static int flist_dir_len;
@@
-455,8
+455,8
@@
static void send_file_entry(struct file_struct *file, int f)
if (file->link_u.idev) {
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
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))
} else {
/* 64-bit dev_t and ino_t */
if (!(flags & XMIT_SAME_DEV))
@@
-467,7
+467,7
@@
static void send_file_entry(struct file_struct *file, int f)
#endif
if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
#endif
if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
- char *sum;
+ c
onst c
har *sum;
if (S_ISREG(mode))
sum = file->u.sum;
else {
if (S_ISREG(mode))
sum = file->u.sum;
else {
@@
-1216,7
+1216,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
}
if (dir && *dir) {
}
if (dir && *dir) {
- static char *lastdir;
+ static c
onst c
har *lastdir;
static int lastdir_len;
strlcpy(olddir, curr_dir, sizeof olddir);
static int lastdir_len;
strlcpy(olddir, curr_dir, sizeof olddir);
@@
-1450,10
+1450,10
@@
int flist_find(struct file_list *flist, struct file_struct *f)
if (mid_up > high) {
/* If there's nothing left above us, set high to
* a non-empty entry below us and continue. */
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 {
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;
}
} while (!flist->files[high]->basename);
flist->files[mid]->length = mid - high;
}
@@
-1505,8
+1505,7
@@
struct file_list *flist_new(int with_hlink, char *msg)
memset(flist, 0, sizeof (struct file_list));
memset(flist, 0, sizeof (struct file_list));
- if (!(flist->file_pool = pool_create(FILE_EXTENT, 0,
- out_of_memory, POOL_INTERN)))
+ if (!(flist->file_pool = pool_create(FILE_EXTENT, 0, out_of_memory, POOL_INTERN)))
out_of_memory(msg);
#ifdef SUPPORT_HARD_LINKS
out_of_memory(msg);
#ifdef SUPPORT_HARD_LINKS