Re: svn commit: r995478 [1/2] - in /subversion/branches/performance: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/tigris/subversion/javahl/ subversion/bindings/j

On Thu, Sep 9, 2010 at 5:59 PM, <hwright_at_apache.org> wrote:
> Author: hwright
> Date: Thu Sep  9 15:59:00 2010
> New Revision: 995478
>
> URL: http://svn.apache.org/viewvc?rev=995478&view=rev
> Log:
> On the performance branch:
> Bring up-to-date with trunk.

The performance branch doesn't compile anymore on my machine:
[[[
..\..\..\subversion\libsvn_ra_neon\util.c(781): error C4047: 'return'
: 'int' differs in levels of indirection from 'svn_error_t *'
]]]

Blame suggests that it might have to do something with this commit (r995478):
[[[
777 866391 hwright if (errcode_str && *err)
778 995478 hwright {
779 995478 hwright apr_int64_t val;
780 841468 sussman
781 995478 hwright SVN_ERR(svn_cstring_atoi64(&val,
errcode_str));
782 995478 hwright (*err)->apr_err = (apr_status_t)val;
783 995478 hwright }
]]]

See the particular change below. I haven't looked at this in detail,
but maybe someone can take a look at this?

> Modified: subversion/branches/performance/subversion/libsvn_ra_neon/util.c
> URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_ra_neon/util.c?rev=995478&r1=995477&r2=995478&view=diff
> ==============================================================================
> --- subversion/branches/performance/subversion/libsvn_ra_neon/util.c (original)
> +++ subversion/branches/performance/subversion/libsvn_ra_neon/util.c Thu Sep  9 15:59:00 2010
> @@ -775,7 +775,12 @@ start_err_element(void *baton, int paren
>                                  atts);
>
>         if (errcode_str && *err)
> -          (*err)->apr_err = atoi(errcode_str);
> +          {
> +            apr_int64_t val;
> +
> +            SVN_ERR(svn_cstring_atoi64(&val, errcode_str));
> +            (*err)->apr_err = (apr_status_t)val;
> +          }
>
>         break;
>       }
>

Cheers,

-- 
Johan