[Pkg-owncloud-commits] [owncloud-client] 52/211: SelectiveSync: rename blacklist to selectiveSyncBlackList in some places

[Sandro Knauß]

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 7e898cf60c6a639282c6cfd395371c775a09d3e8
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Sat Oct 11 16:23:32 2014 +0200

    SelectiveSync:  rename blacklist to selectiveSyncBlackList in some places
    
    Issue #2301
---
 csync/src/csync_private.h     |  4 ++--
 csync/src/csync_update.c      |  4 ++--
 src/mirall/discoveryphase.cpp | 14 +++++++-------
 src/mirall/discoveryphase.h   |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/csync/src/csync_private.h b/csync/src/csync_private.h
index be0859a..07af5fb 100644
--- a/csync/src/csync_private.h
+++ b/csync/src/csync_private.h
@@ -146,8 +146,8 @@ struct csync_s {
   struct csync_owncloud_ctx_s *owncloud_context;
 
   /* hooks for checking the white list */
-  void *checkBlackListData;
-  int (*checkBlackListHook)(void*, const char*);
+  void *checkSelectiveSyncBlackListData;
+  int (*checkSelectiveSyncBlackListHook)(void*, const char*);
 };
 
 
diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c
index 389914b..37067c2 100644
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -157,8 +157,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
     }
   }
 
-  if (ctx->current == REMOTE_REPLICA && ctx->checkBlackListHook) {
-      if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) {
+  if (ctx->current == REMOTE_REPLICA && ctx->checkSelectiveSyncBlackListHook) {
+      if (ctx->checkSelectiveSyncBlackListHook(ctx->checkSelectiveSyncBlackListData, path)) {
           return 1;
       }
   }
diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp
index 9a4a462..bc89091 100644
--- a/src/mirall/discoveryphase.cpp
+++ b/src/mirall/discoveryphase.cpp
@@ -18,7 +18,7 @@
 
 namespace Mirall {
 
-bool DiscoveryJob::isInBlackList(const QString& path) const
+bool DiscoveryJob::isInSelectiveSyncBlackList(const QString& path) const
 {
     if (_selectiveSyncBlackList.isEmpty()) {
         // If there is no black list, everything is allowed
@@ -50,9 +50,9 @@ bool DiscoveryJob::isInBlackList(const QString& path) const
     return false;
 }
 
-int DiscoveryJob::isInBlackListCallBack(void *data, const char *path)
+int DiscoveryJob::isInSelectiveSyncBlackListCallBack(void *data, const char *path)
 {
-    return static_cast<DiscoveryJob*>(data)->isInBlackList(QString::fromUtf8(path));
+    return static_cast<DiscoveryJob*>(data)->isInSelectiveSyncBlackList(QString::fromUtf8(path));
 }
 
 void DiscoveryJob::update_job_update_callback (bool local,
@@ -77,8 +77,8 @@ void DiscoveryJob::update_job_update_callback (bool local,
 
 void DiscoveryJob::start() {
     _selectiveSyncBlackList.sort();
-    _csync_ctx->checkBlackListHook = isInBlackListCallBack;
-    _csync_ctx->checkBlackListData = this;
+    _csync_ctx->checkSelectiveSyncBlackListHook = isInSelectiveSyncBlackListCallBack;
+    _csync_ctx->checkSelectiveSyncBlackListData = this;
 
     _csync_ctx->callbacks.update_callback = update_job_update_callback;
     _csync_ctx->callbacks.update_callback_userdata = this;
@@ -90,8 +90,8 @@ void DiscoveryJob::start() {
     lastUpdateProgressCallbackCall.invalidate();
     int ret = csync_update(_csync_ctx);
 
-    _csync_ctx->checkBlackListHook = 0;
-    _csync_ctx->checkBlackListData = 0;
+    _csync_ctx->checkSelectiveSyncBlackListHook = 0;
+    _csync_ctx->checkSelectiveSyncBlackListData = 0;
 
     _csync_ctx->callbacks.update_callback = 0;
     _csync_ctx->callbacks.update_callback_userdata = 0;
diff --git a/src/mirall/discoveryphase.h b/src/mirall/discoveryphase.h
index 5625d7f..c0ec036 100644
--- a/src/mirall/discoveryphase.h
+++ b/src/mirall/discoveryphase.h
@@ -40,8 +40,8 @@ class DiscoveryJob : public QObject {
      * return true if the given path should be synced,
      * false if the path should be ignored
      */
-    bool isInBlackList(const QString &path) const;
-    static int isInBlackListCallBack(void *, const char *);
+    bool isInSelectiveSyncBlackList(const QString &path) const;
+    static int isInSelectiveSyncBlackListCallBack(void *, const char *);
 
     static void update_job_update_callback (bool local,
                                             const char *dirname,

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