X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6abd193fe3f8e7b986c388e7642adc08516e8279..0e9480317dbb5b8003535a769f4a03bc720d5f5f:/rsync.h

diff --git a/rsync.h b/rsync.h
index d030d4b9..a8325d0c 100644
--- a/rsync.h
+++ b/rsync.h
@@ -293,9 +293,18 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
  * Solaris) to a 32-bit-devt machine (say, Linux-2.2/x86) then the
  * device numbers will be truncated.  But it's a kind of silly thing
  * to do anyhow.
+ *
+ * FIXME: In future, we should probable split the device number into
+ * major/minor, and transfer the two parts as 32-bit ints.  That gives
+ * you somewhat more of a chance that they'll come from a big machine
+ * to a little one in a useful way.
+ *
+ * FIXME: Really we need an unsigned type, and we perhaps ought to
+ * cope with platforms on which this is an unsigned int or even a
+ * struct.  Later.
  */ 
-#define INO64_T int64
-#define DEV64_T int64
+#define INO64_T unsigned int64
+#define DEV64_T unsigned int64
 
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
@@ -368,11 +377,11 @@ struct sum_buf {
 };
 
 struct sum_struct {
-  OFF_T flength;		/* total file length */
-  int count;			/* how many chunks */
-  int remainder;		/* flength % block_length */
-  int n;			/* block_length */
-  struct sum_buf *sums;		/* points to info for each chunk */
+	OFF_T flength;		/* total file length */
+	size_t count;		/* how many chunks */
+	size_t remainder;	/* flength % block_length */
+	size_t n;		/* block_length */
+	struct sum_buf *sums;	/* points to info for each chunk */
 };
 
 struct map_struct {
@@ -413,11 +422,12 @@ static inline int flist_up(struct file_list *flist, int i)
 }
 
 #include "byteorder.h"
-#include "proto.h"
 #include "lib/mdfour.h"
 #include "lib/permstring.h"
 #include "lib/addrinfo.h"
 
+#include "proto.h"
+
 /* We have replacement versions of these if they're missing. */
 #ifndef HAVE_ASPRINTF
 int asprintf(char **ptr, const char *format, ...);