[Pkg-owncloud-commits] [owncloud-client] 15/33: ammand last commit

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch upstream
in repository owncloud-client.

commit f92cf3dee3f0cde888481fb5e6d7365574a33964
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Feb 21 19:09:38 2014 +0100

    ammand last commit
    
    We should not close the directory twice in the normal case
---
 csync/src/csync_update.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c
index 33f471a..f61b118 100644
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -599,7 +599,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
       }
 
       ctx->current_fs = previous_fs;
-      goto done;
+      goto error;
     }
 
     if (flag == CSYNC_FTW_FLAG_DIR && depth
@@ -607,7 +607,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
       rc = csync_ftw(ctx, filename, fn, depth - 1);
       if (rc < 0) {
         ctx->current_fs = previous_fs;
-        goto done;
+        goto error;
       }
 
       if (ctx->current_fs && !ctx->current_fs->child_modified
@@ -634,18 +634,14 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
   CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, " <= Closing walk for %s with read_from_db %d", uri, read_from_db);
 
 done:
-  ctx->remote.read_from_db = read_from_db;
-  if (dh != NULL) {
-      csync_vio_closedir(ctx, dh);
-  }
   csync_vio_file_stat_destroy(dirent);
   SAFE_FREE(filename);
   return rc;
 error:
+  ctx->remote.read_from_db = read_from_db;
   if (dh != NULL) {
     csync_vio_closedir(ctx, dh);
   }
-  ctx->remote.read_from_db = read_from_db;
   SAFE_FREE(filename);
   return -1;
 }

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