[Pkg-owncloud-commits] [owncloud-client] 33/219: csync: remove ignored_cleanup: it's not used anymore

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:06 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 d4bbd28757fc9338cc71e9134b56f655dd909052
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Aug 28 17:16:51 2014 +0200

    csync: remove ignored_cleanup: it's not used anymore
---
 csync/src/csync.c         | 13 -------------
 csync/src/csync_private.h |  2 --
 2 files changed, 15 deletions(-)

diff --git a/csync/src/csync.c b/csync/src/csync.c
index 3d76791..834bcc1 100644
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@ -522,8 +522,6 @@ static void _tree_destructor(void *data) {
  * used by csync_commit and csync_destroy */
 static void _csync_clean_ctx(CSYNC *ctx)
 {
-    c_list_t * walk;
-
     /* destroy the rbtrees */
     if (c_rbtree_size(ctx->local.tree) > 0) {
         c_rbtree_destroy(ctx->local.tree, _tree_destructor);
@@ -535,25 +533,14 @@ static void _csync_clean_ctx(CSYNC *ctx)
 
     csync_rename_destroy(ctx);
 
-    for (walk = c_list_last(ctx->local.ignored_cleanup); walk != NULL; walk = c_list_prev(walk)) {
-        SAFE_FREE(walk->data);
-    }
-    for (walk = c_list_last(ctx->remote.ignored_cleanup); walk != NULL; walk = c_list_prev(walk)) {
-        SAFE_FREE(walk->data);
-    }
-
     /* free memory */
     c_rbtree_free(ctx->local.tree);
     c_list_free(ctx->local.list);
-    c_list_free(ctx->local.ignored_cleanup);
     c_rbtree_free(ctx->remote.tree);
     c_list_free(ctx->remote.list);
-    c_list_free(ctx->remote.ignored_cleanup);
 
     ctx->remote.list = 0;
     ctx->local.list = 0;
-    ctx->remote.ignored_cleanup = 0;
-    ctx->local.ignored_cleanup = 0;
 
     SAFE_FREE(ctx->statedb.file);
 }
diff --git a/csync/src/csync_private.h b/csync/src/csync_private.h
index 0c6785b..be0859a 100644
--- a/csync/src/csync_private.h
+++ b/csync/src/csync_private.h
@@ -107,7 +107,6 @@ struct csync_s {
     c_rbtree_t *tree;
     c_list_t *list;
     enum csync_replica_e type;
-    c_list_t *ignored_cleanup;
   } local;
 
   struct {
@@ -116,7 +115,6 @@ struct csync_s {
     c_list_t *list;
     enum csync_replica_e type;
     int  read_from_db;
-    c_list_t *ignored_cleanup;
   } remote;
 
 #if defined(HAVE_ICONV) && defined(WITH_ICONV)

-- 
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