[Opensync-commits] r5788 - plugins/file-sync/src

[<svn...@op...>]

Author: dgollub
Date: Thu Sep 17 22:16:15 2009
New Revision: 5788
URL: http://www.opensync.org/changeset/5788

Log:
Adapt file-format to latest Format plugin api changes

Modified:
   plugins/file-sync/src/file.c
   plugins/file-sync/src/plain.c

Modified: plugins/file-sync/src/file.c
==============================================================================
--- plugins/file-sync/src/file.c	Thu Sep 17 20:33:01 2009	(r5787)
+++ plugins/file-sync/src/file.c	Thu Sep 17 22:16:15 2009	(r5788)
@@ -27,7 +27,7 @@
 
 #include "file.h"
 
-static OSyncConvCmpResult compare_file(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data)
+static OSyncConvCmpResult compare_file(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data, OSyncError **error)
 {
 	OSyncFileFormat *leftfile = (OSyncFileFormat *)leftdata;
 	OSyncFileFormat *rightfile = (OSyncFileFormat *)rightdata;
@@ -101,7 +101,7 @@
 	return FALSE;
 }
 
-static void destroy_file(char *input, unsigned int inpsize, void *user_data)
+static osync_bool destroy_file(char *input, unsigned int inpsize, void *user_data, OSyncError **error)
 {
 	OSyncFileFormat *file = (OSyncFileFormat *)input;
 	
@@ -112,6 +112,8 @@
 		g_free(file->path);
 	
 	g_free(file);
+
+	return TRUE;
 }
 
 static osync_bool duplicate_file(const char *uid, const char *input, unsigned int insize, char **newuid, char **output, unsigned int *outsize, osync_bool *dirty, void *user_data, OSyncError **error)
@@ -160,7 +162,7 @@
 	return lastmod;
 }
 
-static char *print_file(const char *data, unsigned int size, void *user_data)
+static char *print_file(const char *data, unsigned int size, void *user_data, OSyncError **error)
 {
 	OSyncFileFormat *file = (OSyncFileFormat *)data;
 	

Modified: plugins/file-sync/src/plain.c
==============================================================================
--- plugins/file-sync/src/plain.c	Thu Sep 17 20:33:01 2009	(r5787)
+++ plugins/file-sync/src/plain.c	Thu Sep 17 22:16:15 2009	(r5788)
@@ -24,7 +24,7 @@
 #include <opensync/opensync.h>
 #include <opensync/opensync-format.h>
 
-static OSyncConvCmpResult compare_plain(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data)
+static OSyncConvCmpResult compare_plain(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data, OSyncError **error)
 {
 	/* Consider empty block equal NULL pointers */
 	if (!leftsize) leftdata = NULL;
@@ -53,9 +53,11 @@
 	return TRUE;
 }
 
-static void destroy_plain(char *input, unsigned int inpsize, void *user_data)
+static osync_bool destroy_plain(char *input, unsigned int inpsize, void *user_data, OSyncError **error)
 {
 	g_free(input);
+
+	return TRUE;
 }
 
 osync_bool get_format_info(OSyncFormatEnv *env, OSyncError **error)