[Pkg-owncloud-commits] [owncloud-client] 41/70: reconcile: use the proper enum type

[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 b34afa1afcf022b66b37fd1317b6c4edade7b756
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Jun 20 11:49:33 2014 +0200

    reconcile:  use the proper enum type
    
    thankfully the value hapenned to be the same, but the type
    is of CSYNC_FTW_..  and not CSYNC_VIO_FILE_TYPE
    Detected by coverity (CID 12887)
---
 csync/src/csync_reconcile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/csync/src/csync_reconcile.c b/csync/src/csync_reconcile.c
index 140117b..621afcf 100644
--- a/csync/src/csync_reconcile.c
+++ b/csync/src/csync_reconcile.c
@@ -238,8 +238,8 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
             /* file on other replica is changed or new */
             case CSYNC_INSTRUCTION_NEW:
             case CSYNC_INSTRUCTION_EVAL:
-                if (other->type == CSYNC_VIO_FILE_TYPE_DIRECTORY &&
-                        cur->type == CSYNC_VIO_FILE_TYPE_DIRECTORY) {
+                if (other->type == CSYNC_FTW_TYPE_DIR &&
+                        cur->type == CSYNC_FTW_TYPE_DIR) {
                     is_equal_files = (other->modtime == cur->modtime);
                 } else {
                     is_equal_files = ((other->size == cur->size) && (other->modtime == cur->modtime));

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