Make hard-linking work when a device has an st_dev of 0.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index fdc7a03..c487d46 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -32,7 +32,7 @@
 #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
 #define URL_PREFIX "rsync://"
 
-#define SYMLINK_PREFIX "/rsyncd-munged/"
+#define SYMLINK_PREFIX "/rsyncd-munged/"  /* This MUST have a trailing slash! */
 #define SYMLINK_PREFIX_LEN ((int)sizeof SYMLINK_PREFIX - 1)
 
 #define BACKUP_SUFFIX "~"
@@ -551,7 +551,7 @@ struct hashtable {
        void *nodes;
        int32 size, entries;
        uint32 node_size;
-       int key64;
+       short key64;
 };
 
 struct ht_int32_node {
@@ -851,7 +851,7 @@ typedef struct {
 } xbuf;
 
 #define INIT_XBUF(xb, str, ln, sz) (xb).buf = (str), (xb).len = (ln), (xb).size = (sz), (xb).pos = 0
-#define INIT_XBUF_STRLEN(xb, str) (xb).buf = (str), (xb).len = strlen((xb).buf), (xb).size = (-1), (xb).pos = 0
+#define INIT_XBUF_STRLEN(xb, str) (xb).buf = (str), (xb).len = strlen((xb).buf), (xb).size = (size_t)-1, (xb).pos = 0
 /* This one is used to make an output xbuf based on a char[] buffer: */
 #define INIT_CONST_XBUF(xb, bf) (xb).buf = (bf), (xb).size = sizeof (bf), (xb).len = (xb).pos = 0
 
@@ -1147,10 +1147,10 @@ extern short info_levels[], debug_levels[];
 #define DEBUG_BIND (DEBUG_BACKUP+1)
 #define DEBUG_CHDIR (DEBUG_BIND+1)
 #define DEBUG_CONNECT (DEBUG_CHDIR+1)
-#define DEBUG_CHKSUM (DEBUG_CONNECT+1)
-#define DEBUG_CMD (DEBUG_CHKSUM+1)
+#define DEBUG_CMD (DEBUG_CONNECT+1)
 #define DEBUG_DEL (DEBUG_CMD+1)
-#define DEBUG_DUP (DEBUG_DEL+1)
+#define DEBUG_DELTASUM (DEBUG_DEL+1)
+#define DEBUG_DUP (DEBUG_DELTASUM+1)
 #define DEBUG_EXIT (DEBUG_DUP+1)
 #define DEBUG_FILTER (DEBUG_EXIT+1)
 #define DEBUG_FLIST (DEBUG_FILTER+1)