[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATH] Fix ra_neon_neonprogress data types

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-08-17 01:28:07 CEST

Hey Dan, I see Neon 0.24.7, 0.26.1, and 0.26.3 all use off_t in the
progress API in ne_session.h, and ne_off_t defined only in
ne_request.c:

  /* Progress callback. */
  typedef void (*ne_progress)(void *userdata, off_t progress, off_t total);

What header file should Subversion be importing to get access to
ne_off_t's definition?

On Thu, 16 Aug 2007, Dan Christian wrote:

> [[[
> Fix the arguments to ra_neon_neonprogress to match neon definitions.
>
> * subversion/libsvn_ra_neon/session.c
> (ra_neon_neonprogress) Change off_t to ne_off_t and assert that
> the arguments to the progress callback don't lose precision.
> ]]]
>
> -Dan C

> Index: subversion/libsvn_ra_neon/session.c
> ===================================================================
> --- subversion/libsvn_ra_neon/session.c (revision 26123)
> +++ subversion/libsvn_ra_neon/session.c (working copy)
> @@ -600,12 +600,13 @@
> } neonprogress_baton_t;
>
> static void
> -ra_neon_neonprogress(void *baton, off_t progress, off_t total)
> +ra_neon_neonprogress(void *baton, ne_off_t progress, ne_off_t total)
> {
> const neonprogress_baton_t *neonprogress_baton = baton;
> if (neonprogress_baton->progress_func)
> {
> - neonprogress_baton->progress_func(progress, total,
> + assert(sizeof(apr_off_t) >= sizeof(ne_off_t));
> + neonprogress_baton->progress_func((apr_off_t)progress, (apr_off_t)total,
> neonprogress_baton->progress_baton,
> neonprogress_baton->pool);
> }

  • application/pgp-signature attachment: stored
Received on Fri Aug 17 01:25:52 2007

This is an archived mail posted to the Subversion Dev mailing list.