Got rid of calls to the (soon to vanish) safe_fname() function.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index b97b909..26295f0 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -134,11 +134,6 @@
 #define FNAMECMP_BACKUP        0x82
 #define FNAMECMP_FUZZY         0x83
 
-/* For calling delete_file() */
-#define DEL_NO_RECURSE         (1<<1)
-#define DEL_FORCE_RECURSE      (1<<2) /* recurse even w/o --force */
-#define DEL_TERSE              (1<<3)
-
 /* For use by the itemize_changes code */
 #define ITEM_REPORT_CHECKSUM (1<<1)
 #define ITEM_REPORT_SIZE (1<<2)
@@ -153,7 +148,6 @@
 #define ITEM_LOCAL_CHANGE (1<<14)
 #define ITEM_TRANSFER (1<<15)
 /* These are outside the range of the transmitted flags. */
-#define ITEM_NO_DEST_AND_NO_UPDATE (1<<16) /* used by itemize() */
 #define ITEM_MISSING_DATA (1<<16)         /* used by log_formatted() */
 #define ITEM_DELETED (1<<17)              /* used by log_formatted() */
 
@@ -592,11 +586,11 @@ struct map_struct {
 
 #define MATCHFLG_WILD          (1<<0) /* pattern has '*', '[', and/or '?' */
 #define MATCHFLG_WILD2         (1<<1) /* pattern has '**' */
-#define MATCHFLG_WILD2_PREFIX  (1<<2) /* pattern starts with '**' */
-#define MATCHFLG_ABS_PATH      (1<<3) /* path-match on absolute path */
-#define MATCHFLG_INCLUDE       (1<<4) /* this is an include, not an exclude */
-#define MATCHFLG_DIRECTORY     (1<<5) /* this matches only directories */
-#define MATCHFLG_CLEAR_LIST    (1<<6) /* this item is the "!" token */
+#define MATCHFLG_WILD2_PREFIX  (1<<2) /* pattern starts with "**" */
+#define MATCHFLG_WILD3_SUFFIX  (1<<3) /* pattern ends with "***" */
+#define MATCHFLG_ABS_PATH      (1<<4) /* path-match on absolute path */
+#define MATCHFLG_INCLUDE       (1<<5) /* this is an include, not an exclude */
+#define MATCHFLG_DIRECTORY     (1<<6) /* this matches only directories */
 #define MATCHFLG_WORD_SPLIT    (1<<7) /* split rules on whitespace */
 #define MATCHFLG_NO_INHERIT    (1<<8) /* don't inherit these rules */
 #define MATCHFLG_NO_PREFIXES   (1<<9) /* parse no prefixes from patterns */
@@ -608,6 +602,7 @@ struct map_struct {
 #define MATCHFLG_CVS_IGNORE    (1<<15)/* rule was -C or :C */
 #define MATCHFLG_SENDER_SIDE   (1<<16)/* rule applies to the sending side */
 #define MATCHFLG_RECEIVER_SIDE (1<<17)/* rule applies to the receiving side */
+#define MATCHFLG_CLEAR_LIST    (1<<18)/* this item is the "!" token */
 
 #define MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \
                                | MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \
@@ -799,7 +794,7 @@ extern int errno;
 #define INITACCESSPERMS 0700
 
 /* handler for null strings in printf format */
-#define NS(s) ((s)?safe_fname(s):"<NULL>")
+#define NS(s) ((s)?(s):"<NULL>")
 
 #if !defined __GNUC__ || defined __APPLE__
 /* Apparently the OS X port of gcc gags on __attribute__.