subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1516466 - in /subversion/trunk/subversion/libsvn_ra_serf: ra_serf.h serf.c
Date Thu, 22 Aug 2013 14:40:59 GMT
Author: ivan
Date: Thu Aug 22 14:40:59 2013
New Revision: 1516466

URL: http://svn.apache.org/r1516466
Log:
Revert r1516453: serf reports cumulative progress information when used 
properly.

* subversion/libsvn_ra_serf/ra_serf.h
* subversion/libsvn_ra_serf/serf.c
  (svn_ra_serf__session_t, svn_ra_serf__progress): Revert r1516453.


Modified:
    subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
    subversion/trunk/subversion/libsvn_ra_serf/serf.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1516466&r1=1516465&r2=1516466&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Thu Aug 22 14:40:59 2013
@@ -159,9 +159,6 @@ struct svn_ra_serf__session_t {
   svn_ra_progress_notify_func_t progress_func;
   void *progress_baton;
 
-  /* Total number of transferred so far. */
-  apr_off_t progress;
-
   /* Callback function to handle cancellation */
   svn_cancel_func_t cancel_func;
   void *cancel_baton;

Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1516466&r1=1516465&r2=1516466&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Thu Aug 22 14:40:59 2013
@@ -407,12 +407,10 @@ load_config(svn_ra_serf__session_t *sess
 static void
 svn_ra_serf__progress(void *progress_baton, apr_off_t read, apr_off_t written)
 {
-  svn_ra_serf__session_t *serf_sess = progress_baton;
-  serf_sess->progress += read + written;
-
+  const svn_ra_serf__session_t *serf_sess = progress_baton;
   if (serf_sess->progress_func)
     {
-      serf_sess->progress_func(serf_sess->progress, -1,
+      serf_sess->progress_func(read + written, -1,
                                serf_sess->progress_baton,
                                serf_sess->pool);
     }



Mime
View raw message