[Pkg-owncloud-commits] [owncloud-client] 260/333: Remove HBF stuff from csync_owncloud

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu Apr 17 23:17:01 UTC 2014


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5204a992b247fab75c8d7a4d577482f4c7a3610e
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Mar 28 10:41:48 2014 +0100

    Remove HBF stuff from csync_owncloud
    
    csync doesn't do no propagation no more
---
 csync/src/csync_misc.h     |  6 ------
 csync/src/csync_owncloud.c | 20 --------------------
 csync/src/csync_owncloud.h |  8 --------
 3 files changed, 34 deletions(-)

diff --git a/csync/src/csync_misc.h b/csync/src/csync_misc.h
index 37783e0..61389b4 100644
--- a/csync/src/csync_misc.h
+++ b/csync/src/csync_misc.h
@@ -49,12 +49,6 @@ int csync_fnmatch(__const char *__pattern, __const char *__name, int __flags);
  */
 CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status);
 
-struct csync_hbf_info_s {
-    int start_id;
-    int transfer_id;
-};
-typedef struct csync_hbf_info_s csync_hbf_info_t;
-
 typedef struct {
     int64_t file_count;
     int64_t current_file_no;
diff --git a/csync/src/csync_owncloud.c b/csync/src/csync_owncloud.c
index 66d18a1..2726353 100644
--- a/csync/src/csync_owncloud.c
+++ b/csync/src/csync_owncloud.c
@@ -1027,10 +1027,6 @@ int owncloud_set_property(const char *key, void *data) {
         dav_session.csync_ctx = data;
         return 0;
     }
-    if( c_streq(key, "hbf_info")) {
-        dav_session.chunk_info = (csync_hbf_info_t *)(data);
-        return 0;
-    }
     if( c_streq(key, "get_dav_session")) {
         /* Give the ne_session to the caller */
         *(ne_session**)data = dav_session.ctx;
@@ -1040,22 +1036,6 @@ int owncloud_set_property(const char *key, void *data) {
         dav_session.no_recursive_propfind = *(bool*)(data);
         return 0;
     }
-    if( c_streq(key, "hbf_block_size")) {
-        dav_session.hbf_block_size = *(int64_t*)(data);
-        return 0;
-    }
-    if( c_streq(key, "hbf_threshold")) {
-        dav_session.hbf_threshold = *(int64_t*)(data);
-        return 0;
-    }
-    if( c_streq(key, "bandwidth_limit_upload")) {
-        dav_session.bandwidth_limit_upload = *(int*)(data);
-        return 0;
-    }
-    if( c_streq(key, "bandwidth_limit_download")) {
-        dav_session.bandwidth_limit_download = *(int*)(data);
-        return 0;
-    }
     if( c_streq(key, "overall_progress_data")) {
       dav_session.overall_progress_data = (csync_overall_progress_t*)(data);
     }
diff --git a/csync/src/csync_owncloud.h b/csync/src/csync_owncloud.h
index d051ff7..fe41b24 100644
--- a/csync/src/csync_owncloud.h
+++ b/csync/src/csync_owncloud.h
@@ -137,15 +137,7 @@ struct dav_session_s {
 
     CSYNC *csync_ctx;
 
-    csync_hbf_info_t *chunk_info;
-
     bool no_recursive_propfind;
-    int64_t hbf_block_size;
-    int64_t hbf_threshold;
-
-    /* If 0, it is disabled.   If >0,  in Byte/seconds. If < 0,  in % of the available bandwidth*/
-    int bandwidth_limit_upload;
-    int bandwidth_limit_download;
 
     csync_overall_progress_t *overall_progress_data;
     csync_owncloud_redirect_callback_t redir_callback;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list