On Mon, Apr 12, 2010 at 08:58:49AM -0400, Greg Stein wrote:
> On Fri, Apr 9, 2010 at 16:16, Greg Stein <gst...@gmail.com> wrote:
> > On Fri, Apr 9, 2010 at 16:07, <dan...@apache.org> wrote:
> >>...
> >>...
> >> +++ subversion/trunk/subversion/libsvn_wc/deprecated.c Fri Apr 9 20:07:51
> >> 2010
> >>...
> >> @@ -2515,13 +2551,15 @@ svn_wc_status2(svn_wc_status2_t **status
> >> {
> >> const char *local_abspath;
> >> svn_wc_context_t *wc_ctx;
> >> + svn_wc_status3_t *stat3;
> >>
> >> SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
> >> SVN_ERR(svn_wc__context_create_with_db(&wc_ctx, NULL /* config */,
> >> svn_wc__adm_get_db(adm_access),
> >> pool));
> >>
> >> - SVN_ERR(svn_wc_status3(status, wc_ctx, local_abspath, pool, pool));
> >> + SVN_ERR(svn_wc_status3(&stat3, wc_ctx, local_abspath, pool, pool));
> >> + *status = (svn_wc_status2_t *) stat3;
> >
> > Another funky cast. Make sure this gets handled with your new
> > converter function.
>
> Told ya that you'd miss this if you didn't leave yourself a reminder marker...
I have no excuses. I didn't look enough. Now, I have grepped
libsvn_{wc,client} for other uses of svn_wc_status2 and every else looks
in order.
[[[
Follow-up to r923571. Update one caller I missed in the previous
commit.
* subversion/libsvn_wc/deprecated.c
(svn_wc_status2): Use svn_wc__status2_from_3().
Suggested by: gstein
]]]
Index: subversion/libsvn_wc/deprecated.c
===================================================================
--- subversion/libsvn_wc/deprecated.c (revision 933374)
+++ subversion/libsvn_wc/deprecated.c (working copy)
@@ -2556,7 +2556,7 @@ svn_wc_status2(svn_wc_status2_t **status,
pool));
SVN_ERR(svn_wc_status3(&stat3, wc_ctx, local_abspath, pool, pool));
- *status = (svn_wc_status2_t *) stat3;
+ *status = svn_wc__status2_from_3(stat3, pool);
return svn_error_return(svn_wc_context_destroy(wc_ctx));
}
