From f8057304930f9c6dcb7fca57f3c25cc2c09b3c1d Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 1 Feb 2005 09:21:30 +0000 Subject: [PATCH] - Put "basedir" into a union "dir" and named it "root". The other member of the union is "depth". - Added members "low" and "high" to the file list structure (which are set when the list is cleaned). - Got rid of the flist_up() inline function. --- rsync.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/rsync.h b/rsync.h index 690d5a60..6dc5a9c5 100644 --- a/rsync.h +++ b/rsync.h @@ -473,9 +473,12 @@ struct file_struct { char *link; /* Points to symlink string, if a symlink */ } u; OFF_T length; - char *basename; - char *dirname; - char *basedir; + char *basename; /* The current item's name (AKA filename) */ + char *dirname; /* The directory info inside the transfer */ + union { + char *root; /* Sender-side dir info outside transfer */ + int depth; /* Receiver-side directory depth info */ + } dir; union { struct idev *idev; struct hlink *links; @@ -515,6 +518,7 @@ struct file_list { alloc_pool_t hlink_pool; int count; int malloced; + int low, high; }; #define SUMFLG_SAME_OFFSET (1<<0) @@ -594,15 +598,6 @@ struct stats { }; -/* we need this function because of the silly way in which duplicate - entries are handled in the file lists - we can't change this - without breaking existing versions */ -static inline int flist_up(struct file_list *flist, int i) -{ - while (!flist->files[i]->basename) i++; - return i; -} - #include "byteorder.h" #include "lib/mdfour.h" #include "lib/wildmatch.h" -- 2.34.1