From fcba1cefce52af02eb3f138dacccdc107fcdffdf Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Fri, 17 Aug 2012 16:44:38 +0300
Subject: [PATCH] Added csync_vio_file_id function and removed unused previous
 code.

---
 src/vio/csync_vio.c | 31 +++++++++++++------------------
 src/vio/csync_vio.h |  1 +
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/vio/csync_vio.c b/src/vio/csync_vio.c
index 9574551db..eebf040e5 100644
--- a/src/vio/csync_vio.c
+++ b/src/vio/csync_vio.c
@@ -214,6 +214,11 @@ int csync_vio_init(CSYNC *ctx, const char *module, const char *args) {
     return -1;
   }
 
+  if (! VIO_METHOD_HAS_FUNC(m, get_file_id)) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "module %s has no get_file_id fn", module);
+  }
+
+
   ctx->module.method = m;
 
   return 0;
@@ -529,13 +534,16 @@ int csync_vio_rmdir(CSYNC *ctx, const char *uri) {
   return rc;
 }
 
+const char *csync_vio_file_id(CSYNC *ctx, const char *path)
+{
+    const char *re;
+    /* We always use the remote method here. */
+    re = ctx->module.method->get_file_id(path);
+    return re;
+}
+
 int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf) {
   int rc = -1;
-  int len = 0;
-  uint64_t h = 0;
-  const char *file = 0;
-
-  file = uri;
 
   switch(ctx->replica) {
     case REMOTE_REPLCIA:
@@ -543,19 +551,6 @@ int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf) {
       break;
     case LOCAL_REPLICA:
       rc = csync_vio_local_stat(uri, buf);
-
-      if (strlen(uri) <= strlen(ctx->local.uri)) {
-        return -1;
-      }
-      file += strlen(ctx->local.uri) + 1;
-
-      len = strlen(file);
-      if( file ) {
-          h = c_jhash64((uint8_t *) file, len, 0);
-          buf->md5 = csync_statedb_get_uniqId( ctx, h, buf );
-          CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "OOOOOOOOOOOOO vio_stat MD5: %s -> %s", file, buf->md5);
-      }
-
 #ifdef _WIN32
       CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Win32: STAT-inode for %s: %llu", uri, buf->inode );
 #endif
diff --git a/src/vio/csync_vio.h b/src/vio/csync_vio.h
index 9db6a1ca1..715ed626e 100644
--- a/src/vio/csync_vio.h
+++ b/src/vio/csync_vio.h
@@ -48,6 +48,7 @@ int csync_vio_mkdir(CSYNC *ctx, const char *uri, mode_t mode);
 int csync_vio_mkdirs(CSYNC *ctx, const char *uri, mode_t mode);
 int csync_vio_rmdir(CSYNC *ctx, const char *uri);
 
+const char *csync_vio_file_id(CSYNC *ctx, const char *path);
 int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf);
 int csync_vio_rename(CSYNC *ctx, const char *olduri, const char *newuri);
 int csync_vio_unlink(CSYNC *ctx, const char *uri);