You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/05/14 23:22:54 UTC
svn commit: r944478 - /subversion/trunk/subversion/libsvn_wc/status.c
Author: dannas
Date: Fri May 14 21:22:52 2010
New Revision: 944478
URL: http://svn.apache.org/viewvc?rev=944478&view=rev
Log:
Remove some entry usages.
I'm working on switching the whole file to use repos_relpaths instead of urls.
* subversion/libsvn_wc/status.c
(find_dir_url): Use the 'url' field of svn_wc_status3_t instead of the
entry->url.
Modified:
subversion/trunk/subversion/libsvn_wc/status.c
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=944478&r1=944477&r2=944478&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Fri May 14 21:22:52 2010
@@ -1455,7 +1455,7 @@ find_dir_url(const struct dir_baton *db,
{
/* If we have no name, we're the root, return the anchor URL. */
if (! db->name)
- return db->edit_baton->anchor_status->entry->url;
+ return db->edit_baton->anchor_status->url;
else
{
const char *url;
@@ -1463,11 +1463,11 @@ find_dir_url(const struct dir_baton *db,
const svn_wc_status3_t *status = apr_hash_get(pb->statii,
db->local_abspath,
APR_HASH_KEY_STRING);
- /* Note that status->entry->url is NULL in the case of a missing
+ /* Note that status->url is NULL in the case of a missing
* directory, which means we need to recurse up another level to
* get a useful URL. */
- if (status && status->entry && status->entry->url)
- return status->entry->url;
+ if (status)
+ return status->url;
url = find_dir_url(pb, pool);
if (url)
Re: svn commit: r944478 - /subversion/trunk/subversion/libsvn_wc/status.c
Posted by Greg Stein <gs...@gmail.com>.
On Fri, May 14, 2010 at 17:22, <da...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/status.c Fri May 14 21:22:52 2010
>...
> @@ -1463,11 +1463,11 @@ find_dir_url(const struct dir_baton *db,
> const svn_wc_status3_t *status = apr_hash_get(pb->statii,
> db->local_abspath,
> APR_HASH_KEY_STRING);
> - /* Note that status->entry->url is NULL in the case of a missing
> + /* Note that status->url is NULL in the case of a missing
> * directory, which means we need to recurse up another level to
> * get a useful URL. */
> - if (status && status->entry && status->entry->url)
> - return status->entry->url;
> + if (status)
> + return status->url;
I don't think the comment is correct. status->url is always set, right?
Cheers,
-g