[Pkg-owncloud-commits] [owncloud-client] 104/470: Add comment and cleanup the csync exclude list code

[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 7561f5c717442698e99a692877b86c62d9469b8f
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Thu Mar 3 19:39:18 2016 +0100

    Add comment and cleanup the csync exclude list code
    
    Removed the csync_add_exclude_list function that isn't use anywhere
    anymore.
---
 csync/src/csync.c           |  8 --------
 csync/src/csync.h           | 11 -----------
 src/cmd/cmd.cpp             |  1 -
 src/libsync/excludedfiles.h |  2 ++
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/csync/src/csync.c b/csync/src/csync.c
index dd38ffc..cd3aa36 100644
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@ -594,14 +594,6 @@ int csync_destroy(CSYNC *ctx) {
   return rc;
 }
 
-int csync_add_exclude_list(CSYNC *ctx, const char *path) {
-  if (ctx == NULL || path == NULL) {
-    return -1;
-  }
-
-  return csync_exclude_load(path, &ctx->excludes);
-}
-
 void *csync_get_userdata(CSYNC *ctx) {
   if (ctx == NULL) {
     return NULL;
diff --git a/csync/src/csync.h b/csync/src/csync.h
index c2448c0..0a48693 100644
--- a/csync/src/csync.h
+++ b/csync/src/csync.h
@@ -367,17 +367,6 @@ int csync_commit(CSYNC *ctx);
 int csync_destroy(CSYNC *ctx);
 
 /**
- * @brief Add an additional exclude list.
- *
- * @param ctx           The context to add the exclude list.
- *
- * @param path          The path pointing to the file.
- *
- * @return              0 on success, less than 0 if an error occurred.
- */
-int csync_add_exclude_list(CSYNC *ctx, const char *path);
-
-/**
  * @brief Get the userdata saved in the context.
  *
  * @param ctx           The csync context.
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 5516784..62c95c2 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -443,7 +443,6 @@ restart_sync:
     QObject::connect(&engine, SIGNAL(finished(bool)), &app, SLOT(quit()));
     QObject::connect(&engine, SIGNAL(transmissionProgress(ProgressInfo)), &cmd, SLOT(transmissionProgressSlot()));
 
-// FIXME: Test (maybe even auto)
     // Exclude lists
     engine.excludedFiles().addExcludeFilePath(ConfigFile::excludeFileFromSystem());
     if( QFile::exists(options.exclude) )
diff --git a/src/libsync/excludedfiles.h b/src/libsync/excludedfiles.h
index 1146042..da23c1b 100644
--- a/src/libsync/excludedfiles.h
+++ b/src/libsync/excludedfiles.h
@@ -66,6 +66,8 @@ public slots:
     bool reloadExcludes();
 
 private:
+    // This is a pointer to the csync exclude list, its is owned by this class
+    // but the pointer can be in a csync_context so that it can itself also query the list.
     c_strlist_t** _excludesPtr;
     QStringList _excludeFiles;
     mutable QReadWriteLock _mutex;

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