svn commit: r1096299 - /subversion/trunk/subversion/libsvn_client/status.c

[rhuijben]

Author: rhuijben
Date: Sun Apr 24 09:57:43 2011
New Revision: 1096299

URL: http://svn.apache.org/viewvc?rev=1096299&view=rev
Log:
* subversion/libsvn_client/status.c
  (reporter_link_path): Avoid unnecessary allocations in the common case that
    the ancestor is ok.

Modified:
    subversion/trunk/subversion/libsvn_client/status.c

Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1096299&r1=1096298&r2=1096299&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Sun Apr 24 09:57:43 2011
@@ -164,18 +164,18 @@ reporter_link_path(void *report_baton, c
                    const char *lock_token, apr_pool_t *pool)
 {
   report_baton_t *rb = report_baton;
-  const char *ancestor;
-  apr_size_t len;
 
-  ancestor = svn_uri_get_longest_ancestor(url, rb->ancestor, pool);
-
-  /* If we got a shorter ancestor, truncate our current ancestor.
-     Note that svn_dirent_get_longest_ancestor will allocate its return
-     value even if it identical to one of its arguments. */
-  len = strlen(ancestor);
-  if (len < strlen(rb->ancestor))
+  if (!svn_uri_is_ancestor(rb->ancestor, url))
     {
-      rb->ancestor[len] = '\0';
+      const char *ancestor;
+
+      ancestor = svn_uri_get_longest_ancestor(url, rb->ancestor, pool);
+
+      /* If we got a shorter ancestor, truncate our current ancestor.
+         Note that svn_dirent_get_longest_ancestor will allocate its return
+         value even if it identical to one of its arguments. */
+
+      rb->ancestor[strlen(ancestor)] = '\0';
       rb->depth = svn_depth_infinity;
     }