X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bfd3137246794e3eee55ae8e19968d50006050da..234844915e81c9ebc3e95b2e312982d3d1eb59a3:/rsync.h

diff --git a/rsync.h b/rsync.h
index 4b07b78e..e5a40194 100644
--- a/rsync.h
+++ b/rsync.h
@@ -174,7 +174,7 @@ enum logcode { FNONE=0, FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FSOCKERR=5 };
 enum msgcode {
 	MSG_DATA=0,	/* raw data on the multiplexed stream */
 	MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
-	MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
+	MSG_LOG=FLOG, MSG_CLIENT=FCLIENT, MSG_SOCKERR=FSOCKERR, /* sibling logging */
 	MSG_REDO=9,	/* reprocess indicated flist index */
 	MSG_SUCCESS=100,/* successfully updated indicated flist index */
 	MSG_DELETED=101,/* successfully deleted a file on receiving side */
@@ -507,7 +507,6 @@ struct file_struct {
 		uid_t uid;           /* The user ID number */
 		uid_t gid;           /* The group ID number or GID_NONE */
 		struct idev *idev;   /* The hard-link info during matching */
-		struct hlist *hlist; /* The hard-link info after matching */
 		int32 num;           /* A signed number */
 		uint32 unum;         /* An unsigned number */
 	} extras[1];
@@ -539,8 +538,12 @@ extern int preserve_gid;
 
 /* Basename (AKA filename) and length applies to all items */
 #define F_BASENAME(f) ((const char*)(f) + FILE_STRUCT_LEN)
-#define F_LENGTH(f) ((OFF_T)(f)->len32 + ((f)->flags & FLAG_LENGTH64 \
-		   ? (OFF_T)OPT_EXTRA(f, 0)->unum << 32 : 0u))
+#if SIZEOF_INT64 < 8
+#define F_LENGTH(f) ((int64)(f)->len32)
+#else
+#define F_LENGTH(f) ((int64)(f)->len32 + ((f)->flags & FLAG_LENGTH64 \
+		   ? (int64)OPT_EXTRA(f, 0)->unum << 32 : 0))
+#endif
 
 /* If there is a symlink string, it is always right after the basename */
 #define F_SYMLINK(f) (F_BASENAME(f) + strlen(F_BASENAME(f)) + 1)