[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] enum svn_node_kind -> svn_node_kind_t

From: Daniel Rall <dlr_at_finemaltcoding.com>
Date: 2002-11-04 21:28:15 CET

Garrett Rooney <rooneg@electricjellyfish.net> writes:

> Daniel Rall wrote:
> > Why not use the "svn_node_kind_t" typedef instead of "enum
> > svn_node_kind" from subversion/include/svn_types.h? Curious what the
> > style preference is.
>
> actually i noticed that after i committed the change, and looked
> around libsvn_wc and found a bunch of other places using enum
> svn_node_kind instead of svn_node_kind_t. if there's a consensus that
> we use the typedef, i'll make a sweep and convert them all, i just
> haven't had a chance yet.

I tend to use typedefs in preference to struct/enum/union/etc. decls
myself. Looks like Mike intended a conversion after adding the
typedef. Here's the patch:

* Conversion of enum svn_node_kind to the newer svn_node_kind_t
  typedef.

Index: subversion/libsvn_repos/hooks.c
===================================================================
--- subversion/libsvn_repos/hooks.c (revision 3644)
+++ subversion/libsvn_repos/hooks.c (working copy)
@@ -118,7 +118,7 @@
                        const char *user,
                        apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const char *hook = svn_repos_start_commit_hook (repos, pool);
 
   if ((! svn_io_check_path (hook, &kind, pool))
@@ -145,7 +145,7 @@
                      const char *txn_name,
                      apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const char *hook = svn_repos_pre_commit_hook (repos, pool);
 
   if ((! svn_io_check_path (hook, &kind, pool))
@@ -172,7 +172,7 @@
                       svn_revnum_t rev,
                       apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const char *hook = svn_repos_post_commit_hook (repos, pool);
 
   if ((! svn_io_check_path (hook, &kind, pool))
@@ -203,7 +203,7 @@
                              const svn_string_t *value,
                              apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const char *hook = svn_repos_pre_revprop_change_hook(repos, pool);
 
   if ((! svn_io_check_path (hook, &kind, pool))
@@ -249,7 +249,7 @@
                               const char *name,
                               apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const char *hook = svn_repos_post_revprop_change_hook(repos, pool);
   
   if ((! svn_io_check_path (hook, &kind, pool))
Index: subversion/libsvn_repos/load.c
===================================================================
--- subversion/libsvn_repos/load.c (revision 3644)
+++ subversion/libsvn_repos/load.c (working copy)
@@ -59,7 +59,7 @@
 struct node_baton
 {
   const char *path;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   enum svn_node_action action;
 
   svn_revnum_t copyfrom_rev;
Index: subversion/libsvn_repos/dump.c
===================================================================
--- subversion/libsvn_repos/dump.c (revision 3644)
+++ subversion/libsvn_repos/dump.c (working copy)
@@ -210,7 +210,7 @@
 static svn_error_t *
 dump_node (struct edit_baton *eb,
            const char *path, /* an absolute path. */
- enum svn_node_kind kind,
+ svn_node_kind_t kind,
            enum svn_node_action action,
            svn_boolean_t is_copy,
            const char *cmp_path,
Index: subversion/bindings/java/jni/nodekind.h
===================================================================
--- subversion/bindings/java/jni/nodekind.h (revision 3644)
+++ subversion/bindings/java/jni/nodekind.h (working copy)
@@ -46,7 +46,7 @@
  */
 jobject
 nodekind__create_from_svn_node_kind(JNIEnv *env, jboolean *hasException,
- enum svn_node_kind nodekind);
+ svn_node_kind_t nodekind);
 
 #ifdef __cplusplus
 }
Index: subversion/bindings/java/jni/nodekind.c
===================================================================
--- subversion/bindings/java/jni/nodekind.c (revision 3644)
+++ subversion/bindings/java/jni/nodekind.c (working copy)
@@ -106,7 +106,7 @@
 
 jobject
 nodekind__create_from_svn_node_kind(JNIEnv *env, jboolean *hasException,
- enum svn_node_kind nodekind)
+ svn_node_kind_t nodekind)
 {
   /**
    * right now, all we do is cast the enum to an int. thats about it
Index: subversion/bindings/com/SVNStatus.h
===================================================================
--- subversion/bindings/com/SVNStatus.h (revision 3644)
+++ subversion/bindings/com/SVNStatus.h (working copy)
@@ -69,7 +69,7 @@
 
         EWCStatus text_status;
     EWCStatus prop_status;
- enum svn_node_kind kind; /* Is it a file, a dir, or... ? */
+ svn_node_kind_t kind; /* Is it a file, a dir, or... ? */
         CHAR *pszName;
 
 // ISupportsErrorInfo
Index: subversion/svnlook/main.c
===================================================================
--- subversion/svnlook/main.c (revision 3644)
+++ subversion/svnlook/main.c (working copy)
@@ -325,7 +325,7 @@
   full_path = "";
   for (i = 0; i < path_pieces->nelts; i++)
     {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
       const char *piece = ((const char **) (path_pieces->elts))[i];
       full_path = svn_path_join (full_path, piece, pool);
       SVN_ERR (svn_io_check_path (full_path, &kind, pool));
Index: subversion/libsvn_client/add.c
===================================================================
--- subversion/libsvn_client/add.c (revision 3644)
+++ subversion/libsvn_client/add.c (working copy)
@@ -128,7 +128,7 @@
                 void *notify_baton,
                 apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_error_t *err, *err2;
   svn_wc_adm_access_t *adm_access;
   const char *parent_path = svn_path_remove_component_nts (path, pool);
Index: subversion/libsvn_client/commit.c
===================================================================
--- subversion/libsvn_client/commit.c (revision 3644)
+++ subversion/libsvn_client/commit.c (working copy)
@@ -319,7 +319,7 @@
         apr_pool_t *pool)
 {
   void *root_baton;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   apr_hash_t *files = apr_hash_make (pool);
   apr_hash_index_t *hi;
 
Index: subversion/libsvn_client/cleanup.c
===================================================================
--- subversion/libsvn_client/cleanup.c (revision 3644)
+++ subversion/libsvn_client/cleanup.c (working copy)
@@ -38,7 +38,7 @@
 svn_client_cleanup (const char *dir,
                     apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   SVN_ERR (svn_io_check_path (dir, &kind, pool));
   if (kind != svn_node_dir)
Index: subversion/libsvn_client/export.c
===================================================================
--- subversion/libsvn_client/export.c (revision 3644)
+++ subversion/libsvn_client/export.c (working copy)
@@ -46,7 +46,7 @@
 
   for (hi = apr_hash_first (pool, dirents); hi; hi = apr_hash_next (hi))
     {
- const enum svn_node_kind *type;
+ const svn_node_kind_t *type;
       const char *item;
       const void *key;
       void *val;
@@ -110,7 +110,7 @@
 
       for (hi = apr_hash_first (pool, dirents); hi; hi = apr_hash_next (hi))
         {
- const enum svn_node_kind *type;
+ const svn_node_kind_t *type;
           const char *item;
           const void *key;
           void *val;
Index: subversion/libsvn_client/ls.c
===================================================================
--- subversion/libsvn_client/ls.c (revision 3644)
+++ subversion/libsvn_client/ls.c (working copy)
@@ -79,7 +79,7 @@
   svn_ra_plugin_t *ra_lib;
   void *ra_baton, *session;
   svn_revnum_t rev;
- enum svn_node_kind url_kind;
+ svn_node_kind_t url_kind;
 
   /* Get the RA library that handles URL. */
   SVN_ERR (svn_ra_init_ra_libs (&ra_baton, pool));
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 3644)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -392,7 +392,7 @@
 {
   struct merge_cmd_baton *merge_b = baton;
   apr_pool_t *subpool = svn_pool_create (merge_b->pool);
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const char *copyfrom_url;
   const char *child;
 
@@ -458,7 +458,7 @@
 {
   struct merge_cmd_baton *merge_b = baton;
   apr_pool_t *subpool = svn_pool_create (merge_b->pool);
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_wc_adm_access_t *parent_access;
   const char *parent_path;
 
@@ -496,7 +496,7 @@
 {
   struct merge_cmd_baton *merge_b = baton;
   apr_pool_t *subpool = svn_pool_create (merge_b->pool);
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const svn_wc_entry_t *entry;
   const char *copyfrom_url, *child;
 
@@ -548,7 +548,7 @@
 {
   struct merge_cmd_baton *merge_b = baton;
   apr_pool_t *subpool = svn_pool_create (merge_b->pool);
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_wc_adm_access_t *parent_access;
   const char *parent_path;
   
@@ -1077,7 +1077,7 @@
       const char *URL1, *URL2;
       const char *anchor1, *target1, *anchor2, *target2;
       svn_boolean_t path1_is_url, path2_is_url;
- enum svn_node_kind path2_kind;
+ svn_node_kind_t path2_kind;
       void *session2;
 
       /* The paths could be *either* wcpaths or urls... */
Index: subversion/libsvn_subr/io.c
===================================================================
--- subversion/libsvn_subr/io.c (revision 3644)
+++ subversion/libsvn_subr/io.c (working copy)
@@ -54,7 +54,7 @@
 
 svn_error_t *
 svn_io_check_path (const char *path,
- enum svn_node_kind *kind,
+ svn_node_kind_t *kind,
                    apr_pool_t *pool)
 {
   apr_finfo_t finfo;
@@ -285,7 +285,7 @@
                                           svn_boolean_t copy_perms,
                                           apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   apr_status_t status;
   apr_hash_t *dirents;
   apr_hash_index_t *hi;
@@ -337,7 +337,7 @@
       const void *key;
       void *val;
       const char *entryname;
- enum svn_node_kind *entrykind;
+ svn_node_kind_t *entrykind;
       const char *src_target;
 
       /* Get next entry and its kind */
@@ -1195,9 +1195,9 @@
   apr_int32_t flags = APR_FINFO_TYPE | APR_FINFO_NAME;
 
   /* These exist so we can use their addresses as hash values! */
- static const enum svn_node_kind static_svn_node_file = svn_node_file;
- static const enum svn_node_kind static_svn_node_dir = svn_node_dir;
- static const enum svn_node_kind static_svn_node_unknown = svn_node_unknown;
+ static const svn_node_kind_t static_svn_node_file = svn_node_file;
+ static const svn_node_kind_t static_svn_node_dir = svn_node_dir;
+ static const svn_node_kind_t static_svn_node_unknown = svn_node_unknown;
 
   *dirents = apr_hash_make (pool);
   
@@ -1584,7 +1584,7 @@
 {
   static const char * const generic_binary = "application/octet-stream";
 
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   apr_file_t *fh;
   apr_status_t apr_err;
   unsigned char block[1024];
Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c (revision 3644)
+++ subversion/libsvn_subr/config_file.c (working copy)
@@ -459,7 +459,7 @@
 svn_config_ensure (apr_pool_t *pool)
 {
   const char *path;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   apr_status_t apr_err;
   svn_error_t *err;
 
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 3644)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -229,7 +229,7 @@
                         apr_hash_t *hash,
                         apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   SVN_ERR (svn_io_check_path (propfile_path, &kind, pool));
 
@@ -853,7 +853,7 @@
              const char *path,
              apr_pool_t *pool)
 {
- enum svn_node_kind kind, pkind;
+ svn_node_kind_t kind, pkind;
   const char *prop_path;
   
   *props = apr_hash_make (pool);
@@ -966,7 +966,7 @@
                   const char *path,
                   apr_pool_t *pool)
 {
- enum svn_node_kind pkind;
+ svn_node_kind_t pkind;
   const char *prop_path;
 
   *props = apr_hash_make (pool);
@@ -1221,7 +1221,7 @@
                const char *path_to_prop_file,
                apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   SVN_ERR (svn_io_check_path (path_to_prop_file, &kind, pool));
 
Index: subversion/libsvn_wc/questions.c
===================================================================
--- subversion/libsvn_wc/questions.c (revision 3644)
+++ subversion/libsvn_wc/questions.c (working copy)
@@ -48,7 +48,7 @@
                  apr_pool_t *pool)
 {
   svn_error_t *err = NULL;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   SVN_ERR (svn_io_check_path (path, &kind, pool));
   
@@ -129,7 +129,7 @@
   const char *entryname;
   apr_hash_t *entries = NULL;
   const svn_wc_entry_t *entry;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   SVN_ERR (svn_io_check_path (path, &kind, pool));
   if (kind == svn_node_dir)
@@ -318,7 +318,7 @@
   const char *textbase_filename;
   svn_boolean_t equal_timestamps;
   apr_pool_t *subpool = svn_pool_create (pool);
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   /* Sanity check: if the path doesn't exist, return FALSE. */
   SVN_ERR (svn_io_check_path (filename, &kind, subpool));
@@ -376,7 +376,7 @@
                      apr_pool_t *pool)
 {
   const char *path;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   apr_pool_t *subpool = svn_pool_create (pool); /* ### Why? */
 
   *text_conflicted_p = FALSE;
Index: subversion/libsvn_wc/adm_files.h
===================================================================
--- subversion/libsvn_wc/adm_files.h (revision 3644)
+++ subversion/libsvn_wc/adm_files.h (working copy)
@@ -55,7 +55,7 @@
 /* Make `PATH/<adminstrative_subdir>/THING'. */
 svn_error_t *svn_wc__make_adm_thing (svn_wc_adm_access_t *adm_access,
                                      const char *thing,
- enum svn_node_kind type,
+ svn_node_kind_t type,
                                      apr_fileperms_t perms,
                                      svn_boolean_t tmp,
                                      apr_pool_t *pool);
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 3644)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -971,7 +971,7 @@
   struct file_baton *fb;
   const svn_wc_entry_t *entry;
   int is_wc;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_wc_adm_access_t *adm_access;
 
   /* the file_pool can stick around for a *long* time, so we want to use
@@ -1554,7 +1554,7 @@
   
       else /* working file is locally modified... */
         {
- enum svn_node_kind wfile_kind = svn_node_unknown;
+ svn_node_kind_t wfile_kind = svn_node_unknown;
           
           SVN_ERR (svn_io_check_path (file_path, &wfile_kind, pool));
           if (wfile_kind == svn_node_none) /* working file is missing?! */
Index: subversion/libsvn_wc/lock.c
===================================================================
--- subversion/libsvn_wc/lock.c (revision 3644)
+++ subversion/libsvn_wc/lock.c (working copy)
@@ -280,7 +280,7 @@
     {
       /* Since no physical lock gets created we must check PATH is not a
          file. */
- enum svn_node_kind node_kind;
+ svn_node_kind_t node_kind;
       SVN_ERR (svn_io_check_path (path, &node_kind, pool));
       if (node_kind != svn_node_dir)
         return svn_error_createf (SVN_ERR_WC_INVALID_LOCK, 0, NULL, pool,
@@ -582,7 +582,7 @@
                                  svn_wc_adm_access_t *adm_access,
                                  apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const char *log_path = svn_wc__adm_path (svn_wc_adm_access_path (adm_access),
                                            FALSE, pool, SVN_WC__ADM_LOG, NULL);
 
Index: subversion/libsvn_wc/adm_files.c
===================================================================
--- subversion/libsvn_wc/adm_files.c (revision 3644)
+++ subversion/libsvn_wc/adm_files.c (working copy)
@@ -139,7 +139,7 @@
                          apr_pool_t *pool,
                          ...)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   va_list ap;
 
   va_start (ap, pool);
@@ -167,7 +167,7 @@
 svn_error_t *
 svn_wc__make_adm_thing (svn_wc_adm_access_t *adm_access,
                         const char *thing,
- enum svn_node_kind type,
+ svn_node_kind_t type,
                         apr_fileperms_t perms,
                         svn_boolean_t tmp,
                         apr_pool_t *pool)
@@ -219,7 +219,7 @@
 static svn_error_t *
 maybe_copy_file (const char *src, const char *dst, apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_error_t *err;
   apr_status_t apr_err;
 
@@ -330,7 +330,7 @@
                     apr_pool_t *pool)
 {
   svn_error_t *err;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   int wc_format_version;
   const char *entry_name;
 
@@ -410,7 +410,7 @@
                      apr_pool_t *pool)
 {
   svn_error_t *err;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   int is_wc;
   const char *entry_name;
 
@@ -742,7 +742,7 @@
                     apr_pool_t *pool)
 {
   const char *parent_dir, *base_name;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   int wc_format_version;
   svn_error_t *err;
 
@@ -830,7 +830,7 @@
                      apr_pool_t *pool)
 {
   const char *parent_dir, *base_name;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   int wc_format_version;
   svn_error_t *err;
 
@@ -903,7 +903,7 @@
                     apr_pool_t *pool)
 {
   const char *parent_dir, *base_name;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   /* Check if path is a file or a dir. */
   SVN_ERR (svn_io_check_path (path, &kind, pool));
@@ -974,7 +974,7 @@
                   apr_pool_t *pool)
 {
   svn_error_t *err = NULL;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_boolean_t dir_exists = FALSE, wc_exists = FALSE;
   const char *tmp_path;
 
Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c (revision 3644)
+++ subversion/libsvn_wc/status.c (working copy)
@@ -444,7 +444,7 @@
                  svn_boolean_t no_ignore,
                  apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const svn_wc_entry_t *entry;
 
   /* Is PATH a directory or file? */
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c (revision 3644)
+++ subversion/libsvn_wc/adm_ops.c (working copy)
@@ -500,7 +500,7 @@
 erase_unversioned_from_wc (const char *path,
                            apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   SVN_ERR (svn_io_check_path (path, &kind, pool));
   switch (kind)
@@ -544,7 +544,7 @@
                apr_pool_t *pool)
 {
   /* Check that the item exists in the wc. */
- enum svn_node_kind wc_kind;
+ svn_node_kind_t wc_kind;
   SVN_ERR (svn_io_check_path (path, &wc_kind, pool));
   if (wc_kind == svn_node_none)
     return SVN_NO_ERROR;
@@ -744,7 +744,7 @@
   const svn_wc_entry_t *orig_entry, *parent_entry;
   svn_wc_entry_t tmp_entry;
   svn_boolean_t is_replace = FALSE;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   apr_uint32_t modify_flags = 0;
   const char *mimetype = NULL;
   svn_boolean_t executable = FALSE;
@@ -1045,7 +1045,7 @@
                      apr_pool_t *pool)
 {
   const char *fullpath, *thing, *base_thing;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_boolean_t modified_p;
   svn_error_t *err;
   apr_time_t tstamp;
@@ -1213,7 +1213,7 @@
                void *notify_baton,
                apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   const char *p_dir = NULL, *bname = NULL;
   const svn_wc_entry_t *entry;
   svn_wc_entry_t *tmp_entry;
Index: subversion/libsvn_wc/log.c
===================================================================
--- subversion/libsvn_wc/log.c (revision 3644)
+++ subversion/libsvn_wc/log.c (working copy)
@@ -188,7 +188,7 @@
 {
   const char *filepath;
   const char *tmp_text_base;
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_wc_keywords_t *keywords;
   apr_status_t apr_err;
   apr_file_t *ignored;
@@ -521,7 +521,7 @@
   if ((modify_flags & SVN_WC__ENTRY_MODIFY_TEXT_TIME)
       && (! strcmp (valuestr, SVN_WC_TIMESTAMP_WC)))
     {
- enum svn_node_kind tfile_kind;
+ svn_node_kind_t tfile_kind;
       apr_time_t text_time;
 
       err = svn_io_check_path (tfile, &tfile_kind, loggy->pool);
@@ -547,7 +547,7 @@
       && (! strcmp (valuestr, SVN_WC_TIMESTAMP_WC)))
     {
       const char *pfile;
- enum svn_node_kind pfile_kind;
+ svn_node_kind_t pfile_kind;
       apr_time_t prop_time;
 
       err = svn_wc__prop_path (&pfile, tfile, 0, loggy->pool);
@@ -1325,7 +1325,7 @@
   apr_hash_index_t *hi;
   const char *log_path = svn_wc__adm_path (path, 0, pool,
                                            SVN_WC__ADM_LOG, NULL);
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_wc_adm_access_t *adm_access;
   svn_boolean_t cleanup;
   int is_wc;
Index: subversion/libsvn_wc/adm_crawler.c
===================================================================
--- subversion/libsvn_wc/adm_crawler.c (revision 3644)
+++ subversion/libsvn_wc/adm_crawler.c (working copy)
@@ -183,7 +183,7 @@
       apr_ssize_t klen;
       void *val;
       const svn_wc_entry_t *current_entry;
- enum svn_node_kind *dirent_kind;
+ svn_node_kind_t *dirent_kind;
       svn_boolean_t missing = FALSE;
 
       /* Get the next entry */
@@ -238,7 +238,7 @@
         }
       
       /* Is the entry on disk? Set a flag if not. */
- dirent_kind = (enum svn_node_kind *) apr_hash_get (dirents, key, klen);
+ dirent_kind = (svn_node_kind_t *) apr_hash_get (dirents, key, klen);
       if (! dirent_kind)
         missing = TRUE;
       
Index: subversion/libsvn_wc/util.c
===================================================================
--- subversion/libsvn_wc/util.c (revision 3644)
+++ subversion/libsvn_wc/util.c (working copy)
@@ -36,7 +36,7 @@
 svn_error_t *
 svn_wc__ensure_directory (const char *path, apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   svn_error_t *err = svn_io_check_path (path, &kind, pool);
 
   if (err)
Index: subversion/libsvn_wc/copy.c
===================================================================
--- subversion/libsvn_wc/copy.c (revision 3644)
+++ subversion/libsvn_wc/copy.c (working copy)
@@ -128,7 +128,7 @@
                             void *notify_baton,
                             apr_pool_t *pool)
 {
- enum svn_node_kind dst_kind;
+ svn_node_kind_t dst_kind;
   const svn_wc_entry_t *src_entry, *dst_entry;
 
   /* The 'dst_path' is simply dst_parent/dst_basename */
@@ -201,7 +201,7 @@
      As long as we're copying the text-base over, we should copy the
      working and pristine propfiles over too. */
   {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
     const char *src_wprop, *src_bprop, *dst_wprop, *dst_bprop;
 
     /* Discover the paths to the two text-base files */
@@ -339,7 +339,7 @@
              apr_pool_t *pool)
 {
   svn_wc_adm_access_t *adm_access;
- enum svn_node_kind src_kind;
+ svn_node_kind_t src_kind;
 
   SVN_ERR (svn_wc_adm_probe_open (&adm_access, NULL, src_path, FALSE, TRUE,
                                   pool));
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 3644)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -610,7 +610,7 @@
               svn_boolean_t show_deleted,
               apr_pool_t *pool)
 {
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
   apr_hash_t *entries;
   int is_wc;
 
Index: subversion/include/svn_io.h
===================================================================
--- subversion/include/svn_io.h (revision 3644)
+++ subversion/include/svn_io.h (working copy)
@@ -60,7 +60,7 @@
  * error is returned, and *KIND's value is undefined.
  */
 svn_error_t *svn_io_check_path (const char *path,
- enum svn_node_kind *kind,
+ svn_node_kind_t *kind,
                                 apr_pool_t *pool);
 
 
@@ -407,7 +407,7 @@
 
 /* Read all of the disk entries in directory PATH, a utf8-encoded
    path. Return a DIRENTS hash mapping dirent names (char *) to
- enumerated dirent filetypes (enum svn_node_kind *).
+ enumerated dirent filetypes (svn_node_kind_t *).
 
    Note: the `.' and `..' directories normally returned by
    apr_dir_read are NOT returned in the hash. */
Index: subversion/include/svn_types.h
===================================================================
--- subversion/include/svn_types.h (revision 3644)
+++ subversion/include/svn_types.h (working copy)
@@ -111,7 +111,7 @@
 /* A general subversion directory entry. */
 typedef struct svn_dirent
 {
- enum svn_node_kind kind; /* node kind */
+ svn_node_kind_t kind; /* node kind */
   apr_off_t size; /* length of file text, or 0 for directories */
   svn_boolean_t has_props; /* does the node have props? */
 
Index: subversion/include/svn_repos.h
===================================================================
--- subversion/include/svn_repos.h (revision 3644)
+++ subversion/include/svn_repos.h (working copy)
@@ -512,7 +512,7 @@
 typedef struct svn_repos_node_t
 {
   /* Node type (file, dir, etc.) */
- enum svn_node_kind kind;
+ svn_node_kind_t kind;
 
   /* How this node entered the node tree: 'A'dd, 'D'elete, 'R'eplace */
   char action;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 4 21:28:57 2002

This is an archived mail posted to the Subversion Dev mailing list.