subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject svn commit: r1332917 - in /subversion/trunk/subversion/libsvn_ra_serf: property.c ra_serf.h serf.c update.c
Date Wed, 02 May 2012 04:28:26 GMT
Author: gstein
Date: Wed May  2 04:28:26 2012
New Revision: 1332917

URL: http://svn.apache.org/viewvc?rev=1332917&view=rev
Log:
Switch to newer svn_kind_t

* subversion/libsvn_ra_serf/ra_serf.h:
* subversion/libsvn_ra_serf/property.c:
  (svn_ra_serf__get_resource_type): switch KIND to svn_kind_t

* subversion/libsvn_ra_serf/serf.c:
  (svn_ra_serf__check_path): switch kind on get_resource_type() call
    and map to the output svn_node_kind_t.
  (resource_is_directory): switch to svn_kind_t

* subversion/libsvn_ra_serf/update.c:
  (svn_ra_serf__get_file): switch RES_KIND to svn_kind_t

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/property.c
    subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
    subversion/trunk/subversion/libsvn_ra_serf/serf.c
    subversion/trunk/subversion/libsvn_ra_serf/update.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1332917&r1=1332916&r2=1332917&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Wed May  2 04:28:26 2012
@@ -1089,7 +1089,7 @@ svn_ra_serf__get_baseline_info(const cha
 
 
 svn_error_t *
-svn_ra_serf__get_resource_type(svn_node_kind_t *kind,
+svn_ra_serf__get_resource_type(svn_kind_t *kind,
                                apr_hash_t *props,
                                const char *url,
                                svn_revnum_t revision)
@@ -1108,11 +1108,11 @@ svn_ra_serf__get_resource_type(svn_node_
 
   if (strcmp(res_type, "collection") == 0)
     {
-      *kind = svn_node_dir;
+      *kind = svn_kind_dir;
     }
   else
     {
-      *kind = svn_node_file;
+      *kind = svn_kind_file;
     }
 
   return SVN_NO_ERROR;

Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1332917&r1=1332916&r2=1332917&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Wed May  2 04:28:26 2012
@@ -1035,7 +1035,7 @@ svn_ra_serf__set_prop(apr_hash_t *props,
                       const svn_string_t *val, apr_pool_t *pool);
 
 svn_error_t *
-svn_ra_serf__get_resource_type(svn_node_kind_t *kind,
+svn_ra_serf__get_resource_type(svn_kind_t *kind,
                                apr_hash_t *props,
                                const char *url,
                                svn_revnum_t revision);

Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1332917&r1=1332916&r2=1332917&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Wed May  2 04:28:26 2012
@@ -648,11 +648,15 @@ svn_ra_serf__check_path(svn_ra_session_t
     }
   else
     {
+      svn_kind_t res_kind;
+
       /* Any other error, raise to caller. */
       if (err)
         return err;
 
-      SVN_ERR(svn_ra_serf__get_resource_type(kind, props, path, fetched_rev));
+      SVN_ERR(svn_ra_serf__get_resource_type(&res_kind, props, path,
+                                             fetched_rev));
+      *kind = svn__node_kind_from_kind(res_kind);
     }
 
   return SVN_NO_ERROR;
@@ -936,11 +940,11 @@ resource_is_directory(apr_hash_t *props,
                       const char *path,
                       svn_revnum_t revision)
 {
-  svn_node_kind_t kind;
+  svn_kind_t kind;
 
   SVN_ERR(svn_ra_serf__get_resource_type(&kind, props, path, revision));
 
-  if (kind != svn_node_dir)
+  if (kind != svn_kind_dir)
     {
       return svn_error_create(SVN_ERR_FS_NOT_DIRECTORY, NULL,
                               _("Can't get entries of non-directory"));

Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1332917&r1=1332916&r2=1332917&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Wed May  2 04:28:26 2012
@@ -2788,7 +2788,7 @@ svn_ra_serf__get_file(svn_ra_session_t *
   svn_ra_serf__connection_t *conn;
   const char *fetch_url;
   apr_hash_t *fetch_props;
-  svn_node_kind_t res_kind;
+  svn_kind_t res_kind;
 
   /* What connection should we go on? */
   conn = session->conns[session->cur_conn];
@@ -2821,7 +2821,7 @@ svn_ra_serf__get_file(svn_ra_session_t *
   /* Verify that resource type is not colelction. */
   SVN_ERR(svn_ra_serf__get_resource_type(&res_kind, fetch_props, fetch_url,
                                          revision));
-  if (res_kind != svn_node_file)
+  if (res_kind != svn_kind_file)
     {
       return svn_error_create(SVN_ERR_FS_NOT_FILE, NULL,
                               _("Can't get text contents of a directory"));



Mime
View raw message