Make option variables a little clearer by using separate FOO_ndx

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 0984424..be5831c 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -88,7 +88,7 @@
 /* This is used when working on a new protocol version in CVS, and should
  * be a new non-zero value for each CVS change that affects the protocol.
  * It must ALWAYS be 0 when the protocol goes final! */
-#define SUBPROTOCOL_VERSION 2
+#define SUBPROTOCOL_VERSION 3
 
 /* We refuse to interoperate with versions that are not in this range.
  * Note that we assume we'll work with later versions: the onus is on
@@ -580,10 +580,10 @@ struct file_struct {
 };
 
 extern int file_extra_cnt;
-extern int preserve_uid;
-extern int preserve_gid;
-extern int preserve_acls;
-extern int preserve_xattrs;
+extern int uid_ndx;
+extern int gid_ndx;
+extern int acls_ndx;
+extern int xattrs_ndx;
 
 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
 #define EXTRA_LEN (sizeof (union file_extras))
@@ -614,10 +614,10 @@ extern int preserve_xattrs;
 #define F_DEPTH(f) REQ_EXTRA(f, 1)->num
 
 /* When the associated option is on, all entries will have these present: */
-#define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
-#define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
-#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num
-#define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num
+#define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
+#define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
+#define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num
+#define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
 #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
 
 /* These items are per-entry optional and mutally exclusive: */
@@ -665,8 +665,8 @@ extern int preserve_xattrs;
  * (when they happen). Smaller sizes increase the chance of
  * freed allocations freeing whole extents.
  */
-#define FILE_EXTENT    (256 * 1024)
-#define HLINK_EXTENT   (128 * 1024)
+#define NORMAL_EXTENT  (256 * 1024)
+#define SMALL_EXTENT   (128 * 1024)
 
 #define FLIST_TEMP     (1<<1)
 
@@ -674,6 +674,7 @@ struct file_list {
        struct file_list *next, *prev;
        struct file_struct **files, **sorted;
        alloc_pool_t file_pool;
+       void *pool_boundary;
        int count, malloced;
        int low, high; /* 0-relative index values excluding empties */
        int ndx_start; /* the start offset for inc_recurse mode */