s3/lib: remove name_compare_entry typedef

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1db239f0559d0c9c9b41549620ace402400fa4cf..639f93c237f21a5d85c4b643c935055caa4fa454 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -315,9 +315,12 @@ gid_t nametogid(const char *name);
 void smb_panic_s3(const char *why);
 void log_panic_action(const char *msg);
 const char *readdirname(DIR *p);
-bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive);
-void set_namearray(name_compare_entry **ppname_array, const char *namelist);
-void free_namearray(name_compare_entry *name_array);
+bool is_in_path(const char *name,
+               struct name_compare_entry *namelist,
+               bool case_sensitive);
+void set_namearray(struct name_compare_entry **ppname_array,
+                  const char *namelist);
+void free_namearray(struct name_compare_entry *name_array);
 bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type);
 bool fcntl_getlock(int fd, int op, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid);
 int map_process_lock_to_ofd_lock(int op);

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 1e2e88d65cefa03807abbd7871a99305ed1c5516..56fe0a69195cf1df9a4e085d089f6401b5068e9e 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -702,10 +702,10 @@ struct vuid_cache {
        struct vuid_cache_entry array[VUID_CACHE_SIZE];
 };
 
-typedef struct {
+struct name_compare_entry {
        char *name;
        bool is_wild;
-} name_compare_entry;
+};
 
 struct share_params {
        int service;
@@ -767,10 +767,10 @@ typedef struct connection_struct {
           Used to ensure unique FileIndex returns. */
        SMB_DEV_T base_share_dev;
 
-       name_compare_entry *hide_list; /* Per-share list of files to return as hidden. */
-       name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */
-       name_compare_entry *veto_oplock_list; /* Per-share list of files to refuse oplocks on. */
-       name_compare_entry *aio_write_behind_list; /* Per-share list of files to use aio write behind on. */
+       struct name_compare_entry *hide_list; /* Per-share list of files to return as hidden. */
+       struct name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */
+       struct name_compare_entry *veto_oplock_list; /* Per-share list of files to refuse oplocks on. */
+       struct name_compare_entry *aio_write_behind_list; /* Per-share list of files to use aio write behind on. */
        struct trans_state *pending_trans;
 
        struct rpc_pipe_client *spoolss_pipe;

diff --git a/source3/lib/namearray.c b/source3/lib/namearray.c
index e5c3bd983b5ba9c21c7b8148668a665e0142fea9..f66dd0ae46bd621ff99f124b89e592cb3f9b5943 100644 (file)
--- a/source3/lib/namearray.c
+++ b/source3/lib/namearray.c
@@ -26,7 +26,7 @@
  Routine to free a namearray.
 ****************************************************************************/
 
-void free_namearray(name_compare_entry *name_array)
+void free_namearray(struct name_compare_entry *name_array)
 {
        int i;
 

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 0deda2394f431c75197c45dcc5f99451263355e2..d7d1c48aa98213f6d7d450f84945a9e6052b2303 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -747,7 +747,9 @@ const char *readdirname(DIR *p)
  of a path matches a (possibly wildcarded) entry in a namelist.
 ********************************************************************/
 
-bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive)
+bool is_in_path(const char *name,
+               struct name_compare_entry *namelist,
+               bool case_sensitive)
 {
        const char *last_component;
 
@@ -800,7 +802,7 @@ bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensit
  if possible.
 ********************************************************************/
 
-void set_namearray(name_compare_entry **ppname_array, const char *namelist_in)
+void set_namearray(struct name_compare_entry **ppname_array, const char *namelist_in)
 {
        char *name_end;
        char *namelist;
@@ -855,7 +857,7 @@ void set_namearray(name_compare_entry **ppname_array, const char *namelist_in)
                return;
        }
 
-       if(( (*ppname_array) = SMB_MALLOC_ARRAY(name_compare_entry, num_entries + 1)) == NULL) {
+       if(( (*ppname_array) = SMB_MALLOC_ARRAY(struct name_compare_entry, num_entries + 1)) == NULL) {
                DEBUG(0,("set_namearray: malloc fail\n"));
                talloc_free(namelist);
                return;

diff --git a/source3/modules/vfs_virusfilter_common.h b/source3/modules/vfs_virusfilter_common.h
index 24359bf5a3a0b53e113c835269552c0498dc18fd..988d384d74d4f45d17fae6341080626de5ef5aec 100644 (file)
--- a/source3/modules/vfs_virusfilter_common.h
+++ b/source3/modules/vfs_virusfilter_common.h
@@ -78,10 +78,10 @@ struct virusfilter_config {
        size_t                          min_file_size;
 
        /* Exclude files */
-       name_compare_entry              *exclude_files;
+       struct name_compare_entry       *exclude_files;
 
        /* Infected files */
-       name_compare_entry              *infected_files;
+       struct name_compare_entry       *infected_files;
 
        /* Scan result cache */
        struct virusfilter_cache        *cache;

diff --git a/source3/torture/test_matching.c b/source3/torture/test_matching.c
index 647b758a34af83e66ed1f49a949bb3bfa2c3364e..5c2f75bfbfe94a00aa77fc7487a642ca49a6aa2a 100644 (file)
--- a/source3/torture/test_matching.c
+++ b/source3/torture/test_matching.c
@@ -24,7 +24,7 @@
 bool run_str_match_mswild(int dummy)
 {
        const char *namelist = "/abc*.txt/xyz*.dat/a0123456789Z/";
-       name_compare_entry *name_entries = NULL;
+       struct name_compare_entry *name_entries = NULL;
        struct samba_path_matching *pmcs = NULL;
        struct samba_path_matching *pmci = NULL;
        const struct str_match_mswild_name {