Use typedefs for the filter structures.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index d4a0f8f..bd6a495 100644 (file)
--- a/options.c
+++ b/options.c
@@ -29,8 +29,8 @@ extern int local_server;
 extern int sanitize_paths;
 extern int daemon_over_rsh;
 extern unsigned int module_dirlen;
-extern struct filter_list_struct filter_list;
-extern struct filter_list_struct daemon_filter_list;
+extern filter_rule_list filter_list;
+extern filter_rule_list daemon_filter_list;
 
 int make_backups = 0;
 
@@ -204,18 +204,18 @@ struct chmod_mode_struct *chmod_modes = NULL;
 static const char *debug_verbosity[] = {
        /*0*/ NULL,
        /*1*/ NULL,
-       /*2*/ "bind,cmd,connect,del,deltasum,dup,filter,flist,iconv",
-       /*3*/ "acl,backup,deltasum2,del2,exit,filter2,flist2,fuzzy,genr,own,recv,send,time",
-       /*4*/ "cmd2,deltasum3,del3,exit2,flist3,iconv2,own2,proto,time2",
-       /*5*/ "chdir,deltasum4,flist4,fuzzy2,hash,hlink",
+       /*2*/ "BIND,CMD,CONNECT,DEL,DELTASUM,DUP,FILTER,FLIST,ICONV",
+       /*3*/ "ACL,BACKUP,DELTASUM2,DEL2,EXIT,FILTER2,FLIST2,FUZZY,GENR,OWN,RECV,SEND,TIME",
+       /*4*/ "CMD2,DELTASUM3,DEL3,EXIT2,FLIST3,ICONV2,OWN2,PROTO,TIME2",
+       /*5*/ "CHDIR,DELTASUM4,FLIST4,FUZZY2,HASH,HLINK",
 };
 
 #define MAX_VERBOSITY ((int)(sizeof debug_verbosity / sizeof debug_verbosity[0]) - 1)
 
 static const char *info_verbosity[1+MAX_VERBOSITY] = {
        /*0*/ NULL,
-       /*1*/ "copy,del,flist,misc,name,stats,symsafe",
-       /*2*/ "backup,mount,name2,remove,skip",
+       /*1*/ "COPY,DEL,FLIST,MISC,NAME,STATS,SYMSAFE",
+       /*2*/ "BACKUP,MOUNT,NAME2,REMOVE,SKIP",
 };
 
 #define MAX_OUT_LEVEL 4 /* The largest N allowed for any flagN word. */
@@ -1409,7 +1409,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 
                case OPT_INCLUDE:
                        parse_rule(&filter_list, poptGetOptArg(pc),
-                                  MATCHFLG_INCLUDE, XFLG_OLD_PREFIXES);
+                                  FILTRULE_INCLUDE, XFLG_OLD_PREFIXES);
                        break;
 
                case OPT_EXCLUDE_FROM:
@@ -1432,7 +1432,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                                        goto options_rejected;
                        }
                        parse_filter_file(&filter_list, arg,
-                               opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
+                               opt == OPT_INCLUDE_FROM ? FILTRULE_INCLUDE : 0,
                                XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
                        break;
 
@@ -1972,7 +1972,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
        }
        if (daemon_filter_list.head && !am_sender) {
-               struct filter_list_struct *elp = &daemon_filter_list;
+               filter_rule_list *elp = &daemon_filter_list;
                if (tmpdir) {
                        char *dir;
                        if (!*tmpdir)