[Pkg-owncloud-commits] [owncloud-client] 74/470: Remove superfluous error checking from csync_create and csync_init
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu May 12 16:24:46 UTC 2016
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 b8dee63d7a307a49ea20a0dc8d8cf1c1a2b148df
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date: Wed Feb 10 19:24:40 2016 +0100
Remove superfluous error checking from csync_create and csync_init
Given that we control all call sites, the only way that this can fail is during
OOM. Also remove the code in csync itself to make sure that it's obvious that
any new error case wouldn't be handled by call sites.
---
csync/src/csync.c | 63 ++++------------------
csync/src/csync.h | 8 +--
csync/src/std/c_rbtree.c | 13 ++---
csync/src/std/c_rbtree.h | 4 +-
csync/tests/csync_tests/check_csync_commit.c | 19 ++-----
csync/tests/csync_tests/check_csync_create.c | 3 +-
csync/tests/csync_tests/check_csync_exclude.c | 6 +--
csync/tests/csync_tests/check_csync_init.c | 23 ++------
csync/tests/csync_tests/check_csync_log.c | 3 +-
csync/tests/csync_tests/check_csync_statedb_load.c | 3 +-
.../tests/csync_tests/check_csync_statedb_query.c | 6 +--
csync/tests/csync_tests/check_csync_update.c | 12 ++---
csync/tests/std_tests/check_std_c_rbtree.c | 31 ++---------
csync/tests/vio_tests/check_vio.c | 3 +-
csync/tests/vio_tests/check_vio_ext.c | 3 +-
src/cmd/cmd.cpp | 11 +---
src/gui/folder.cpp | 31 +++--------
17 files changed, 51 insertions(+), 191 deletions(-)
diff --git a/csync/src/csync.c b/csync/src/csync.c
index a3cc77d..43865ac 100644
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@ -25,6 +25,7 @@
#define _GNU_SOURCE
#endif
+#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <string.h>
@@ -89,14 +90,11 @@ static int _data_cmp(const void *key, const void *data) {
return 0;
}
-int csync_create(CSYNC **csync, const char *local, const char *remote) {
+void csync_create(CSYNC **csync, const char *local, const char *remote) {
CSYNC *ctx;
size_t len = 0;
ctx = c_malloc(sizeof(CSYNC));
- if (ctx == NULL) {
- return -1;
- }
ctx->status_code = CSYNC_STATUS_OK;
@@ -121,46 +119,21 @@ int csync_create(CSYNC **csync, const char *local, const char *remote) {
ctx->ignore_hidden_files = true;
*csync = ctx;
- return 0;
}
-int csync_init(CSYNC *ctx) {
- int rc;
-
- if (ctx == NULL) {
- errno = EBADF;
- return -1;
- }
-
- ctx->status_code = CSYNC_STATUS_OK;
-
+void csync_init(CSYNC *ctx) {
+ assert(ctx);
/* Do not initialize twice */
- if (ctx->status & CSYNC_STATUS_INIT) {
- return 1;
- }
- /* check for uri */
- if (csync_fnmatch("owncloud://*", ctx->remote.uri, 0) == 0 && csync_fnmatch("ownclouds://*", ctx->remote.uri, 0) == 0) {
- ctx->status_code = CSYNC_STATUS_NO_MODULE;
- rc = -1;
- goto out;
- }
+ assert(!(ctx->status & CSYNC_STATUS_INIT));
+ ctx->status_code = CSYNC_STATUS_OK;
ctx->local.type = LOCAL_REPLICA;
ctx->remote.type = REMOTE_REPLICA;
- if (c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp) < 0) {
- ctx->status_code = CSYNC_STATUS_TREE_ERROR;
- rc = -1;
- goto out;
- }
-
- if (c_rbtree_create(&ctx->remote.tree, _key_cmp, _data_cmp) < 0) {
- ctx->status_code = CSYNC_STATUS_TREE_ERROR;
- rc = -1;
- goto out;
- }
+ c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp);
+ c_rbtree_create(&ctx->remote.tree, _key_cmp, _data_cmp);
ctx->remote.root_perms = 0;
@@ -168,11 +141,6 @@ int csync_init(CSYNC *ctx) {
/* initialize random generator */
srand(time(NULL));
-
- rc = 0;
-
-out:
- return rc;
}
int csync_update(CSYNC *ctx) {
@@ -584,25 +552,14 @@ int csync_commit(CSYNC *ctx) {
/* Create new trees */
- rc = c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp);
- if (rc < 0) {
- ctx->status_code = CSYNC_STATUS_TREE_ERROR;
- goto out;
- }
-
- rc = c_rbtree_create(&ctx->remote.tree, _key_cmp, _data_cmp);
- if (rc < 0) {
- ctx->status_code = CSYNC_STATUS_TREE_ERROR;
- goto out;
- }
+ c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp);
+ c_rbtree_create(&ctx->remote.tree, _key_cmp, _data_cmp);
ctx->status = CSYNC_STATUS_INIT;
SAFE_FREE(ctx->error_string);
rc = 0;
-
-out:
return rc;
}
diff --git a/csync/src/csync.h b/csync/src/csync.h
index 6ccef4a..d00c573 100644
--- a/csync/src/csync.h
+++ b/csync/src/csync.h
@@ -316,10 +316,8 @@ typedef const char* (*csync_checksum_hook) (
* @brief Allocate a csync context.
*
* @param csync The context variable to allocate.
- *
- * @return 0 on success, less than 0 if an error occurred.
*/
-int csync_create(CSYNC **csync, const char *local, const char *remote);
+void csync_create(CSYNC **csync, const char *local, const char *remote);
/**
* @brief Initialize the file synchronizer.
@@ -327,10 +325,8 @@ int csync_create(CSYNC **csync, const char *local, const char *remote);
* This function loads the configuration
*
* @param ctx The context to initialize.
- *
- * @return 0 on success, less than 0 if an error occurred.
*/
-int csync_init(CSYNC *ctx);
+void csync_init(CSYNC *ctx);
/**
* @brief Update detection
diff --git a/csync/src/std/c_rbtree.c b/csync/src/std/c_rbtree.c
index 9cda675..9a38fd0 100644
--- a/csync/src/std/c_rbtree.c
+++ b/csync/src/std/c_rbtree.c
@@ -38,13 +38,12 @@
#define NIL &_sentinel /* all leafs are sentinels */
static c_rbnode_t _sentinel = {NULL, NIL, NIL, NULL, NULL, BLACK};
-int c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_rbtree_compare_func *data_compare) {
- c_rbtree_t *tree = NULL;
+void c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_rbtree_compare_func *data_compare) {
+ assert(rbtree);
+ assert(key_compare);
+ assert(data_compare);
- if (rbtree == NULL || key_compare == NULL || data_compare == NULL) {
- errno = EINVAL;
- return -1;
- }
+ c_rbtree_t *tree = NULL;
tree = c_malloc(sizeof(*tree));
tree->root = NIL;
@@ -53,8 +52,6 @@ int c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_r
tree->size = 0;
*rbtree = tree;
-
- return 0;
}
static c_rbnode_t *_rbtree_subtree_dup(const c_rbnode_t *node, c_rbtree_t *new_tree, c_rbnode_t *new_parent) {
diff --git a/csync/src/std/c_rbtree.h b/csync/src/std/c_rbtree.h
index 34ac03a..635458f 100644
--- a/csync/src/std/c_rbtree.h
+++ b/csync/src/std/c_rbtree.h
@@ -135,10 +135,8 @@ struct c_rbnode_s {
*
* @param data_compare Callback function to compare a key as data with thee
* data inside a red-black tree node.
- *
- * @return 0 on success, -1 if an error occurred with errno set.
*/
-int c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_rbtree_compare_func *data_compare);
+void c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_rbtree_compare_func *data_compare);
/**
* @brief Duplicate a red-black tree.
diff --git a/csync/tests/csync_tests/check_csync_commit.c b/csync/tests/csync_tests/check_csync_commit.c
index adace42..20d79fe 100644
--- a/csync/tests/csync_tests/check_csync_commit.c
+++ b/csync/tests/csync_tests/check_csync_commit.c
@@ -33,8 +33,7 @@ static void setup(void **state) {
rc = system("mkdir -p /tmp/check_csync2");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
*state = csync;
}
@@ -49,10 +48,9 @@ static void setup_module(void **state) {
rc = system("mkdir -p /tmp/check_csync2");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "dummy://foo/bar");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "dummy://foo/bar");
- rc = csync_init(csync);
+ csync_init(csync);
*state = csync;
}
@@ -74,16 +72,6 @@ static void teardown(void **state) {
*state = NULL;
}
-static void check_csync_commit_null(void **state)
-{
- int rc;
-
- (void) state; /* unused */
-
- rc = csync_commit(NULL);
- assert_int_equal(rc, -1);
-}
-
static void check_csync_commit(void **state)
{
CSYNC *csync = *state;
@@ -110,7 +98,6 @@ static void check_csync_commit_dummy(void **state)
int torture_run_tests(void)
{
const UnitTest tests[] = {
- unit_test_setup_teardown(check_csync_commit_null, setup, teardown),
unit_test_setup_teardown(check_csync_commit, setup, teardown),
unit_test_setup_teardown(check_csync_commit_dummy, setup_module, teardown),
};
diff --git a/csync/tests/csync_tests/check_csync_create.c b/csync/tests/csync_tests/check_csync_create.c
index 90caab6..8f2f61f 100644
--- a/csync/tests/csync_tests/check_csync_create.c
+++ b/csync/tests/csync_tests/check_csync_create.c
@@ -42,8 +42,7 @@ static void check_csync_create(void **state)
(void) state; /* unused */
- rc = csync_create(&csync, "/tmp/csync1", "/tmp/csync2");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/csync1", "/tmp/csync2");
rc = csync_destroy(csync);
assert_int_equal(rc, 0);
diff --git a/csync/tests/csync_tests/check_csync_exclude.c b/csync/tests/csync_tests/check_csync_exclude.c
index 56a497e..419021c 100644
--- a/csync/tests/csync_tests/check_csync_exclude.c
+++ b/csync/tests/csync_tests/check_csync_exclude.c
@@ -32,8 +32,7 @@ static void setup(void **state) {
CSYNC *csync;
int rc;
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
*state = csync;
}
@@ -42,8 +41,7 @@ static void setup_init(void **state) {
CSYNC *csync;
int rc;
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
rc = csync_exclude_load(EXCLUDE_LIST_FILE, &(csync->excludes));
assert_int_equal(rc, 0);
diff --git a/csync/tests/csync_tests/check_csync_init.c b/csync/tests/csync_tests/check_csync_init.c
index febf386..ccd4e9d 100644
--- a/csync/tests/csync_tests/check_csync_init.c
+++ b/csync/tests/csync_tests/check_csync_init.c
@@ -33,8 +33,7 @@ static void setup(void **state) {
rc = system("mkdir -p /tmp/check_csync2");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
*state = csync;
}
@@ -49,8 +48,7 @@ static void setup_module(void **state) {
rc = system("mkdir -p /tmp/check_csync2");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "dummy://foo/bar");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "dummy://foo/bar");
*state = csync;
}
@@ -73,34 +71,19 @@ static void teardown(void **state) {
*state = NULL;
}
-static void check_csync_init_null(void **state)
-{
- int rc;
-
- (void) state; /* unused */
-
- rc = csync_init(NULL);
- assert_int_equal(rc, -1);
-}
-
static void check_csync_init(void **state)
{
CSYNC *csync = *state;
int rc;
- rc = csync_init(csync);
- assert_int_equal(rc, 0);
+ csync_init(csync);
assert_int_equal(csync->status & CSYNC_STATUS_INIT, 1);
-
- rc = csync_init(csync);
- assert_int_equal(rc, 1);
}
int torture_run_tests(void)
{
const UnitTest tests[] = {
- unit_test_setup_teardown(check_csync_init_null, setup, teardown),
unit_test_setup_teardown(check_csync_init, setup, teardown),
unit_test_setup_teardown(check_csync_init, setup_module, teardown),
};
diff --git a/csync/tests/csync_tests/check_csync_log.c b/csync/tests/csync_tests/check_csync_log.c
index 69fa4e4..61fb3aa 100644
--- a/csync/tests/csync_tests/check_csync_log.c
+++ b/csync/tests/csync_tests/check_csync_log.c
@@ -37,8 +37,7 @@ static void setup(void **state) {
rc = system("mkdir -p /tmp/check_csync2");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
*state = csync;
}
diff --git a/csync/tests/csync_tests/check_csync_statedb_load.c b/csync/tests/csync_tests/check_csync_statedb_load.c
index e6f9332..2b4a6bf 100644
--- a/csync/tests/csync_tests/check_csync_statedb_load.c
+++ b/csync/tests/csync_tests/check_csync_statedb_load.c
@@ -37,8 +37,7 @@ static void setup(void **state) {
rc = system("mkdir -p /tmp/check_csync1");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
csync->statedb.file = c_strdup( TESTDB );
*state = csync;
diff --git a/csync/tests/csync_tests/check_csync_statedb_query.c b/csync/tests/csync_tests/check_csync_statedb_query.c
index 6e6b488..0ce8bde 100644
--- a/csync/tests/csync_tests/check_csync_statedb_query.c
+++ b/csync/tests/csync_tests/check_csync_statedb_query.c
@@ -42,10 +42,8 @@ static void setup(void **state)
assert_int_equal(rc, 0);
rc = system("mkdir -p /tmp/check_csync");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
- rc = csync_init(csync);
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
+ csync_init(csync);
sqlite3 *db = NULL;
rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
diff --git a/csync/tests/csync_tests/check_csync_update.c b/csync/tests/csync_tests/check_csync_update.c
index c3a7eaf..a954217 100644
--- a/csync/tests/csync_tests/check_csync_update.c
+++ b/csync/tests/csync_tests/check_csync_update.c
@@ -93,10 +93,8 @@ static void setup(void **state)
assert_int_equal(rc, 0);
rc = system("mkdir -p /tmp/check_csync2");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
- assert_int_equal(rc, 0);
- rc = csync_init(csync);
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
+ csync_init(csync);
/* Create a new db with metadata */
sqlite3 *db;
@@ -126,10 +124,8 @@ static void setup_ftw(void **state)
assert_int_equal(rc, 0);
rc = system("mkdir -p /tmp/check_csync2");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp", "/tmp");
- assert_int_equal(rc, 0);
- rc = csync_init(csync);
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp", "/tmp");
+ csync_init(csync);
sqlite3 *db = NULL;
rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
diff --git a/csync/tests/std_tests/check_std_c_rbtree.c b/csync/tests/std_tests/check_std_c_rbtree.c
index 052e972..7350965 100644
--- a/csync/tests/std_tests/check_std_c_rbtree.c
+++ b/csync/tests/std_tests/check_std_c_rbtree.c
@@ -84,10 +84,8 @@ static void destructor(void *data) {
static void setup(void **state) {
c_rbtree_t *tree = NULL;
- int rc;
- rc = c_rbtree_create(&tree, key_cmp, data_cmp);
- assert_int_equal(rc, 0);
+ c_rbtree_create(&tree, key_cmp, data_cmp);
*state = tree;
}
@@ -97,8 +95,7 @@ static void setup_complete_tree(void **state) {
int i = 0;
int rc;
- rc = c_rbtree_create(&tree, key_cmp, data_cmp);
- assert_int_equal(rc, 0);
+ c_rbtree_create(&tree, key_cmp, data_cmp);
for (i = 0; i < 100; i++) {
test_t *testdata = NULL;
@@ -131,31 +128,13 @@ static void check_c_rbtree_create_free(void **state)
(void) state; /* unused */
- rc = c_rbtree_create(&tree, key_cmp, data_cmp);
- assert_int_equal(rc, 0);
+ c_rbtree_create(&tree, key_cmp, data_cmp);
assert_int_equal(tree->size, 0);
rc = c_rbtree_free(tree);
assert_int_equal(rc, 0);
}
-static void check_c_rbtree_create_null(void **state)
-{
- c_rbtree_t *tree = NULL;
- int rc;
-
- (void) state; /* unused */
-
- rc = c_rbtree_create(NULL, key_cmp, data_cmp);
- assert_int_equal(rc, -1);
-
- rc = c_rbtree_create(&tree, NULL, data_cmp);
- assert_int_equal(rc, -1);
-
- rc = c_rbtree_create(&tree, key_cmp, NULL);
- assert_int_equal(rc, -1);
-}
-
static void check_c_rbtree_free_null(void **state)
{
int rc;
@@ -175,8 +154,7 @@ static void check_c_rbtree_insert_delete(void **state)
(void) state; /* unused */
- rc = c_rbtree_create(&tree, key_cmp, data_cmp);
- assert_int_equal(rc, 0);
+ c_rbtree_create(&tree, key_cmp, data_cmp);
testdata = malloc(sizeof(test_t));
testdata->key = 42;
@@ -369,7 +347,6 @@ int torture_run_tests(void)
{
const UnitTest tests[] = {
unit_test(check_c_rbtree_create_free),
- unit_test(check_c_rbtree_create_null),
unit_test(check_c_rbtree_free_null),
unit_test(check_c_rbtree_insert_delete),
unit_test_setup_teardown(check_c_rbtree_insert_random, setup, teardown),
diff --git a/csync/tests/vio_tests/check_vio.c b/csync/tests/vio_tests/check_vio.c
index 772c9fa..745e5f3 100644
--- a/csync/tests/vio_tests/check_vio.c
+++ b/csync/tests/vio_tests/check_vio.c
@@ -49,8 +49,7 @@ static void setup(void **state)
rc = system("rm -rf /tmp/csync_test");
assert_int_equal(rc, 0);
- rc = csync_create(&csync, "/tmp/csync1", "/tmp/csync2");
- assert_int_equal(rc, 0);
+ csync_create(&csync, "/tmp/csync1", "/tmp/csync2");
csync->replica = LOCAL_REPLICA;
diff --git a/csync/tests/vio_tests/check_vio_ext.c b/csync/tests/vio_tests/check_vio_ext.c
index a77441f..7d6663a 100644
--- a/csync/tests/vio_tests/check_vio_ext.c
+++ b/csync/tests/vio_tests/check_vio_ext.c
@@ -97,8 +97,7 @@ static void setup_testenv(void **state) {
statevar *mystate = malloc( sizeof(statevar) );
mystate->result = NULL;
- rc = csync_create(&(mystate->csync), "/tmp/csync1", "/tmp/csync2");
- assert_int_equal(rc, 0);
+ csync_create(&(mystate->csync), "/tmp/csync1", "/tmp/csync2");
mystate->csync->replica = LOCAL_REPLICA;
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 0914d88..c426e38 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -387,20 +387,13 @@ restart_sync:
CSYNC *_csync_ctx;
- if( csync_create( &_csync_ctx, options.source_dir.toUtf8(),
- remUrl.constData()) < 0 ) {
- qFatal("Unable to create csync-context!");
- return EXIT_FAILURE;
- }
+ csync_create( &_csync_ctx, options.source_dir.toUtf8(), remUrl.constData());
csync_set_log_level(options.silent ? 1 : 11);
opts = &options;
- if( csync_init( _csync_ctx ) < 0 ) {
- qFatal("Could not initialize csync!");
- return EXIT_FAILURE;
- }
+ csync_init( _csync_ctx );
// ignore hidden files or not
_csync_ctx->ignore_hidden_files = options.ignoreHiddenFiles;
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 0110394..88904f2 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -103,29 +103,14 @@ bool Folder::init()
QString localpath = path();
- if( csync_create( &_csync_ctx, localpath.toUtf8().data(), url_string.toUtf8().data() ) < 0 ) {
- qDebug() << "Unable to create csync-context!";
- slotSyncError(tr("Unable to create csync-context"));
- _csync_ctx = 0;
- } else {
- csync_set_log_callback( csyncLogCatcher );
- csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );
-
- Q_ASSERT( _accountState );
-
- if( csync_init( _csync_ctx ) < 0 ) {
- qDebug() << "Could not initialize csync!" << csync_get_status(_csync_ctx) << csync_get_status_string(_csync_ctx);
- QString errStr = SyncEngine::csyncErrorToString(CSYNC_STATUS(csync_get_status(_csync_ctx)));
- const char *errMsg = csync_get_status_string(_csync_ctx);
- if( errMsg ) {
- errStr += QLatin1String("<br/>");
- errStr += QString::fromUtf8(errMsg);
- }
- slotSyncError(errStr);
- csync_destroy(_csync_ctx);
- _csync_ctx = 0;
- }
- }
+ csync_create( &_csync_ctx, localpath.toUtf8().data(), url_string.toUtf8().data() );
+ csync_init( _csync_ctx );
+
+ csync_set_log_callback( csyncLogCatcher );
+ csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );
+
+ Q_ASSERT( _accountState );
+
return _csync_ctx;
}
--
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