Changed the sending of device major/minor numbers in protocol 30 to

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 1d2441a..46a4a8a 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -42,20 +42,20 @@
 
 #define XMIT_TOP_DIR (1<<0)
 #define XMIT_SAME_MODE (1<<1)
-#define XMIT_EXTENDED_FLAGS (1<<2)
-#define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* protocols < 28 */
+#define XMIT_SAME_RDEV_pre28 (1<<2)    /* protocols 20 - 27  */
+#define XMIT_EXTENDED_FLAGS (1<<2)     /* protocols 28 - NOW */
 #define XMIT_SAME_UID (1<<3)
 #define XMIT_SAME_GID (1<<4)
 #define XMIT_SAME_NAME (1<<5)
 #define XMIT_LONG_NAME (1<<6)
 #define XMIT_SAME_TIME (1<<7)
-#define XMIT_SAME_RDEV_MAJOR (1<<8)
-#define XMIT_HLINKED (1<<9)
-#define XMIT_SAME_DEV_pre30 (1<<10)    /* protocols < 30 */
-#define XMIT_HLINK_FIRST (1<<10)       /* protocols >= 30 */
-#define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
-#define XMIT_USER_NAME_FOLLOWS (1<<12) /* protocols >= 30 */
-#define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */
+#define XMIT_SAME_RDEV_MAJOR (1<<8)    /* protocols 28 - NOW */
+#define XMIT_HLINKED (1<<9)            /* protocols 28 - NOW */
+#define XMIT_SAME_DEV_pre30 (1<<10)    /* protocols 28 - 29  */
+#define XMIT_USER_NAME_FOLLOWS (1<<10) /* protocols 30 - NOW */
+#define XMIT_RDEV_MINOR_8_pre30 (1<<11)        /* protocols 28 - 29  */
+#define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - NOW */
+#define XMIT_HLINK_FIRST (1<<12)       /* protocols 30 - NOW */
 
 /* These flags are used in the live flist data. */
 
@@ -1005,7 +1005,7 @@ size_t strlcat(char *d, const char *s, size_t bufsize);
 #define MY_GID() getgid()
 #endif
 
-extern int verbose, protocol_version;
+extern int verbose;
 
 #ifndef HAVE_INET_NTOP
 const char *inet_ntop(int af, const void *src, char *dst, size_t size);
@@ -1019,23 +1019,6 @@ int inet_pton(int af, const char *src, void *dst);
 const char *get_panic_action(void);
 #endif
 
-static inline int32
-read_abbrevint30(int f)
-{
-       if (protocol_version < 30)
-               return read_int(f);
-       return read_abbrevint(f);
-}
-
-static inline void
-write_abbrevint30(int f, int32 x)
-{
-       if (protocol_version < 30)
-               write_int(f, x);
-       else
-               write_abbrevint(f, x);
-}
-
 static inline int
 isDigit(const char *ptr)
 {