[Pkg-owncloud-commits] [owncloud-client] 24/332: CSync: Remove one VIO layering

[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 e36f3c5b1033b450a2ba07d537211a128c461bc2
Author: Markus Goetz <markus at woboq.com>
Date:   Thu May 29 12:55:37 2014 +0200

    CSync: Remove one VIO layering
---
 csync/src/csync.c         |  4 ++--
 csync/src/vio/csync_vio.c | 12 ------------
 csync/src/vio/csync_vio.h |  3 ---
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/csync/src/csync.c b/csync/src/csync.c
index f20064f..3e6d383 100644
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@ -617,7 +617,7 @@ int csync_commit(CSYNC *ctx) {
   }
   ctx->statedb.db = NULL;
 
-  rc = csync_vio_commit(ctx);
+  rc = owncloud_commit(ctx);
   if (rc < 0) {
     CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "commit failed: %s",
               ctx->error_string ? ctx->error_string : "");
@@ -922,7 +922,7 @@ void csync_file_stat_free(csync_file_stat_t *st)
 
 int csync_set_module_property(CSYNC* ctx, const char* key, void* value)
 {
-    return csync_vio_set_property(ctx, key, value);
+    return owncloud_set_property(ctx, key, value);
 }
 
 
diff --git a/csync/src/vio/csync_vio.c b/csync/src/vio/csync_vio.c
index 0db0bdf..c4dffba 100644
--- a/csync/src/vio/csync_vio.c
+++ b/csync/src/vio/csync_vio.c
@@ -121,21 +121,9 @@ int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf) {
   return rc;
 }
 
-
-
 char *csync_vio_get_status_string(CSYNC *ctx) {
   if(ctx->error_string) {
     return ctx->error_string;
   }
   return owncloud_error_string(ctx);
 }
-
-int csync_vio_set_property(CSYNC* ctx, const char* key, void* data) {
-  (void) ctx;
-  return owncloud_set_property(ctx, key, data);
-}
-
-int csync_vio_commit(CSYNC *ctx) {
-  (void) ctx;
-  return owncloud_commit(ctx);
-}
diff --git a/csync/src/vio/csync_vio.h b/csync/src/vio/csync_vio.h
index d08ab64..499e47b 100644
--- a/csync/src/vio/csync_vio.h
+++ b/csync/src/vio/csync_vio.h
@@ -39,10 +39,7 @@ csync_vio_file_stat_t *csync_vio_readdir(CSYNC *ctx, csync_vio_handle_t *dhandle
 
 int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf);
 
-int csync_vio_set_property(CSYNC *ctx, const char *key, void *data);
-
 char *csync_vio_get_status_string(CSYNC *ctx);
 
-int csync_vio_commit(CSYNC *ctx);
 
 #endif /* _CSYNC_VIO_H */

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