opensync-archive.h   opensync-archive.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef OPENSYNCARCHIVE_H_ #ifndef OPENSYNCARCHIVE_H_
#define OPENSYNCARCHIVE_H_ #define OPENSYNCARCHIVE_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "archive/opensync_archive.h" #include "archive/opensync_archive.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif /*OPENSYNCARCHIVE_H_*/ #endif /*OPENSYNCARCHIVE_H_*/
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 lines changed or added


 opensync-engine.h   opensync-engine.h 
#ifndef HAVE_ENGINE_H /*
#define HAVE_ENGINE_H * libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef HAVE_OSYNC_ENGINE_H
#define HAVE_OSYNC_ENGINE_H
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "engine/opensync_engine.h" #include "engine/opensync_engine.h"
#include "engine/opensync_mapping_engine.h" #include "engine/opensync_mapping_engine.h"
#include "engine/opensync_obj_engine.h" #include "engine/opensync_obj_engine.h"
#include "engine/opensync_status.h" #include "engine/opensync_status.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif #endif /*HAVE_OSYNC_ENGINE_H*/
 End of changes. 2 change blocks. 
2 lines changed or deleted 22 lines changed or added


 opensync-format.h   opensync-format.h 
skipping to change at line 30 skipping to change at line 30
#ifndef OPENSYNCFORMAT_H_ #ifndef OPENSYNCFORMAT_H_
#define OPENSYNCFORMAT_H_ #define OPENSYNCFORMAT_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "format/opensync_converter.h" #include "format/opensync_converter.h"
#include "format/opensync_filter.h" #include "format/opensync_filter.h"
#include "format/opensync_format_env.h" #include "format/opensync_format_env.h"
#include "format/opensync_objformat.h" #include "format/opensync_objformat.h"
#include "format/opensync_objformat_sink.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif /*OPENSYNCFORMAT_H_*/ #endif /*OPENSYNCFORMAT_H_*/
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 opensync-group.h   opensync-group.h 
skipping to change at line 29 skipping to change at line 29
*/ */
#ifndef OPENSYNCGROUP_H_ #ifndef OPENSYNCGROUP_H_
#define OPENSYNCGROUP_H_ #define OPENSYNCGROUP_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "group/opensync_group_env.h" #include "group/opensync_group_env.h"
#include "group/opensync_group.h" #include "group/opensync_group.h"
#include "group/opensync_member.h" #include "group/opensync_member.h"
#include "group/opensync_updater.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif /*OPENSYNCGROUP_H_*/ #endif /*OPENSYNCGROUP_H_*/
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 opensync-ipc.h   opensync-ipc.h 
skipping to change at line 30 skipping to change at line 30
#ifndef _OPENSYNC_IPC_H_ #ifndef _OPENSYNC_IPC_H_
#define _OPENSYNC_IPC_H_ #define _OPENSYNC_IPC_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "opensync-data.h" #include "opensync-data.h"
#include "ipc/opensync_message.h" #include "ipc/opensync_message.h"
#include "ipc/opensync_queue.h" #include "ipc/opensync_queue.h"
#include "ipc/opensync_serializer.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif /* _OPENSYNC_IPC_H_ */ #endif /* _OPENSYNC_IPC_H_ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 opensync-mapping.h   opensync-mapping.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef OPENSYNCMAPPING_H_ #ifndef OPENSYNCMAPPING_H_
#define OPENSYNCMAPPING_H_ #define OPENSYNCMAPPING_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "mapping/opensync_mapping_table.h" #include "mapping/opensync_mapping_table.h"
#include "mapping/opensync_mapping_view.h" #include "mapping/opensync_mapping_view.h"
#include "mapping/opensync_mapping_entry.h" #include "mapping/opensync_mapping_entry.h"
#include "mapping/opensync_mapping.h" #include "mapping/opensync_mapping.h"
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 lines changed or added


 opensync-merger.h   opensync-merger.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef OPENSYNCMERGER_H_ #ifndef OPENSYNCMERGER_H_
#define OPENSYNCMERGER_H_ #define OPENSYNCMERGER_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "merger/opensync_capabilities.h" #include "merger/opensync_capabilities.h"
#include "merger/opensync_capability.h" #include "merger/opensync_capability.h"
#include "merger/opensync_xmlformat.h"
#include "merger/opensync_xmlfield.h"
#include "merger/opensync_xmlfieldlist.h"
#include "merger/opensync_merger.h" #include "merger/opensync_merger.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif /*OPENSYNCMERGER_H_*/ #endif /*OPENSYNCMERGER_H_*/
 End of changes. 2 change blocks. 
3 lines changed or deleted 20 lines changed or added


 opensync-plugin.h   opensync-plugin.h 
skipping to change at line 29 skipping to change at line 29
*/ */
#ifndef OPENSYNCPLUGIN_H_ #ifndef OPENSYNCPLUGIN_H_
#define OPENSYNCPLUGIN_H_ #define OPENSYNCPLUGIN_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "plugin/opensync_plugin.h" #include "plugin/opensync_plugin.h"
#include "plugin/opensync_plugin_env.h" #include "plugin/opensync_plugin_env.h"
#include "plugin/opensync_plugin_info.h" #include "plugin/opensync_plugin_info.h"
#include "plugin/opensync_plugin_config.h"
#include "plugin/opensync_plugin_advancedoptions.h"
#include "plugin/opensync_plugin_authentication.h"
#include "plugin/opensync_plugin_connection.h"
#include "plugin/opensync_plugin_localization.h"
#include "plugin/opensync_plugin_resource.h"
#include "plugin/opensync_sink.h" #include "plugin/opensync_sink.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif //OPENSYNCPLUGIN_H_ #endif //OPENSYNCPLUGIN_H_
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 opensync-support.h   opensync-support.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_SUPPORT_H #ifndef _OPENSYNC_SUPPORT_H
#define _OPENSYNC_SUPPORT_H #define _OPENSYNC_SUPPORT_H
#include "opensync_list.h"
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
/*! @ingroup OSyncDebugAPI /*! @ingroup OSyncDebugAPI
* @brief The type of the trace */ * @brief The type of the trace */
typedef enum { typedef enum {
/** Used when entering a function. This will indent the callgraph */ /** Used when entering a function. This will indent the callgraph */
TRACE_ENTRY, TRACE_ENTRY,
/** Used when exiting a function. This will unindent the callgraph * / /** Used when exiting a function. This will unindent the callgraph * /
TRACE_EXIT, TRACE_EXIT,
/** Used for traces inside a function. Does not indent. */ /** Used for traces inside a function. Does not indent. */
skipping to change at line 48 skipping to change at line 46
TRACE_SENSITIVE, TRACE_SENSITIVE,
/** Used when exiting a function with a error. This will unindent th e callgraph */ /** Used when exiting a function with a error. This will unindent th e callgraph */
TRACE_EXIT_ERROR, TRACE_EXIT_ERROR,
/** Used to log a general error. This will not unindent the callgrap h */ /** Used to log a general error. This will not unindent the callgrap h */
TRACE_ERROR TRACE_ERROR
} OSyncTraceType; } OSyncTraceType;
OSYNC_EXPORT char *osync_rand_str(int maxlength); OSYNC_EXPORT char *osync_rand_str(int maxlength);
OSYNC_EXPORT char *osync_print_binary(const unsigned char *data, int len); OSYNC_EXPORT char *osync_print_binary(const unsigned char *data, int len);
#define __NULLSTR(x) x ? x : "(NULL)"
OSYNC_EXPORT void osync_trace_reset_indent(void); OSYNC_EXPORT void osync_trace_reset_indent(void);
OSYNC_EXPORT void osync_trace(OSyncTraceType type, const char *message, ... ); OSYNC_EXPORT void osync_trace(OSyncTraceType type, const char *message, ... );
OSYNC_EXPORT void osync_trace_disable(void); OSYNC_EXPORT void osync_trace_disable(void);
OSYNC_EXPORT void osync_trace_enable(void); OSYNC_EXPORT void osync_trace_enable(void);
OSYNC_EXPORT osync_bool osync_file_write(const char *filename, const char * data, unsigned int size, int mode, OSyncError **error); OSYNC_EXPORT osync_bool osync_file_write(const char *filename, const char * data, unsigned int size, int mode, OSyncError **error);
OSYNC_EXPORT osync_bool osync_file_read(const char *filename, char **data, unsigned int *size, OSyncError **error); OSYNC_EXPORT osync_bool osync_file_read(const char *filename, char **data, unsigned int *size, OSyncError **error);
OSYNC_EXPORT const char *osync_get_version(void); OSYNC_EXPORT const char *osync_get_version(void);
OSYNC_EXPORT void *osync_try_malloc0(unsigned int size, OSyncError **error) ; OSYNC_EXPORT void *osync_try_malloc0(unsigned int size, OSyncError **error) ;
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 opensync-time.h   opensync-time.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2007 Daniel Gollub <dgollub@suse.de>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef OPENSYNCTIME_H_ #ifndef OPENSYNCTIME_H_
#define OPENSYNCTIME_H_ #define OPENSYNCTIME_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "format/opensync_time.h" #include "format/opensync_time.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif /* OPENSYNCTIME_H_ */ #endif /* OPENSYNCTIME_H_ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 lines changed or added


 opensync-version.h   opensync-version.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef OPENSYNCVERSION_H_ #ifndef OPENSYNCVERSION_H_
#define OPENSYNCVERSION_H_ #define OPENSYNCVERSION_H_
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
#include "version/opensync_version.h" #include "version/opensync_version.h"
OPENSYNC_END_DECLS OPENSYNC_END_DECLS
#endif /*OPENSYNCVERSION_H_*/ #endif /*OPENSYNCVERSION_H_*/
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 lines changed or added


 opensync.h   opensync.h 
skipping to change at line 61 skipping to change at line 61
#include <unistd.h> #include <unistd.h>
#define OSYNC_EXPORT __global #define OSYNC_EXPORT __global
#else #else
#define OSYNC_EXPORT #define OSYNC_EXPORT
#endif #endif
OPENSYNC_BEGIN_DECLS OPENSYNC_BEGIN_DECLS
/************************************************************** /**************************************************************
* Versions
*************************************************************/
#define OSYNC_GROUP_MAJOR_VERSION 1
#define OSYNC_GROUP_MINOR_VERSION 0
#define OSYNC_MEMBER_MAJOR_VERSION 1
#define OSYNC_MEMBER_MINOR_VERSION 0
#define OSYNC_PLUGIN_MAJOR_VERSION 1
#define OSYNC_PLUGIN_MINOR_VERSION 0
/**************************************************************
* Defines * Defines
*************************************************************/ *************************************************************/
#ifndef TRUE #ifndef TRUE
#define TRUE 1 #define TRUE 1
#endif #endif
#ifndef FALSE #ifndef FALSE
#define FALSE 0 #define FALSE 0
#endif #endif
skipping to change at line 127 skipping to change at line 140
typedef struct OSyncData OSyncData; typedef struct OSyncData OSyncData;
typedef struct OSyncChange OSyncChange; typedef struct OSyncChange OSyncChange;
/* Format Component */ /* Format Component */
typedef struct OSyncFormatEnv OSyncFormatEnv; typedef struct OSyncFormatEnv OSyncFormatEnv;
typedef struct OSyncObjFormat OSyncObjFormat; typedef struct OSyncObjFormat OSyncObjFormat;
typedef struct OSyncFormatConverterPath OSyncFormatConverterPath; typedef struct OSyncFormatConverterPath OSyncFormatConverterPath;
typedef struct OSyncFormatConverter OSyncFormatConverter; typedef struct OSyncFormatConverter OSyncFormatConverter;
typedef struct OSyncFilter OSyncFilter; typedef struct OSyncFilter OSyncFilter;
typedef struct OSyncObjFormatSink OSyncObjFormatSink; typedef struct OSyncObjFormatSink OSyncObjFormatSink;
typedef struct OSyncObjTypeSink OSyncObjTypeSink;
/* Plugin component */ /* Plugin component */
typedef struct OSyncPlugin OSyncPlugin; typedef struct OSyncPlugin OSyncPlugin;
typedef struct OSyncPluginInfo OSyncPluginInfo; typedef struct OSyncPluginInfo OSyncPluginInfo;
typedef struct OSyncPluginEnv OSyncPluginEnv; typedef struct OSyncPluginEnv OSyncPluginEnv;
typedef struct OSyncModule OSyncModule; typedef struct OSyncModule OSyncModule;
typedef struct OSyncObjTypeSink OSyncObjTypeSink;
typedef struct OSyncPluginConfig OSyncPluginConfig;
typedef struct OSyncPluginAuthentication OSyncPluginAuthentication;
typedef struct OSyncPluginAdvancedOption OSyncPluginAdvancedOption;
typedef struct OSyncPluginAdvancedOptionParameter OSyncPluginAdvancedOption
Parameter;
typedef struct OSyncPluginConnection OSyncPluginConnection;
typedef struct OSyncPluginLocalization OSyncPluginLocalization;
typedef struct OSyncPluginResource OSyncPluginResource;
/* Engine component */ /* Engine component */
typedef struct OSyncEngine OSyncEngine; typedef struct OSyncEngine OSyncEngine;
typedef struct OSyncObjEngine OSyncObjEngine; typedef struct OSyncObjEngine OSyncObjEngine;
typedef struct OSyncClient OSyncClient; typedef struct OSyncClient OSyncClient;
typedef struct OSyncClientProxy OSyncClientProxy; typedef struct OSyncClientProxy OSyncClientProxy;
/* Mapping component */ /* Mapping component */
typedef struct OSyncMapping OSyncMapping; typedef struct OSyncMapping OSyncMapping;
typedef struct OSyncMappingTable OSyncMappingTable; typedef struct OSyncMappingTable OSyncMappingTable;
skipping to change at line 160 skipping to change at line 180
/* Group component */ /* Group component */
typedef struct OSyncGroup OSyncGroup; typedef struct OSyncGroup OSyncGroup;
typedef struct OSyncGroupEnv OSyncGroupEnv; typedef struct OSyncGroupEnv OSyncGroupEnv;
typedef struct OSyncMember OSyncMember; typedef struct OSyncMember OSyncMember;
/* Merger component */ /* Merger component */
typedef struct OSyncArchive OSyncArchive; typedef struct OSyncArchive OSyncArchive;
typedef struct OSyncCapabilities OSyncCapabilities; typedef struct OSyncCapabilities OSyncCapabilities;
typedef struct OSyncCapability OSyncCapability; typedef struct OSyncCapability OSyncCapability;
typedef struct OSyncXMLFormat OSyncXMLFormat; typedef struct OSyncXMLFormat OSyncXMLFormat;
typedef struct OSyncXMLFormatSchema OSyncXMLFormatSchema;
typedef struct OSyncXMLField OSyncXMLField; typedef struct OSyncXMLField OSyncXMLField;
typedef struct OSyncXMLFieldList OSyncXMLFieldList; typedef struct OSyncXMLFieldList OSyncXMLFieldList;
typedef struct OSyncMerger OSyncMerger; typedef struct OSyncMerger OSyncMerger;
typedef struct OSyncVersion OSyncVersion; typedef struct OSyncVersion OSyncVersion;
typedef struct OSyncError OSyncError; typedef struct OSyncError OSyncError;
typedef struct OSyncUserInfo OSyncUserInfo; typedef struct OSyncUserInfo OSyncUserInfo;
typedef struct OSyncContext OSyncContext; typedef struct OSyncContext OSyncContext;
typedef struct OSyncHashTable OSyncHashTable; typedef struct OSyncHashTable OSyncHashTable;
typedef struct OSyncFormatProperty OSyncFormatProperty; typedef struct OSyncFormatProperty OSyncFormatProperty;
 End of changes. 4 change blocks. 
1 lines changed or deleted 23 lines changed or added


 opensync_archive.h   opensync_archive.h 
skipping to change at line 28 skipping to change at line 28
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Author: Armin Bauer <armin.bauer@opensync.org> * Author: Armin Bauer <armin.bauer@opensync.org>
* Author: Daniel Friedrich <daniel.friedrich@opensync.org> * Author: Daniel Friedrich <daniel.friedrich@opensync.org>
* *
*/ */
#ifndef OPENSYNC_ARCHIVE_H_ #ifndef OPENSYNC_ARCHIVE_H_
#define OPENSYNC_ARCHIVE_H_ #define OPENSYNC_ARCHIVE_H_
#include <opensync/opensync_list.h>
OSYNC_EXPORT OSyncArchive *osync_archive_new(const char *filename, OSyncErr or **error); OSYNC_EXPORT OSyncArchive *osync_archive_new(const char *filename, OSyncErr or **error);
OSYNC_EXPORT OSyncArchive *osync_archive_ref(OSyncArchive *archive); OSYNC_EXPORT OSyncArchive *osync_archive_ref(OSyncArchive *archive);
OSYNC_EXPORT void osync_archive_unref(OSyncArchive *archive); OSYNC_EXPORT void osync_archive_unref(OSyncArchive *archive);
OSYNC_EXPORT osync_bool osync_archive_save_data(OSyncArchive *archive, long long int id, const char *objtype, const char *data, unsigned int size, OSy ncError **error); OSYNC_EXPORT osync_bool osync_archive_save_data(OSyncArchive *archive, long long int id, const char *objtype, const char *data, unsigned int size, OSy ncError **error);
OSYNC_EXPORT int osync_archive_load_data(OSyncArchive *archive, const char *uid, const char *objtype, char **data, unsigned int *size, OSyncError **er ror); OSYNC_EXPORT int osync_archive_load_data(OSyncArchive *archive, const char *uid, const char *objtype, char **data, unsigned int *size, OSyncError **er ror);
OSYNC_EXPORT long long int osync_archive_save_change(OSyncArchive *archive, long long int id, const char *uid, const char *objtype, long long int mapp ingid, long long int memberid, OSyncError **error); OSYNC_EXPORT long long int osync_archive_save_change(OSyncArchive *archive, long long int id, const char *uid, const char *objtype, long long int mapp ingid, long long int memberid, OSyncError **error);
OSYNC_EXPORT osync_bool osync_archive_delete_change(OSyncArchive *archive, long long int id, const char *objtype, OSyncError **error); OSYNC_EXPORT osync_bool osync_archive_delete_change(OSyncArchive *archive, long long int id, const char *objtype, OSyncError **error);
OSYNC_EXPORT osync_bool osync_archive_load_changes(OSyncArchive *archive, c onst char *objtype, OSyncList **ids, OSyncList **uids, OSyncList **mappingi ds, OSyncList **memberids, OSyncError **error); OSYNC_EXPORT osync_bool osync_archive_load_changes(OSyncArchive *archive, c onst char *objtype, OSyncList **ids, OSyncList **uids, OSyncList **mappingi ds, OSyncList **memberids, OSyncError **error);
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 opensync_change.h   opensync_change.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef _OPENSYNC_CHANGE_H_ #ifndef _OPENSYNC_CHANGE_H_
#define _OPENSYNC_CHANGE_H_ #define _OPENSYNC_CHANGE_H_
OSYNC_EXPORT OSyncChange *osync_change_new(OSyncError **error); OSYNC_EXPORT OSyncChange *osync_change_new(OSyncError **error);
OSYNC_EXPORT OSyncChange *osync_change_ref(OSyncChange *change); OSYNC_EXPORT OSyncChange *osync_change_ref(OSyncChange *change);
OSYNC_EXPORT void osync_change_unref(OSyncChange *change); OSYNC_EXPORT void osync_change_unref(OSyncChange *change);
OSYNC_EXPORT OSyncChange *osync_change_clone(OSyncChange *source, OSyncErro r **error); OSYNC_EXPORT OSyncChange *osync_change_clone(OSyncChange *source, OSyncErro r **error);
OSYNC_EXPORT void osync_change_set_hash(OSyncChange *change, const char *ha sh); OSYNC_EXPORT void osync_change_set_hash(OSyncChange *change, const char *ha sh);
skipping to change at line 29 skipping to change at line 49
OSYNC_EXPORT void osync_change_set_data(OSyncChange *change, OSyncData *dat a); OSYNC_EXPORT void osync_change_set_data(OSyncChange *change, OSyncData *dat a);
OSYNC_EXPORT OSyncData *osync_change_get_data(OSyncChange *change); OSYNC_EXPORT OSyncData *osync_change_get_data(OSyncChange *change);
OSYNC_EXPORT OSyncConvCmpResult osync_change_compare(OSyncChange *leftchang e, OSyncChange *rightchange); OSYNC_EXPORT OSyncConvCmpResult osync_change_compare(OSyncChange *leftchang e, OSyncChange *rightchange);
OSYNC_EXPORT osync_bool osync_change_duplicate(OSyncChange *change, osync_b ool *dirty, OSyncError **error); OSYNC_EXPORT osync_bool osync_change_duplicate(OSyncChange *change, osync_b ool *dirty, OSyncError **error);
OSYNC_EXPORT OSyncObjFormat *osync_change_get_objformat(OSyncChange *change ); OSYNC_EXPORT OSyncObjFormat *osync_change_get_objformat(OSyncChange *change );
OSYNC_EXPORT const char *osync_change_get_objtype(OSyncChange *change); OSYNC_EXPORT const char *osync_change_get_objtype(OSyncChange *change);
OSYNC_EXPORT void osync_change_set_objtype(OSyncChange *change, const char *objtype); OSYNC_EXPORT void osync_change_set_objtype(OSyncChange *change, const char *objtype);
#endif //_OPENSYNC_CHANGE_H_ #endif /*_OPENSYNC_CHANGE_H_*/
 End of changes. 2 change blocks. 
0 lines changed or deleted 20 lines changed or added


 opensync_client_proxy.h   opensync_client_proxy.h 
skipping to change at line 49 skipping to change at line 49
OSYNC_EXPORT OSyncClientProxy *osync_client_proxy_ref(OSyncClientProxy *pro xy); OSYNC_EXPORT OSyncClientProxy *osync_client_proxy_ref(OSyncClientProxy *pro xy);
OSYNC_EXPORT void osync_client_proxy_unref(OSyncClientProxy *proxy); OSYNC_EXPORT void osync_client_proxy_unref(OSyncClientProxy *proxy);
OSYNC_EXPORT void osync_client_proxy_set_context(OSyncClientProxy *proxy, G MainContext *ctx); OSYNC_EXPORT void osync_client_proxy_set_context(OSyncClientProxy *proxy, G MainContext *ctx);
OSYNC_EXPORT void osync_client_proxy_set_change_callback(OSyncClientProxy * proxy, change_cb cb, void *userdata); OSYNC_EXPORT void osync_client_proxy_set_change_callback(OSyncClientProxy * proxy, change_cb cb, void *userdata);
OSYNC_EXPORT OSyncMember *osync_client_proxy_get_member(OSyncClientProxy *p roxy); OSYNC_EXPORT OSyncMember *osync_client_proxy_get_member(OSyncClientProxy *p roxy);
OSYNC_EXPORT osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, O SyncStartType type, const char *path, OSyncError **error); OSYNC_EXPORT osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, O SyncStartType type, const char *path, OSyncError **error);
OSYNC_EXPORT osync_bool osync_client_proxy_shutdown(OSyncClientProxy *proxy , OSyncError **error); OSYNC_EXPORT osync_bool osync_client_proxy_shutdown(OSyncClientProxy *proxy , OSyncError **error);
OSYNC_EXPORT osync_bool osync_client_proxy_initialize(OSyncClientProxy *pro OSYNC_EXPORT osync_bool osync_client_proxy_initialize(OSyncClientProxy *pro
xy, initialize_cb callback, void *userdata, const char *formatdir, const ch xy, initialize_cb callback, void *userdata, const char *formatdir, const ch
ar *plugindir, const char *plugin, const char *groupname, const char *confi ar *plugindir, const char *plugin, const char *groupname, const char *confi
gdir, const char *config, OSyncError **error); gdir, OSyncPluginConfig *config, OSyncError **error);
OSYNC_EXPORT void osync_client_proxy_set_initialize_timeout(OSyncClientProx
y *proxy, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_client_proxy_get_initialize_timeout(OSyncCl
ientProxy *proxy);
OSYNC_EXPORT osync_bool osync_client_proxy_finalize(OSyncClientProxy *proxy , finalize_cb callback, void *userdata, OSyncError **error); OSYNC_EXPORT osync_bool osync_client_proxy_finalize(OSyncClientProxy *proxy , finalize_cb callback, void *userdata, OSyncError **error);
OSYNC_EXPORT void osync_client_proxy_set_finalize_timeout(OSyncClientProxy
*proxy, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_client_proxy_get_finalize_timeout(OSyncClie
ntProxy *proxy);
OSYNC_EXPORT osync_bool osync_client_proxy_discover(OSyncClientProxy *proxy , discover_cb callback, void *userdata, OSyncError **error); OSYNC_EXPORT osync_bool osync_client_proxy_discover(OSyncClientProxy *proxy , discover_cb callback, void *userdata, OSyncError **error);
OSYNC_EXPORT void osync_client_proxy_set_discover_timeout(OSyncClientProxy
*proxy, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_client_proxy_get_discover_timeout(OSyncClie
ntProxy *proxy);
OSYNC_EXPORT int osync_client_proxy_num_objtypes(OSyncClientProxy *proxy); OSYNC_EXPORT int osync_client_proxy_num_objtypes(OSyncClientProxy *proxy);
OSYNC_EXPORT OSyncObjTypeSink *osync_client_proxy_nth_objtype(OSyncClientPr oxy *proxy, int nth); OSYNC_EXPORT OSyncObjTypeSink *osync_client_proxy_nth_objtype(OSyncClientPr oxy *proxy, int nth);
OSYNC_EXPORT OSyncObjTypeSink *osync_client_proxy_find_objtype_sink(OSyncCl ientProxy *proxy, const char *objtype);
OSYNC_EXPORT osync_bool osync_client_proxy_connect(OSyncClientProxy *proxy, connect_cb callback, void *userdata, const char *objtype, osync_bool slows ync, OSyncError **error); OSYNC_EXPORT osync_bool osync_client_proxy_connect(OSyncClientProxy *proxy, connect_cb callback, void *userdata, const char *objtype, osync_bool slows ync, OSyncError **error);
OSYNC_EXPORT osync_bool osync_client_proxy_disconnect(OSyncClientProxy *pro xy, disconnect_cb callback, void *userdata, const char *objtype, OSyncError **error); OSYNC_EXPORT osync_bool osync_client_proxy_disconnect(OSyncClientProxy *pro xy, disconnect_cb callback, void *userdata, const char *objtype, OSyncError **error);
OSYNC_EXPORT osync_bool osync_client_proxy_read(OSyncClientProxy *proxy, re ad_cb callback, void *userdata, OSyncChange *change, OSyncError **error); OSYNC_EXPORT osync_bool osync_client_proxy_read(OSyncClientProxy *proxy, re ad_cb callback, void *userdata, OSyncChange *change, OSyncError **error);
OSYNC_EXPORT osync_bool osync_client_proxy_get_changes(OSyncClientProxy *pr oxy, get_changes_cb callback, void *userdata, const char *objtype, osync_bo ol slowsync, OSyncError **error); OSYNC_EXPORT osync_bool osync_client_proxy_get_changes(OSyncClientProxy *pr oxy, get_changes_cb callback, void *userdata, const char *objtype, osync_bo ol slowsync, OSyncError **error);
OSYNC_EXPORT osync_bool osync_client_proxy_commit_change(OSyncClientProxy * proxy, commit_change_cb callback, void *userdata, OSyncChange *change, OSyn cError **error); OSYNC_EXPORT osync_bool osync_client_proxy_commit_change(OSyncClientProxy * proxy, commit_change_cb callback, void *userdata, OSyncChange *change, OSyn cError **error);
OSYNC_EXPORT osync_bool osync_client_proxy_committed_all(OSyncClientProxy * proxy, committed_all_cb callback, void *userdata, const char *objtype, OSyn cError **error); OSYNC_EXPORT osync_bool osync_client_proxy_committed_all(OSyncClientProxy * proxy, committed_all_cb callback, void *userdata, const char *objtype, OSyn cError **error);
OSYNC_EXPORT osync_bool osync_client_proxy_sync_done(OSyncClientProxy *prox y, sync_done_cb callback, void *userdata, const char *objtype, OSyncError * *error); OSYNC_EXPORT osync_bool osync_client_proxy_sync_done(OSyncClientProxy *prox y, sync_done_cb callback, void *userdata, const char *objtype, OSyncError * *error);
 End of changes. 4 change blocks. 
4 lines changed or deleted 19 lines changed or added


 opensync_converter.h   opensync_converter.h 
skipping to change at line 56 skipping to change at line 56
OSYNC_EXPORT OSyncObjFormat *osync_converter_detect(OSyncFormatConverter *c onverter, OSyncData *data); OSYNC_EXPORT OSyncObjFormat *osync_converter_detect(OSyncFormatConverter *c onverter, OSyncData *data);
OSYNC_EXPORT osync_bool osync_converter_invoke(OSyncFormatConverter *conver ter, OSyncData *data, const char *config, OSyncError **error); OSYNC_EXPORT osync_bool osync_converter_invoke(OSyncFormatConverter *conver ter, OSyncData *data, const char *config, OSyncError **error);
OSYNC_EXPORT osync_bool osync_converter_matches(OSyncFormatConverter *conve rter, OSyncData *data); OSYNC_EXPORT osync_bool osync_converter_matches(OSyncFormatConverter *conve rter, OSyncData *data);
OSYNC_EXPORT OSyncFormatConverterPath *osync_converter_path_new(OSyncError **error); OSYNC_EXPORT OSyncFormatConverterPath *osync_converter_path_new(OSyncError **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_converter_path_ref(OSyncFormat ConverterPath *path); OSYNC_EXPORT OSyncFormatConverterPath *osync_converter_path_ref(OSyncFormat ConverterPath *path);
OSYNC_EXPORT void osync_converter_path_unref(OSyncFormatConverterPath *path ); OSYNC_EXPORT void osync_converter_path_unref(OSyncFormatConverterPath *path );
OSYNC_EXPORT void osync_converter_path_add_edge(OSyncFormatConverterPath *p ath, OSyncFormatConverter *edge); OSYNC_EXPORT void osync_converter_path_add_edge(OSyncFormatConverterPath *p ath, OSyncFormatConverter *edge);
OSYNC_EXPORT int osync_converter_path_num_edges(OSyncFormatConverterPath *p ath); OSYNC_EXPORT unsigned int osync_converter_path_num_edges(OSyncFormatConvert erPath *path);
OSYNC_EXPORT OSyncFormatConverter *osync_converter_path_nth_edge(OSyncForma tConverterPath *path, unsigned int nth); OSYNC_EXPORT OSyncFormatConverter *osync_converter_path_nth_edge(OSyncForma tConverterPath *path, unsigned int nth);
OSYNC_EXPORT const char *osync_converter_path_get_config(OSyncFormatConvert erPath *path); OSYNC_EXPORT const char *osync_converter_path_get_config(OSyncFormatConvert erPath *path);
OSYNC_EXPORT void osync_converter_path_set_config(OSyncFormatConverterPath *path, const char *config); OSYNC_EXPORT void osync_converter_path_set_config(OSyncFormatConverterPath *path, const char *config);
#endif //_OPENSYNC_CONVERTER_H_ #endif //_OPENSYNC_CONVERTER_H_
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 opensync_data.h   opensync_data.h 
skipping to change at line 34 skipping to change at line 34
OSYNC_EXPORT OSyncData *osync_data_new(char *data, unsigned int size, OSync ObjFormat *format, OSyncError **error); OSYNC_EXPORT OSyncData *osync_data_new(char *data, unsigned int size, OSync ObjFormat *format, OSyncError **error);
OSYNC_EXPORT OSyncData *osync_data_ref(OSyncData *data); OSYNC_EXPORT OSyncData *osync_data_ref(OSyncData *data);
OSYNC_EXPORT void osync_data_unref(OSyncData *data); OSYNC_EXPORT void osync_data_unref(OSyncData *data);
OSYNC_EXPORT OSyncObjFormat *osync_data_get_objformat(OSyncData *data); OSYNC_EXPORT OSyncObjFormat *osync_data_get_objformat(OSyncData *data);
OSYNC_EXPORT void osync_data_set_objformat(OSyncData *data, OSyncObjFormat *objformat); OSYNC_EXPORT void osync_data_set_objformat(OSyncData *data, OSyncObjFormat *objformat);
OSYNC_EXPORT const char *osync_data_get_objtype(OSyncData *data); OSYNC_EXPORT const char *osync_data_get_objtype(OSyncData *data);
OSYNC_EXPORT void osync_data_set_objtype(OSyncData *data, const char *objty pe); OSYNC_EXPORT void osync_data_set_objtype(OSyncData *data, const char *objty pe);
OSYNC_EXPORT void osync_data_get_data(OSyncData *data, char **buffer, unsig ned int *size); OSYNC_EXPORT void osync_data_get_data(OSyncData *data, char **buffer, unsig ned int *size);
OSYNC_EXPORT void *osync_data_get_data_ptr(OSyncData *data);
OSYNC_EXPORT void osync_data_steal_data(OSyncData *data, char **buffer, uns igned int *size); OSYNC_EXPORT void osync_data_steal_data(OSyncData *data, char **buffer, uns igned int *size);
OSYNC_EXPORT void osync_data_set_data(OSyncData *data, char *buffer, unsign ed int size); OSYNC_EXPORT void osync_data_set_data(OSyncData *data, char *buffer, unsign ed int size);
OSYNC_EXPORT osync_bool osync_data_has_data(OSyncData *data); OSYNC_EXPORT osync_bool osync_data_has_data(OSyncData *data);
OSYNC_EXPORT OSyncData *osync_data_clone(OSyncData *data, OSyncError **erro r); OSYNC_EXPORT OSyncData *osync_data_clone(OSyncData *data, OSyncError **erro r);
OSYNC_EXPORT OSyncConvCmpResult osync_data_compare(OSyncData *leftdata, OSy ncData *rightdata); OSYNC_EXPORT OSyncConvCmpResult osync_data_compare(OSyncData *leftdata, OSy ncData *rightdata);
OSYNC_EXPORT char *osync_data_get_printable(OSyncData *data); OSYNC_EXPORT char *osync_data_get_printable(OSyncData *data);
OSYNC_EXPORT time_t osync_data_get_revision(OSyncData *data, OSyncError **e rror); OSYNC_EXPORT time_t osync_data_get_revision(OSyncData *data, OSyncError **e rror);
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 opensync_db.h   opensync_db.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_DB_H_ #ifndef _OPENSYNC_DB_H_
#define _OPENSYNC_DB_H_ #define _OPENSYNC_DB_H_
OSyncDB *osync_db_new(OSyncError **error); #include <opensync/opensync_list.h>;
osync_bool osync_db_open(OSyncDB *db, const char *dbfile, OSyncError **erro OSYNC_EXPORT OSyncDB *osync_db_new(OSyncError **error);
r);
osync_bool osync_db_close(OSyncDB *db, OSyncError **error);
int osync_db_exists(OSyncDB *db, const char *tablename, OSyncError **error) OSYNC_EXPORT osync_bool osync_db_open(OSyncDB *db, const char *dbfile, OSyn
; cError **error);
OSYNC_EXPORT osync_bool osync_db_close(OSyncDB *db, OSyncError **error);
osync_bool osync_db_reset(OSyncDB *db, const char *tablename, OSyncError ** OSYNC_EXPORT int osync_db_table_exists(OSyncDB *db, const char *tablename,
error); OSyncError **error);
osync_bool osync_db_reset_full(OSyncDB *db, OSyncError **error);
int osync_db_count(OSyncDB *db, const char *query, OSyncError **error); OSYNC_EXPORT osync_bool osync_db_reset_table(OSyncDB *db, const char *table
name, OSyncError **error);
OSYNC_EXPORT osync_bool osync_db_reset_full(OSyncDB *db, OSyncError **error
);
char *osync_db_query_single_string(OSyncDB *db, const char *query, OSyncErr OSYNC_EXPORT int osync_db_count(OSyncDB *db, const char *query, OSyncError
or **error); **error);
int osync_db_query_single_int(OSyncDB *db, const char *query, OSyncError **
error);
osync_bool osync_db_query(OSyncDB *db, const char *query, OSyncError **erro
r);
GList *osync_db_query_table(OSyncDB *db, const char *query, OSyncError **er
ror);
void osync_db_free_list(GList *list);
osync_bool osync_db_bind_blob(OSyncDB *db, const char *query, const char *d OSYNC_EXPORT char *osync_db_query_single_string(OSyncDB *db, const char *qu
ata, unsigned int size, OSyncError **error); ery, OSyncError **error);
int osync_db_get_blob(OSyncDB *db, const char *query, char **data, unsigned OSYNC_EXPORT int osync_db_query_single_int(OSyncDB *db, const char *query,
int *size, OSyncError **error); OSyncError **error);
OSYNC_EXPORT osync_bool osync_db_query(OSyncDB *db, const char *query, OSyn
cError **error);
OSYNC_EXPORT OSyncList *osync_db_query_table(OSyncDB *db, const char *query
, OSyncError **error);
OSYNC_EXPORT void osync_db_free_list(OSyncList *list);
long long int osync_db_last_rowid(OSyncDB *db); OSYNC_EXPORT osync_bool osync_db_bind_blob(OSyncDB *db, const char *query,
const char *data, unsigned int size, OSyncError **error);
OSYNC_EXPORT int osync_db_get_blob(OSyncDB *db, const char *query, char **d
ata, unsigned int *size, OSyncError **error);
char *osync_db_sql_escape(const char *query); OSYNC_EXPORT long long int osync_db_last_rowid(OSyncDB *db);
OSYNC_EXPORT char *osync_db_sql_escape(const char *query);
#endif //_OPENSYNC_DB_H_ #endif //_OPENSYNC_DB_H_
 End of changes. 9 change blocks. 
25 lines changed or deleted 28 lines changed or added


 opensync_engine.h   opensync_engine.h 
skipping to change at line 32 skipping to change at line 32
#ifndef OPENSYNC_ENGINE_H_ #ifndef OPENSYNC_ENGINE_H_
#define OPENSYNC_ENGINE_H_ #define OPENSYNC_ENGINE_H_
typedef enum { typedef enum {
OSYNC_ENGINE_COMMAND_CONNECT = 1, OSYNC_ENGINE_COMMAND_CONNECT = 1,
OSYNC_ENGINE_COMMAND_READ = 2, OSYNC_ENGINE_COMMAND_READ = 2,
OSYNC_ENGINE_COMMAND_WRITE = 3, OSYNC_ENGINE_COMMAND_WRITE = 3,
OSYNC_ENGINE_COMMAND_SYNC_DONE = 4, OSYNC_ENGINE_COMMAND_SYNC_DONE = 4,
OSYNC_ENGINE_COMMAND_DISCONNECT = 5, OSYNC_ENGINE_COMMAND_DISCONNECT = 5,
OSYNC_ENGINE_COMMAND_SOLVE = 6, OSYNC_ENGINE_COMMAND_SOLVE = 6,
OSYNC_ENGINE_COMMAND_DISCOVER = 7 OSYNC_ENGINE_COMMAND_DISCOVER = 7,
OSYNC_ENGINE_COMMAND_ABORT = 8
} OSyncEngineCmd; } OSyncEngineCmd;
typedef enum { typedef enum {
OSYNC_ENGINE_STATE_UNINITIALIZED, OSYNC_ENGINE_STATE_UNINITIALIZED,
OSYNC_ENGINE_STATE_INITIALIZED, OSYNC_ENGINE_STATE_INITIALIZED,
OSYNC_ENGINE_STATE_WAITING, OSYNC_ENGINE_STATE_WAITING,
OSYNC_ENGINE_STATE_CONNECTING, OSYNC_ENGINE_STATE_CONNECTING,
OSYNC_ENGINE_STATE_READING, OSYNC_ENGINE_STATE_READING,
OSYNC_ENGINE_STATE_WRITING, OSYNC_ENGINE_STATE_WRITING,
OSYNC_ENGINE_STATE_DISCONNECTING OSYNC_ENGINE_STATE_DISCONNECTING
skipping to change at line 153 skipping to change at line 154
OSYNC_EXPORT osync_bool osync_engine_finalize(OSyncEngine *engine, OSyncErr or **error); OSYNC_EXPORT osync_bool osync_engine_finalize(OSyncEngine *engine, OSyncErr or **error);
OSYNC_EXPORT osync_bool osync_engine_synchronize(OSyncEngine *engine, OSync Error **error); OSYNC_EXPORT osync_bool osync_engine_synchronize(OSyncEngine *engine, OSync Error **error);
OSYNC_EXPORT osync_bool osync_engine_synchronize_and_block(OSyncEngine *eng ine, OSyncError **error); OSYNC_EXPORT osync_bool osync_engine_synchronize_and_block(OSyncEngine *eng ine, OSyncError **error);
OSYNC_EXPORT osync_bool osync_engine_wait_sync_end(OSyncEngine *engine, OSy ncError **error); OSYNC_EXPORT osync_bool osync_engine_wait_sync_end(OSyncEngine *engine, OSy ncError **error);
OSYNC_EXPORT osync_bool osync_engine_discover(OSyncEngine *engine, OSyncMem ber *member, OSyncError **error); OSYNC_EXPORT osync_bool osync_engine_discover(OSyncEngine *engine, OSyncMem ber *member, OSyncError **error);
OSYNC_EXPORT osync_bool osync_engine_discover_and_block(OSyncEngine *engine , OSyncMember *member, OSyncError **error); OSYNC_EXPORT osync_bool osync_engine_discover_and_block(OSyncEngine *engine , OSyncMember *member, OSyncError **error);
//OSYNC_EXPORT void osync_engine_pause(OSyncEngine *engine); //OSYNC_EXPORT void osync_engine_pause(OSyncEngine *engine);
//OSYNC_EXPORT void osync_engine_abort(OSyncEngine *engine); OSYNC_EXPORT osync_bool osync_engine_abort(OSyncEngine *engine, OSyncError **error);
//OSYNC_EXPORT void osync_engine_one_iteration(OSyncEngine *engine); //OSYNC_EXPORT void osync_engine_one_iteration(OSyncEngine *engine);
//OSYNC_EXPORT void osync_engine_flag_manual(OSyncEngine *engine); //OSYNC_EXPORT void osync_engine_flag_manual(OSyncEngine *engine);
typedef struct OSyncMappingEngine OSyncMappingEngine; typedef struct OSyncMappingEngine OSyncMappingEngine;
//typedef void *(* osync_message_cb) (OSyncEngine *, OSyncClient *, const c har *, void *, void *); //typedef void *(* osync_message_cb) (OSyncEngine *, OSyncClient *, const c har *, void *, void *);
typedef void (* osync_conflict_cb) (OSyncEngine *, OSyncMappingEngine *, vo id *); typedef void (* osync_conflict_cb) (OSyncEngine *, OSyncMappingEngine *, vo id *);
typedef void (* osync_status_change_cb) (OSyncChangeUpdate *, void *); typedef void (* osync_status_change_cb) (OSyncChangeUpdate *, void *);
typedef void (* osync_status_mapping_cb) (OSyncMappingUpdate *, void *); typedef void (* osync_status_mapping_cb) (OSyncMappingUpdate *, void *);
typedef void (* osync_status_member_cb) (OSyncMemberUpdate *, void *); typedef void (* osync_status_member_cb) (OSyncMemberUpdate *, void *);
typedef void (* osync_status_engine_cb) (OSyncEngineUpdate *, void *); typedef void (* osync_status_engine_cb) (OSyncEngineUpdate *, void *);
OSYNC_EXPORT
OSYNC_EXPORT /*void osync_engine_set_message_callback(OSyncEngine *engine, /* OSYNC_EXPORT void osync_engine_set_message_callback(OSyncEngine *engine,
osync_message_cb callback, void *user_data);*/ osync_message_cb callback, void *user_data);*/
OSYNC_EXPORT void osync_engine_set_conflict_callback(OSyncEngine *engine, o sync_conflict_cb callback, void *user_data); OSYNC_EXPORT void osync_engine_set_conflict_callback(OSyncEngine *engine, o sync_conflict_cb callback, void *user_data);
OSYNC_EXPORT void osync_engine_set_changestatus_callback(OSyncEngine *engin e, osync_status_change_cb callback, void *user_data); OSYNC_EXPORT void osync_engine_set_changestatus_callback(OSyncEngine *engin e, osync_status_change_cb callback, void *user_data);
OSYNC_EXPORT void osync_engine_set_mappingstatus_callback(OSyncEngine *engi ne, osync_status_mapping_cb callback, void *user_data); OSYNC_EXPORT void osync_engine_set_mappingstatus_callback(OSyncEngine *engi ne, osync_status_mapping_cb callback, void *user_data);
OSYNC_EXPORT void osync_engine_set_enginestatus_callback(OSyncEngine *engin e, osync_status_engine_cb callback, void *user_data); OSYNC_EXPORT void osync_engine_set_enginestatus_callback(OSyncEngine *engin e, osync_status_engine_cb callback, void *user_data);
OSYNC_EXPORT void osync_engine_set_memberstatus_callback(OSyncEngine *engin e, osync_status_member_cb callback, void *user_data); OSYNC_EXPORT void osync_engine_set_memberstatus_callback(OSyncEngine *engin e, osync_status_member_cb callback, void *user_data);
OSYNC_EXPORT void osync_engine_event(OSyncEngine *engine, OSyncEngineEvent event); OSYNC_EXPORT void osync_engine_event(OSyncEngine *engine, OSyncEngineEvent event);
OSYNC_EXPORT osync_bool osync_engine_check_get_changes(OSyncEngine *engine) ; OSYNC_EXPORT osync_bool osync_engine_check_get_changes(OSyncEngine *engine) ;
OSYNC_EXPORT int osync_engine_num_proxies(OSyncEngine *engine); OSYNC_EXPORT int osync_engine_num_proxies(OSyncEngine *engine);
 End of changes. 3 change blocks. 
5 lines changed or deleted 6 lines changed or added


 opensync_format_env.h   opensync_format_env.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_FORMAT_ENV_H_ #ifndef _OPENSYNC_FORMAT_ENV_H_
#define _OPENSYNC_FORMAT_ENV_H_ #define _OPENSYNC_FORMAT_ENV_H_
#include <opensync/opensync_list.h>
OSYNC_EXPORT OSyncFormatEnv *osync_format_env_new(OSyncError **error); OSYNC_EXPORT OSyncFormatEnv *osync_format_env_new(OSyncError **error);
OSYNC_EXPORT void osync_format_env_free(OSyncFormatEnv *env); OSYNC_EXPORT void osync_format_env_free(OSyncFormatEnv *env);
OSYNC_EXPORT osync_bool osync_format_env_load_plugins(OSyncFormatEnv *env, const char *path, OSyncError **error); OSYNC_EXPORT osync_bool osync_format_env_load_plugins(OSyncFormatEnv *env, const char *path, OSyncError **error);
OSYNC_EXPORT void osync_format_env_register_objformat(OSyncFormatEnv *env, OSyncObjFormat *format); OSYNC_EXPORT void osync_format_env_register_objformat(OSyncFormatEnv *env, OSyncObjFormat *format);
OSYNC_EXPORT OSyncObjFormat *osync_format_env_find_objformat(OSyncFormatEnv *env, const char *name); OSYNC_EXPORT OSyncObjFormat *osync_format_env_find_objformat(OSyncFormatEnv *env, const char *name);
OSYNC_EXPORT int osync_format_env_num_objformats(OSyncFormatEnv *env); OSYNC_EXPORT int osync_format_env_num_objformats(OSyncFormatEnv *env);
OSYNC_EXPORT OSyncObjFormat *osync_format_env_nth_objformat(OSyncFormatEnv *env, int nth); OSYNC_EXPORT OSyncObjFormat *osync_format_env_nth_objformat(OSyncFormatEnv *env, int nth);
OSYNC_EXPORT void osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter); OSYNC_EXPORT void osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter);
OSYNC_EXPORT OSyncFormatConverter *osync_format_env_find_converter(OSyncFor matEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat); OSYNC_EXPORT OSyncFormatConverter *osync_format_env_find_converter(OSyncFor matEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat);
OSYNC_EXPORT OSyncList *osync_format_env_find_converters(OSyncFormatEnv *en v, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat);
OSYNC_EXPORT int osync_format_env_num_converters(OSyncFormatEnv *env); OSYNC_EXPORT int osync_format_env_num_converters(OSyncFormatEnv *env);
OSYNC_EXPORT OSyncFormatConverter *osync_format_env_nth_converter(OSyncForm atEnv *env, int nth); OSYNC_EXPORT OSyncFormatConverter *osync_format_env_nth_converter(OSyncForm atEnv *env, int nth);
OSYNC_EXPORT void osync_format_env_register_filter(OSyncFormatEnv *env, OSy ncCustomFilter *filter); OSYNC_EXPORT void osync_format_env_register_filter(OSyncFormatEnv *env, OSy ncCustomFilter *filter);
OSYNC_EXPORT int osync_format_env_num_filters(OSyncFormatEnv *env); OSYNC_EXPORT int osync_format_env_num_filters(OSyncFormatEnv *env);
OSYNC_EXPORT OSyncCustomFilter *osync_format_env_nth_filter(OSyncFormatEnv *env, int nth); OSYNC_EXPORT OSyncCustomFilter *osync_format_env_nth_filter(OSyncFormatEnv *env, int nth);
OSYNC_EXPORT OSyncObjFormat *osync_format_env_detect_objformat(OSyncFormatE nv *env, OSyncData *data); OSYNC_EXPORT OSyncObjFormat *osync_format_env_detect_objformat(OSyncFormatE nv *env, OSyncData *data);
OSYNC_EXPORT OSyncObjFormat *osync_format_env_detect_objformat_full(OSyncFo rmatEnv *env, OSyncData *input, OSyncError **error); OSYNC_EXPORT OSyncObjFormat *osync_format_env_detect_objformat_full(OSyncFo rmatEnv *env, OSyncData *input, OSyncError **error);
OSYNC_EXPORT osync_bool osync_format_env_convert(OSyncFormatEnv *env, OSync FormatConverterPath *path, OSyncData *data, OSyncError **error); OSYNC_EXPORT osync_bool osync_format_env_convert(OSyncFormatEnv *env, OSync FormatConverterPath *path, OSyncData *data, OSyncError **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path(OSyncForm atEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat, OSy ncError **error); OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path(OSyncForm atEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat, OSy ncError **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_formats(O OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_formats(O
SyncFormatEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat **targets, SyncFormatEnv *env, OSyncObjFormat *sourceformat, OSyncList *targets, OSync
OSyncError **error); Error **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_with_dete
ctors(OSyncFormatEnv *env, OSyncData *sourcedata, OSyncObjFormat *targetfor
mat, OSyncError **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_formats_w
ith_detectors(OSyncFormatEnv *env, OSyncData *sourcedata, OSyncList *target
s, OSyncError **error);
#endif //_OPENSYNC_FORMAT_ENV_H_ #endif //_OPENSYNC_FORMAT_ENV_H_
 End of changes. 3 change blocks. 
3 lines changed or deleted 13 lines changed or added


 opensync_group.h   opensync_group.h 
skipping to change at line 87 skipping to change at line 87
OSYNC_EXPORT void osync_group_set_conflict_resolution(OSyncGroup *group, OS yncConflictResolution res, int num); OSYNC_EXPORT void osync_group_set_conflict_resolution(OSyncGroup *group, OS yncConflictResolution res, int num);
OSYNC_EXPORT void osync_group_get_conflict_resolution(OSyncGroup *group, OS yncConflictResolution *res, int *num); OSYNC_EXPORT void osync_group_get_conflict_resolution(OSyncGroup *group, OS yncConflictResolution *res, int *num);
OSYNC_EXPORT osync_bool osync_group_get_merger_enabled(OSyncGroup *group); OSYNC_EXPORT osync_bool osync_group_get_merger_enabled(OSyncGroup *group);
OSYNC_EXPORT void osync_group_set_merger_enabled(OSyncGroup *group, osync_b ool enable_merger); OSYNC_EXPORT void osync_group_set_merger_enabled(OSyncGroup *group, osync_b ool enable_merger);
OSYNC_EXPORT osync_bool osync_group_get_converter_enabled(OSyncGroup *group ); OSYNC_EXPORT osync_bool osync_group_get_converter_enabled(OSyncGroup *group );
OSYNC_EXPORT void osync_group_set_converter_enabled(OSyncGroup *group, osyn c_bool enable_converter); OSYNC_EXPORT void osync_group_set_converter_enabled(OSyncGroup *group, osyn c_bool enable_converter);
OSYNC_EXPORT osync_bool osync_group_is_uptodate(OSyncGroup *group);
#endif /* _OPENSYNC_GROUP_H_ */ #endif /* _OPENSYNC_GROUP_H_ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 opensync_hashtable.h   opensync_hashtable.h 
/* /*
* libopensync - A synchronization framework * libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org> * Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
* Copyright (C) 2008 Daniel Gollub <dgollub@suse.de>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef OPENSYNC_HASHTABLE_H_ #ifndef OPENSYNC_HASHTABLE_H_
#define OPENSYNC_HASHTABLE_H_ #define OPENSYNC_HASHTABLE_H_
#include <opensync/opensync_list.h>
typedef void (*OSyncHashtableForEach) (const char *uid, const char *hash, v
oid *user_data);
OSYNC_EXPORT OSyncHashTable *osync_hashtable_new(const char *path, const ch ar *objtype, OSyncError **error); OSYNC_EXPORT OSyncHashTable *osync_hashtable_new(const char *path, const ch ar *objtype, OSyncError **error);
OSYNC_EXPORT void osync_hashtable_free(OSyncHashTable *table);
OSYNC_EXPORT OSYNC_EXPORT OSyncHashTable *osync_hashtable_ref(OSyncHashTable *table);
OSYNC_EXPORT void osync_hashtable_reset(OSyncHashTable *table); OSYNC_EXPORT void osync_hashtable_unref(OSyncHashTable *table);
OSYNC_EXPORT int osync_hashtable_num_entries(OSyncHashTable *table);
OSYNC_EXPORT osync_bool osync_hashtable_nth_entry(OSyncHashTable *table, in OSYNC_EXPORT osync_bool osync_hashtable_load(OSyncHashTable *table, OSyncEr
t i, char **uid, char **hash); ror **error);
OSYNC_EXPORT void osync_hashtable_write(OSyncHashTable *table, const char * OSYNC_EXPORT osync_bool osync_hashtable_save(OSyncHashTable *table, OSyncEr
uid, const char *hash); ror **error);
OSYNC_EXPORT void osync_hashtable_delete(OSyncHashTable *table, const char
*uid); OSYNC_EXPORT osync_bool osync_hashtable_slowsync(OSyncHashTable *table, OSy
OSYNC_EXPORT void osync_hashtable_update_hash(OSyncHashTable *table, OSyncC ncError **error);
hangeType type, const char *uid, const char *hash);
OSYNC_EXPORT void osync_hashtable_report(OSyncHashTable *table, const char OSYNC_EXPORT unsigned int osync_hashtable_num_entries(OSyncHashTable *table
*uid); );
OSYNC_EXPORT char **osync_hashtable_get_deleted(OSyncHashTable *table); OSYNC_EXPORT void osync_hashtable_foreach(OSyncHashTable *table, OSyncHasht
OSYNC_EXPORT OSyncChangeType osync_hashtable_get_changetype(OSyncHashTable ableForEach func, void *user_data);
*table, const char *uid, const char *hash);
OSYNC_EXPORT char *osync_hashtable_get_hash(OSyncHashTable *table, const ch OSYNC_EXPORT void osync_hashtable_update_change(OSyncHashTable *table, OSyn
ar *uid); cChange *change);
//OSYNC_EXPORT void osync_hashtable_report(OSyncHashTable *table, OSyncChan
ge *change);
//OSYNC_EXPORT void osync_hashtable_reset_reports(OSyncHashTable *table);
OSYNC_EXPORT OSyncList *osync_hashtable_get_deleted(OSyncHashTable *table);
OSYNC_EXPORT OSyncChangeType osync_hashtable_get_changetype(OSyncHashTable
*table, OSyncChange *change);
OSYNC_EXPORT const char *osync_hashtable_get_hash(OSyncHashTable *table, co
nst char *uid);
#endif /* OPENSYNC_HASHTABLE_H_ */ #endif /* OPENSYNC_HASHTABLE_H_ */
 End of changes. 3 change blocks. 
19 lines changed or deleted 35 lines changed or added


 opensync_member.h   opensync_member.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_MEMBER_H_ #ifndef _OPENSYNC_MEMBER_H_
#define _OPENSYNC_MEMBER_H_ #define _OPENSYNC_MEMBER_H_
#include <opensync/opensync_list.h>
OSYNC_EXPORT OSyncMember *osync_member_new(OSyncError **error); OSYNC_EXPORT OSyncMember *osync_member_new(OSyncError **error);
OSYNC_EXPORT OSyncMember *osync_member_ref(OSyncMember *member); OSYNC_EXPORT OSyncMember *osync_member_ref(OSyncMember *member);
OSYNC_EXPORT void osync_member_unref(OSyncMember *member); OSYNC_EXPORT void osync_member_unref(OSyncMember *member);
OSYNC_EXPORT const char *osync_member_get_pluginname(OSyncMember *member); OSYNC_EXPORT const char *osync_member_get_pluginname(OSyncMember *member);
OSYNC_EXPORT void osync_member_set_pluginname(OSyncMember *member, const ch ar *pluginname); OSYNC_EXPORT void osync_member_set_pluginname(OSyncMember *member, const ch ar *pluginname);
OSYNC_EXPORT const char *osync_member_get_name(OSyncMember *member); OSYNC_EXPORT const char *osync_member_get_name(OSyncMember *member);
OSYNC_EXPORT void osync_member_set_name(OSyncMember *member, const char *na me); OSYNC_EXPORT void osync_member_set_name(OSyncMember *member, const char *na me);
OSYNC_EXPORT const char *osync_member_get_configdir(OSyncMember *member); OSYNC_EXPORT const char *osync_member_get_configdir(OSyncMember *member);
OSYNC_EXPORT void osync_member_set_configdir(OSyncMember *member, const cha r *configdir); OSYNC_EXPORT void osync_member_set_configdir(OSyncMember *member, const cha r *configdir);
OSYNC_EXPORT osync_bool osync_member_has_config(OSyncMember *member); OSYNC_EXPORT osync_bool osync_member_has_config(OSyncMember *member);
OSYNC_EXPORT const char *osync_member_get_config_or_default(OSyncMember *me OSYNC_EXPORT OSyncPluginConfig *osync_member_get_config_or_default(OSyncMem
mber, OSyncError **error); ber *member, OSyncError **error);
OSYNC_EXPORT const char *osync_member_get_config(OSyncMember *member, OSync OSYNC_EXPORT OSyncPluginConfig *osync_member_get_config(OSyncMember *member
Error **error); , OSyncError **error);
OSYNC_EXPORT void osync_member_set_config(OSyncMember *member, const char * OSYNC_EXPORT void osync_member_set_config(OSyncMember *member, OSyncPluginC
data); onfig *config);
OSYNC_EXPORT osync_bool osync_member_load(OSyncMember *member, const char * path, OSyncError **error); OSYNC_EXPORT osync_bool osync_member_load(OSyncMember *member, const char * path, OSyncError **error);
OSYNC_EXPORT osync_bool osync_member_save(OSyncMember *member, OSyncError * *error); OSYNC_EXPORT osync_bool osync_member_save(OSyncMember *member, OSyncError * *error);
OSYNC_EXPORT osync_bool osync_member_delete(OSyncMember *member, OSyncError **error); OSYNC_EXPORT osync_bool osync_member_delete(OSyncMember *member, OSyncError **error);
OSYNC_EXPORT long long int osync_member_get_id(OSyncMember *member); OSYNC_EXPORT long long int osync_member_get_id(OSyncMember *member);
OSYNC_EXPORT int osync_member_num_objtypes(OSyncMember *member); OSYNC_EXPORT int osync_member_num_objtypes(OSyncMember *member);
OSYNC_EXPORT const char *osync_member_nth_objtype(OSyncMember *member, int nth); OSYNC_EXPORT const char *osync_member_nth_objtype(OSyncMember *member, int nth);
OSYNC_EXPORT void osync_member_add_objtype_sink(OSyncMember *member, OSyncO bjTypeSink *sink); OSYNC_EXPORT void osync_member_add_objtype_sink(OSyncMember *member, OSyncO bjTypeSink *sink);
OSYNC_EXPORT OSyncObjTypeSink *osync_member_find_objtype_sink(OSyncMember * member, const char *objtype); OSYNC_EXPORT OSyncObjTypeSink *osync_member_find_objtype_sink(OSyncMember * member, const char *objtype);
OSYNC_EXPORT osync_bool osync_member_objtype_enabled(OSyncMember *member, c onst char *objtype); OSYNC_EXPORT osync_bool osync_member_objtype_enabled(OSyncMember *member, c onst char *objtype);
OSYNC_EXPORT void osync_member_set_objtype_enabled(OSyncMember *member, con st char *objtype, osync_bool enabled); OSYNC_EXPORT void osync_member_set_objtype_enabled(OSyncMember *member, con st char *objtype, osync_bool enabled);
OSYNC_EXPORT const OSyncList *osync_member_get_objformats(OSyncMember *memb er, const char *objtype, OSyncError **error); OSYNC_EXPORT const OSyncList *osync_member_get_objformats(OSyncMember *memb er, const char *objtype, OSyncError **error);
OSYNC_EXPORT void osync_member_add_objformat(OSyncMember *member, const cha r *objtype, const char *format); OSYNC_EXPORT void osync_member_add_objformat(OSyncMember *member, const cha r *objtype, const char *format);
OSYNC_EXPORT void osync_member_add_objformat_with_config(OSyncMember *membe r, const char *objtype, const char *format, const char *format_config);
OSYNC_EXPORT OSyncCapabilities *osync_member_get_capabilities(OSyncMember * member); OSYNC_EXPORT OSyncCapabilities *osync_member_get_capabilities(OSyncMember * member);
OSYNC_EXPORT osync_bool osync_member_set_capabilities(OSyncMember *member, OSyncCapabilities *capabilities, OSyncError **error); OSYNC_EXPORT osync_bool osync_member_set_capabilities(OSyncMember *member, OSyncCapabilities *capabilities, OSyncError **error);
OSYNC_EXPORT OSyncMerger *osync_member_get_merger(OSyncMember *member); OSYNC_EXPORT OSyncMerger *osync_member_get_merger(OSyncMember *member);
OSYNC_EXPORT void osync_member_flush_objtypes(OSyncMember *member); OSYNC_EXPORT void osync_member_flush_objtypes(OSyncMember *member);
OSYNC_EXPORT OSyncObjTypeSink *osync_member_get_main_sink(OSyncMember *memb
er);
OSYNC_EXPORT osync_bool osync_member_config_is_uptodate(OSyncMember *member
);
OSYNC_EXPORT osync_bool osync_member_plugin_is_uptodate(OSyncMember *member
);
#endif /* _OPENSYNC_MEMBER_H_ */ #endif /* _OPENSYNC_MEMBER_H_ */
 End of changes. 4 change blocks. 
6 lines changed or deleted 17 lines changed or added


 opensync_message.h   opensync_message.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef _OPENSYNC_MESSAGES_H #ifndef _OPENSYNC_MESSAGES_H
#define _OPENSYNC_MESSAGES_H #define _OPENSYNC_MESSAGES_H
/** /**
* @defgroup OSEngineMessage OpenSync Message Internals * @defgroup OSyncMessage OpenSync Message
* @ingroup OSEnginePrivate
* @brief A Message used by the inter thread messaging library * @brief A Message used by the inter thread messaging library
* *
*/ */
/*@{*/ /*@{*/
/*! @brief The Type of the message /*! @brief The Type of the message
* *
*/ */
typedef enum { typedef enum {
skipping to change at line 43 skipping to change at line 62
OSYNC_MESSAGE_ENGINE_CHANGED, OSYNC_MESSAGE_ENGINE_CHANGED,
OSYNC_MESSAGE_MAPPING_CHANGED, OSYNC_MESSAGE_MAPPING_CHANGED,
OSYNC_MESSAGE_MAPPINGENTRY_CHANGED, OSYNC_MESSAGE_MAPPINGENTRY_CHANGED,
OSYNC_MESSAGE_ERROR, OSYNC_MESSAGE_ERROR,
OSYNC_MESSAGE_QUEUE_ERROR, OSYNC_MESSAGE_QUEUE_ERROR,
OSYNC_MESSAGE_QUEUE_HUP OSYNC_MESSAGE_QUEUE_HUP
} OSyncMessageCommand; } OSyncMessageCommand;
/*! @brief Function which can receive messages /*! @brief Function which can receive messages
* *
* @param sender The sender of the received reply
* @param message The reply that is being received. * @param message The reply that is being received.
* @param user_data The userdata which was set previously * @param user_data The userdata which was set previously
* *
*/ */
typedef void (*OSyncMessageHandler)(OSyncMessage *message, void *user_data) ; typedef void (*OSyncMessageHandler)(OSyncMessage *message, void *user_data) ;
OSYNC_EXPORT OSyncMessage *osync_message_new(OSyncMessageCommand cmd, int s /*@}*/
ize, OSyncError **error);
OSYNC_EXPORT OSyncMessage *osync_message_new(OSyncMessageCommand cmd, unsig
ned int size, OSyncError **error);
OSYNC_EXPORT OSyncMessage *osync_message_new_reply(OSyncMessage *message, O SyncError **error); OSYNC_EXPORT OSyncMessage *osync_message_new_reply(OSyncMessage *message, O SyncError **error);
OSYNC_EXPORT OSyncMessage *osync_message_new_errorreply(OSyncMessage *messa ge, OSyncError *error, OSyncError **loc_error); OSYNC_EXPORT OSyncMessage *osync_message_new_errorreply(OSyncMessage *messa ge, OSyncError *error, OSyncError **loc_error);
OSYNC_EXPORT OSyncMessage *osync_message_new_error(OSyncError *error, OSync Error **loc_error); OSYNC_EXPORT OSyncMessage *osync_message_new_error(OSyncError *error, OSync Error **loc_error);
OSYNC_EXPORT OSyncMessage *osync_message_new_queue_error(OSyncError *error, OSyncError **loc_error); OSYNC_EXPORT OSyncMessage *osync_message_new_queue_error(OSyncError *error, OSyncError **loc_error);
OSYNC_EXPORT OSyncMessage *osync_message_ref(OSyncMessage *message); OSYNC_EXPORT OSyncMessage *osync_message_ref(OSyncMessage *message);
OSYNC_EXPORT void osync_message_unref(OSyncMessage *message); OSYNC_EXPORT void osync_message_unref(OSyncMessage *message);
OSYNC_EXPORT void osync_message_set_cmd(OSyncMessage *message, OSyncMessage Command cmd); OSYNC_EXPORT void osync_message_set_cmd(OSyncMessage *message, OSyncMessage Command cmd);
OSYNC_EXPORT OSyncMessageCommand osync_message_get_cmd(OSyncMessage *messag e); OSYNC_EXPORT OSyncMessageCommand osync_message_get_cmd(OSyncMessage *messag e);
OSYNC_EXPORT void osync_message_set_id(OSyncMessage *message, long long int id); OSYNC_EXPORT void osync_message_set_id(OSyncMessage *message, long long int id);
OSYNC_EXPORT long long int osync_message_get_id(OSyncMessage *message); OSYNC_EXPORT long long int osync_message_get_id(OSyncMessage *message);
OSYNC_EXPORT unsigned int osync_message_get_message_size(OSyncMessage *mess age); OSYNC_EXPORT unsigned int osync_message_get_message_size(OSyncMessage *mess age);
OSYNC_EXPORT void osync_message_set_message_size(OSyncMessage *message, uns igned int size); OSYNC_EXPORT void osync_message_set_message_size(OSyncMessage *message, uns igned int size);
OSYNC_EXPORT void osync_message_get_buffer(OSyncMessage *message, char **da ta, unsigned int *size); OSYNC_EXPORT void osync_message_get_buffer(OSyncMessage *message, char **da ta, unsigned int *size);
OSYNC_EXPORT void osync_message_set_handler(OSyncMessage *message, OSyncMes sageHandler handler, void *user_data); OSYNC_EXPORT void osync_message_set_handler(OSyncMessage *message, OSyncMes sageHandler handler, void *user_data);
OSYNC_EXPORT OSyncMessageHandler osync_message_get_handler(OSyncMessage *me ssage); OSYNC_EXPORT OSyncMessageHandler osync_message_get_handler(OSyncMessage *me ssage);
OSYNC_EXPORT void *osync_message_get_handler_data(OSyncMessage *message); OSYNC_EXPORT void *osync_message_get_handler_data(OSyncMessage *message);
OSYNC_EXPORT osync_bool osync_message_is_error(OSyncMessage *message); OSYNC_EXPORT osync_bool osync_message_is_error(OSyncMessage *message);
OSYNC_EXPORT osync_bool osync_message_send_message(OSyncMessage *message, O
SyncError **error);
OSYNC_EXPORT osync_bool osync_message_send_with_timeout(OSyncMessage *messa
ge, OSyncQueue *queue, OSyncQueue *replyQueue, int timeout, OSyncError **er
ror);
OSYNC_EXPORT OSyncMessageCommand osync_message_get_command(OSyncMessage *me ssage); OSYNC_EXPORT OSyncMessageCommand osync_message_get_command(OSyncMessage *me ssage);
OSYNC_EXPORT char* osync_message_get_commandstr(OSyncMessage *message); OSYNC_EXPORT char* osync_message_get_commandstr(OSyncMessage *message);
OSYNC_EXPORT void osync_message_reset_timeout(OSyncMessage *message);
OSYNC_EXPORT osync_bool osync_message_is_answered(OSyncMessage *message); OSYNC_EXPORT osync_bool osync_message_is_answered(OSyncMessage *message);
OSYNC_EXPORT void osync_message_set_answered(OSyncMessage *message); OSYNC_EXPORT void osync_message_set_answered(OSyncMessage *message);
OSYNC_EXPORT void osync_message_write_int(OSyncMessage *message, int value) ; OSYNC_EXPORT void osync_message_write_int(OSyncMessage *message, int value) ;
OSYNC_EXPORT void osync_message_write_uint(OSyncMessage *message, unsigned int value);
OSYNC_EXPORT void osync_message_write_long_long_int(OSyncMessage *message, long long int value); OSYNC_EXPORT void osync_message_write_long_long_int(OSyncMessage *message, long long int value);
OSYNC_EXPORT void osync_message_write_string(OSyncMessage *message, const c har *value); OSYNC_EXPORT void osync_message_write_string(OSyncMessage *message, const c har *value);
OSYNC_EXPORT void osync_message_write_data(OSyncMessage *message, const voi d *value, int size); OSYNC_EXPORT void osync_message_write_data(OSyncMessage *message, const voi d *value, int size);
OSYNC_EXPORT void osync_message_write_buffer(OSyncMessage *message, const v oid *value, int size); OSYNC_EXPORT void osync_message_write_buffer(OSyncMessage *message, const v oid *value, int size);
OSYNC_EXPORT void osync_message_read_int(OSyncMessage *message, int *value) ; OSYNC_EXPORT void osync_message_read_int(OSyncMessage *message, int *value) ;
OSYNC_EXPORT void osync_message_read_uint(OSyncMessage *message, unsigned i nt *value);
OSYNC_EXPORT void osync_message_read_long_long_int(OSyncMessage *message, l ong long int *value); OSYNC_EXPORT void osync_message_read_long_long_int(OSyncMessage *message, l ong long int *value);
OSYNC_EXPORT void osync_message_read_string(OSyncMessage *message, char **v alue); OSYNC_EXPORT void osync_message_read_string(OSyncMessage *message, char **v alue);
OSYNC_EXPORT void osync_message_read_data(OSyncMessage *message, void *valu e, int size); OSYNC_EXPORT void osync_message_read_data(OSyncMessage *message, void *valu e, int size);
OSYNC_EXPORT void osync_message_read_const_data(OSyncMessage *message, void **value, int size); OSYNC_EXPORT void osync_message_read_const_data(OSyncMessage *message, void **value, int size);
OSYNC_EXPORT void osync_message_read_const_string(OSyncMessage *message, ch ar **value); OSYNC_EXPORT void osync_message_read_const_string(OSyncMessage *message, ch ar **value);
OSYNC_EXPORT void osync_message_read_buffer(OSyncMessage *message, void **v alue, int *size); OSYNC_EXPORT void osync_message_read_buffer(OSyncMessage *message, void **v alue, int *size);
#endif //_OPENSYNC_MESSAGES_H #endif /*_OPENSYNC_MESSAGES_H*/
 End of changes. 9 change blocks. 
11 lines changed or deleted 27 lines changed or added


 opensync_obj_engine.h   opensync_obj_engine.h 
skipping to change at line 38 skipping to change at line 38
OSYNC_EXPORT void osync_obj_engine_unref(OSyncObjEngine *engine); OSYNC_EXPORT void osync_obj_engine_unref(OSyncObjEngine *engine);
OSYNC_EXPORT osync_bool osync_obj_engine_initialize(OSyncObjEngine *engine, OSyncError **error); OSYNC_EXPORT osync_bool osync_obj_engine_initialize(OSyncObjEngine *engine, OSyncError **error);
OSYNC_EXPORT void osync_obj_engine_finalize(OSyncObjEngine *engine); OSYNC_EXPORT void osync_obj_engine_finalize(OSyncObjEngine *engine);
OSYNC_EXPORT const char *osync_obj_engine_get_objtype(OSyncObjEngine *engin e); OSYNC_EXPORT const char *osync_obj_engine_get_objtype(OSyncObjEngine *engin e);
OSYNC_EXPORT void osync_obj_engine_set_slowsync(OSyncObjEngine *engine, osy nc_bool slowsync); OSYNC_EXPORT void osync_obj_engine_set_slowsync(OSyncObjEngine *engine, osy nc_bool slowsync);
OSYNC_EXPORT osync_bool osync_obj_engine_get_slowsync(OSyncObjEngine *engin e); OSYNC_EXPORT osync_bool osync_obj_engine_get_slowsync(OSyncObjEngine *engin e);
OSYNC_EXPORT void osync_obj_engine_event(OSyncObjEngine *objengine, OSyncEn gineEvent event); OSYNC_EXPORT void osync_obj_engine_event(OSyncObjEngine *objengine, OSyncEn gineEvent event, OSyncError *error);
OSYNC_EXPORT osync_bool osync_obj_engine_command(OSyncObjEngine *engine, OS yncEngineCmd cmd, OSyncError **error); OSYNC_EXPORT osync_bool osync_obj_engine_command(OSyncObjEngine *engine, OS yncEngineCmd cmd, OSyncError **error);
OSYNC_EXPORT void osync_obj_engine_set_callback(OSyncObjEngine *engine, OSy ncObjEngineEventCallback callback, void *userdata); OSYNC_EXPORT void osync_obj_engine_set_callback(OSyncObjEngine *engine, OSy ncObjEngineEventCallback callback, void *userdata);
OSYNC_EXPORT osync_bool osync_obj_engine_receive_change(OSyncObjEngine *obj engine, OSyncClientProxy *proxy, OSyncChange *change, OSyncError **error); OSYNC_EXPORT osync_bool osync_obj_engine_receive_change(OSyncObjEngine *obj engine, OSyncClientProxy *proxy, OSyncChange *change, OSyncError **error);
OSYNC_EXPORT void osync_obj_engine_set_error(OSyncObjEngine *engine, OSyncE rror *error); OSYNC_EXPORT void osync_obj_engine_set_error(OSyncObjEngine *engine, OSyncE rror *error);
#endif /*OPENSYNC_OBJ_ENGINE_H_*/ #endif /*OPENSYNC_OBJ_ENGINE_H_*/
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 opensync_plugin.h   opensync_plugin.h 
skipping to change at line 74 skipping to change at line 74
OSYNC_EXPORT void osync_plugin_set_discover(OSyncPlugin *plugin, discover_f n discover); OSYNC_EXPORT void osync_plugin_set_discover(OSyncPlugin *plugin, discover_f n discover);
OSYNC_EXPORT void *osync_plugin_get_data(OSyncPlugin *plugin); OSYNC_EXPORT void *osync_plugin_get_data(OSyncPlugin *plugin);
OSYNC_EXPORT void osync_plugin_set_data(OSyncPlugin *plugin, void *data); OSYNC_EXPORT void osync_plugin_set_data(OSyncPlugin *plugin, void *data);
OSYNC_EXPORT void *osync_plugin_initialize(OSyncPlugin *plugin, OSyncPlugin Info *info, OSyncError **error); OSYNC_EXPORT void *osync_plugin_initialize(OSyncPlugin *plugin, OSyncPlugin Info *info, OSyncError **error);
OSYNC_EXPORT void osync_plugin_finalize(OSyncPlugin *plugin, void *data); OSYNC_EXPORT void osync_plugin_finalize(OSyncPlugin *plugin, void *data);
OSYNC_EXPORT osync_bool osync_plugin_discover(OSyncPlugin *plugin, void *da ta, OSyncPluginInfo *info, OSyncError **error); OSYNC_EXPORT osync_bool osync_plugin_discover(OSyncPlugin *plugin, void *da ta, OSyncPluginInfo *info, OSyncError **error);
OSYNC_EXPORT osync_bool osync_plugin_is_usable(OSyncPlugin *plugin, OSyncEr ror **error); OSYNC_EXPORT osync_bool osync_plugin_is_usable(OSyncPlugin *plugin, OSyncEr ror **error);
OSYNC_EXPORT unsigned int osync_plugin_get_discover_timeout(OSyncPlugin *pl
ugin);
OSYNC_EXPORT void osync_plugin_set_discover_timeout(OSyncPlugin *plugin, un
signed int timeout);
OSYNC_EXPORT unsigned int osync_plugin_get_initialize_timeout(OSyncPlugin *
plugin);
OSYNC_EXPORT void osync_plugin_set_initialize_timeout(OSyncPlugin *plugin,
unsigned int timeout);
OSYNC_EXPORT unsigned int osync_plugin_get_finalize_timeout(OSyncPlugin *pl
ugin);
OSYNC_EXPORT void osync_plugin_set_finalize_timeout(OSyncPlugin *plugin, un
signed int timeout);
OSYNC_EXPORT unsigned int osync_plugin_get_useable_timeout(OSyncPlugin *plu
gin);
OSYNC_EXPORT void osync_plugin_set_useable_timeout(OSyncPlugin *plugin, uns
igned int timeout);
#endif //_OPENSYNC_PLUGIN_H_ #endif //_OPENSYNC_PLUGIN_H_
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 lines changed or added


 opensync_plugin_info.h   opensync_plugin_info.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef OPENSYNC_PLUGIN_INFO_H_ #ifndef OPENSYNC_PLUGIN_INFO_H_
#define OPENSYNC_PLUGIN_INFO_H_ #define OPENSYNC_PLUGIN_INFO_H_
OSYNC_EXPORT OSyncPluginInfo *osync_plugin_info_new(OSyncError **error); OSYNC_EXPORT OSyncPluginInfo *osync_plugin_info_new(OSyncError **error);
OSYNC_EXPORT OSyncPluginInfo *osync_plugin_info_ref(OSyncPluginInfo *info); OSYNC_EXPORT OSyncPluginInfo *osync_plugin_info_ref(OSyncPluginInfo *info);
OSYNC_EXPORT void osync_plugin_info_unref(OSyncPluginInfo *info); OSYNC_EXPORT void osync_plugin_info_unref(OSyncPluginInfo *info);
OSYNC_EXPORT void osync_plugin_info_set_loop(OSyncPluginInfo *info, void *l oop); OSYNC_EXPORT void osync_plugin_info_set_loop(OSyncPluginInfo *info, void *l oop);
OSYNC_EXPORT void *osync_plugin_info_get_loop(OSyncPluginInfo *info); OSYNC_EXPORT void *osync_plugin_info_get_loop(OSyncPluginInfo *info);
OSYNC_EXPORT void osync_plugin_info_set_config(OSyncPluginInfo *info, const OSYNC_EXPORT void osync_plugin_info_set_config(OSyncPluginInfo *info, OSync
char *config); PluginConfig *config);
OSYNC_EXPORT const char *osync_plugin_info_get_config(OSyncPluginInfo *info OSYNC_EXPORT OSyncPluginConfig *osync_plugin_info_get_config(OSyncPluginInf
); o *info);
OSYNC_EXPORT void osync_plugin_info_set_configdir(OSyncPluginInfo *info, co nst char *configdir); OSYNC_EXPORT void osync_plugin_info_set_configdir(OSyncPluginInfo *info, co nst char *configdir);
OSYNC_EXPORT const char *osync_plugin_info_get_configdir(OSyncPluginInfo *i nfo); OSYNC_EXPORT const char *osync_plugin_info_get_configdir(OSyncPluginInfo *i nfo);
OSYNC_EXPORT OSyncObjTypeSink *osync_plugin_info_find_objtype(OSyncPluginIn fo *info, const char *name); OSYNC_EXPORT OSyncObjTypeSink *osync_plugin_info_find_objtype(OSyncPluginIn fo *info, const char *name);
OSYNC_EXPORT void osync_plugin_info_add_objtype(OSyncPluginInfo *info, OSyn cObjTypeSink *sink); OSYNC_EXPORT void osync_plugin_info_add_objtype(OSyncPluginInfo *info, OSyn cObjTypeSink *sink);
OSYNC_EXPORT int osync_plugin_info_num_objtypes(OSyncPluginInfo *info); OSYNC_EXPORT unsigned int osync_plugin_info_num_objtypes(OSyncPluginInfo *i
OSYNC_EXPORT OSyncObjTypeSink *osync_plugin_info_nth_objtype(OSyncPluginInf nfo);
o *info, int nth); OSYNC_EXPORT OSyncObjTypeSink *osync_plugin_info_nth_objtype(OSyncPluginInf
o *info, unsigned int nth);
OSYNC_EXPORT OSyncObjTypeSink *osync_plugin_info_get_main_sink(OSyncPluginI nfo *info); OSYNC_EXPORT OSyncObjTypeSink *osync_plugin_info_get_main_sink(OSyncPluginI nfo *info);
OSYNC_EXPORT void osync_plugin_info_set_main_sink(OSyncPluginInfo *info, OS yncObjTypeSink *sink); OSYNC_EXPORT void osync_plugin_info_set_main_sink(OSyncPluginInfo *info, OS yncObjTypeSink *sink);
OSYNC_EXPORT OSyncFormatEnv *osync_plugin_info_get_format_env(OSyncPluginIn fo *info); OSYNC_EXPORT OSyncFormatEnv *osync_plugin_info_get_format_env(OSyncPluginIn fo *info);
OSYNC_EXPORT void osync_plugin_info_set_format_env(OSyncPluginInfo *info, O SyncFormatEnv *env); OSYNC_EXPORT void osync_plugin_info_set_format_env(OSyncPluginInfo *info, O SyncFormatEnv *env);
OSYNC_EXPORT OSyncObjTypeSink *osync_plugin_info_get_sink(OSyncPluginInfo * info); OSYNC_EXPORT OSyncObjTypeSink *osync_plugin_info_get_sink(OSyncPluginInfo * info);
OSYNC_EXPORT void osync_plugin_info_set_sink(OSyncPluginInfo *info, OSyncOb jTypeSink *sink); OSYNC_EXPORT void osync_plugin_info_set_sink(OSyncPluginInfo *info, OSyncOb jTypeSink *sink);
 End of changes. 3 change blocks. 
7 lines changed or deleted 28 lines changed or added


 opensync_queue.h   opensync_queue.h 
/*
* libopensync - A synchronization engine for the opensync framework
* Copyright (C) 2004-2005 Armin Bauer <armin.bauer@opensync.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef _OPENSYNC_QUEUE_H #ifndef _OPENSYNC_QUEUE_H
#define _OPENSYNC_QUEUE_H #define _OPENSYNC_QUEUE_H
/** /**
* @defgroup OSEngineQueue OpenSync Message Queues Internals * @ingroup OSyncQueue
* @ingroup OSEnginePrivate
* @brief A Queue used for asynchronous communication between thread * @brief A Queue used for asynchronous communication between thread
*
*/ */
/*@{*/ /*@{*/
/*! @brief The type of a queue event
*
*/
typedef enum { typedef enum {
OSYNC_QUEUE_EVENT_NONE, OSYNC_QUEUE_EVENT_NONE,
OSYNC_QUEUE_EVENT_READ, OSYNC_QUEUE_EVENT_READ,
OSYNC_QUEUE_EVENT_ERROR, OSYNC_QUEUE_EVENT_ERROR,
OSYNC_QUEUE_EVENT_HUP OSYNC_QUEUE_EVENT_HUP
} OSyncQueueEvent; } OSyncQueueEvent;
/*! @brief The queue type
*
*/
typedef enum { typedef enum {
OSYNC_QUEUE_SENDER, OSYNC_QUEUE_SENDER,
OSYNC_QUEUE_RECEIVER OSYNC_QUEUE_RECEIVER
} OSyncQueueType; } OSyncQueueType;
/*@}*/
OSYNC_EXPORT OSyncQueue *osync_queue_new(const char *name, OSyncError **err or); OSYNC_EXPORT OSyncQueue *osync_queue_new(const char *name, OSyncError **err or);
OSYNC_EXPORT OSyncQueue *osync_queue_new_from_fd(int fd, OSyncError **error ); OSYNC_EXPORT OSyncQueue *osync_queue_new_from_fd(int fd, OSyncError **error );
OSYNC_EXPORT osync_bool osync_queue_new_pipes(OSyncQueue **read_queue, OSyn cQueue **write_queue, OSyncError **error); OSYNC_EXPORT osync_bool osync_queue_new_pipes(OSyncQueue **read_queue, OSyn cQueue **write_queue, OSyncError **error);
OSYNC_EXPORT osync_bool osync_queue_create(OSyncQueue *queue, OSyncError ** error); OSYNC_EXPORT osync_bool osync_queue_create(OSyncQueue *queue, OSyncError ** error);
OSYNC_EXPORT void osync_queue_free(OSyncQueue *queue); OSYNC_EXPORT void osync_queue_free(OSyncQueue *queue);
OSYNC_EXPORT osync_bool osync_queue_remove(OSyncQueue *queue, OSyncError ** error); OSYNC_EXPORT osync_bool osync_queue_remove(OSyncQueue *queue, OSyncError ** error);
OSYNC_EXPORT osync_bool osync_queue_exists(OSyncQueue *queue); OSYNC_EXPORT osync_bool osync_queue_exists(OSyncQueue *queue);
OSYNC_EXPORT osync_bool osync_queue_connect(OSyncQueue *queue, OSyncQueueTy pe type, OSyncError **error); OSYNC_EXPORT osync_bool osync_queue_connect(OSyncQueue *queue, OSyncQueueTy pe type, OSyncError **error);
OSYNC_EXPORT osync_bool osync_queue_disconnect(OSyncQueue *queue, OSyncErro r **error); OSYNC_EXPORT osync_bool osync_queue_disconnect(OSyncQueue *queue, OSyncErro r **error);
OSYNC_EXPORT osync_bool osync_queue_is_connected(OSyncQueue *queue); OSYNC_EXPORT osync_bool osync_queue_is_connected(OSyncQueue *queue);
OSYNC_EXPORT void osync_queue_set_message_handler(OSyncQueue *queue, OSyncM essageHandler handler, gpointer user_data); OSYNC_EXPORT void osync_queue_set_message_handler(OSyncQueue *queue, OSyncM essageHandler handler, gpointer user_data);
OSYNC_EXPORT osync_bool osync_queue_send_message(OSyncQueue *queue, OSyncQu eue *replyqueue, OSyncMessage *message, OSyncError **error); OSYNC_EXPORT osync_bool osync_queue_send_message(OSyncQueue *queue, OSyncQu eue *replyqueue, OSyncMessage *message, OSyncError **error);
OSYNC_EXPORT osync_bool osync_queue_send_message_with_timeout(OSyncQueue *q ueue, OSyncQueue *replyqueue, OSyncMessage *message, int timeout, OSyncErro r **error); OSYNC_EXPORT osync_bool osync_queue_send_message_with_timeout(OSyncQueue *q ueue, OSyncQueue *replyqueue, OSyncMessage *message, unsigned int timeout, OSyncError **error);
OSYNC_EXPORT void osync_queue_setup_with_gmainloop(OSyncQueue *queue, GMain Context *context); OSYNC_EXPORT void osync_queue_setup_with_gmainloop(OSyncQueue *queue, GMain Context *context);
OSYNC_EXPORT osync_bool osync_queue_dispatch(OSyncQueue *queue, OSyncError **error); OSYNC_EXPORT osync_bool osync_queue_dispatch(OSyncQueue *queue, OSyncError **error);
OSYNC_EXPORT OSyncQueueEvent osync_queue_poll(OSyncQueue *queue); OSYNC_EXPORT OSyncQueueEvent osync_queue_poll(OSyncQueue *queue);
OSYNC_EXPORT OSyncMessage *osync_queue_get_message(OSyncQueue *queue); OSYNC_EXPORT OSyncMessage *osync_queue_get_message(OSyncQueue *queue);
OSYNC_EXPORT const char *osync_queue_get_path(OSyncQueue *queue); OSYNC_EXPORT const char *osync_queue_get_path(OSyncQueue *queue);
OSYNC_EXPORT int osync_queue_get_fd(OSyncQueue *queue); OSYNC_EXPORT int osync_queue_get_fd(OSyncQueue *queue);
 End of changes. 7 change blocks. 
4 lines changed or deleted 32 lines changed or added


 opensync_serializer.h   opensync_serializer.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_SERIALIZER_H_ #ifndef _OPENSYNC_SERIALIZER_H_
#define _OPENSYNC_SERIALIZER_H_ #define _OPENSYNC_SERIALIZER_H_
osync_bool osync_marshal_data(OSyncMessage *message, OSyncData *data, OSync OSYNC_EXPORT osync_bool osync_marshal_data(OSyncMessage *message, OSyncData
Error **error); *data, OSyncError **error);
osync_bool osync_demarshal_data(OSyncMessage *message, OSyncData **data, OS OSYNC_EXPORT osync_bool osync_demarshal_data(OSyncMessage *message, OSyncDa
yncFormatEnv *env, OSyncError **error); ta **data, OSyncFormatEnv *env, OSyncError **error);
osync_bool osync_marshal_change(OSyncMessage *message, OSyncChange *change, OSYNC_EXPORT osync_bool osync_marshal_change(OSyncMessage *message, OSyncCh
OSyncError **error); ange *change, OSyncError **error);
osync_bool osync_demarshal_change(OSyncMessage *message, OSyncChange **chan OSYNC_EXPORT osync_bool osync_demarshal_change(OSyncMessage *message, OSync
ge, OSyncFormatEnv *env, OSyncError **error); Change **change, OSyncFormatEnv *env, OSyncError **error);
void osync_marshal_error(OSyncMessage *message, OSyncError *error); OSYNC_EXPORT void osync_marshal_error(OSyncMessage *message, OSyncError *er
void osync_demarshal_error(OSyncMessage *message, OSyncError **error); ror);
OSYNC_EXPORT void osync_demarshal_error(OSyncMessage *message, OSyncError *
*error);
osync_bool osync_marshal_objtype_sink(OSyncMessage *message, OSyncObjTypeSi OSYNC_EXPORT osync_bool osync_marshal_objformat_sink(OSyncMessage *message,
nk *sink, OSyncError **error); OSyncObjFormatSink *sink, OSyncError **error);
osync_bool osync_demarshal_objtype_sink(OSyncMessage *message, OSyncObjType OSYNC_EXPORT osync_bool osync_demarshal_objformat_sink(OSyncMessage *messag
Sink **sink, OSyncError **error); e, OSyncObjFormatSink **sink, OSyncError **error);
OSYNC_EXPORT osync_bool osync_marshal_objtype_sink(OSyncMessage *message, O
SyncObjTypeSink *sink, OSyncError **error);
OSYNC_EXPORT osync_bool osync_demarshal_objtype_sink(OSyncMessage *message,
OSyncObjTypeSink **sink, OSyncError **error);
OSYNC_EXPORT osync_bool osync_marshal_pluginconfig(OSyncMessage *message, O
SyncPluginConfig *config, OSyncError **error);
OSYNC_EXPORT osync_bool osync_demarshal_pluginconfig(OSyncMessage *message,
OSyncPluginConfig **config, OSyncError **error);
#endif #endif
 End of changes. 4 change blocks. 
14 lines changed or deleted 26 lines changed or added


 opensync_sink.h   opensync_sink.h 
skipping to change at line 46 skipping to change at line 46
OSyncSinkDisconnectFn disconnect; OSyncSinkDisconnectFn disconnect;
OSyncSinkGetChangesFn get_changes; OSyncSinkGetChangesFn get_changes;
OSyncSinkCommitFn commit; OSyncSinkCommitFn commit;
OSyncSinkWriteFn write; OSyncSinkWriteFn write;
OSyncSinkCommittedAllFn committed_all; OSyncSinkCommittedAllFn committed_all;
OSyncSinkReadFn read; OSyncSinkReadFn read;
OSyncSinkBatchCommitFn batch_commit; OSyncSinkBatchCommitFn batch_commit;
OSyncSinkSyncDoneFn sync_done; OSyncSinkSyncDoneFn sync_done;
} OSyncObjTypeSinkFunctions; } OSyncObjTypeSinkFunctions;
OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_main_sink_new(OSyncError **err or);
OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_sink_new(const char *objtype, OSyncError **error); OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_sink_new(const char *objtype, OSyncError **error);
OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_sink_ref(OSyncObjTypeSink *sin k); OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_sink_ref(OSyncObjTypeSink *sin k);
OSYNC_EXPORT void osync_objtype_sink_unref(OSyncObjTypeSink *sink); OSYNC_EXPORT void osync_objtype_sink_unref(OSyncObjTypeSink *sink);
OSYNC_EXPORT const char *osync_objtype_sink_get_name(OSyncObjTypeSink *sink ); OSYNC_EXPORT const char *osync_objtype_sink_get_name(OSyncObjTypeSink *sink );
OSYNC_EXPORT void osync_objtype_sink_set_name(OSyncObjTypeSink *sink, const char *name); OSYNC_EXPORT void osync_objtype_sink_set_name(OSyncObjTypeSink *sink, const char *name);
OSYNC_EXPORT int osync_objtype_sink_num_objformats(OSyncObjTypeSink *sink); OSYNC_EXPORT unsigned int osync_objtype_sink_num_objformat_sinks(OSyncObjTy
OSYNC_EXPORT const char *osync_objtype_sink_nth_objformat(OSyncObjTypeSink peSink *sink);
*sink, int nth); OSYNC_EXPORT OSyncObjFormatSink *osync_objtype_sink_nth_objformat_sink(OSyn
OSYNC_EXPORT void osync_objtype_sink_add_objformat(OSyncObjTypeSink *sink, cObjTypeSink *sink, unsigned int nth);
const char *format); OSYNC_EXPORT OSyncObjFormatSink *osync_objtype_sink_find_objformat_sink(OSy
OSYNC_EXPORT void osync_objtype_sink_remove_objformat(OSyncObjTypeSink *sin ncObjTypeSink *sink, OSyncObjFormat *objformat);
k, const char *format); OSYNC_EXPORT OSyncList *osync_objtype_sink_get_objformat_sinks(OSyncObjType
Sink *sink);
OSYNC_EXPORT void osync_objtype_sink_add_objformat_sink(OSyncObjTypeSink *s
ink, OSyncObjFormatSink *objformatsink);
OSYNC_EXPORT void osync_objtype_sink_remove_objformat_sink(OSyncObjTypeSink
*sink, OSyncObjFormatSink *objformatsink);
OSYNC_EXPORT void osync_objtype_sink_set_functions(OSyncObjTypeSink *sink, OSyncObjTypeSinkFunctions functions, void *userdata); OSYNC_EXPORT void osync_objtype_sink_set_functions(OSyncObjTypeSink *sink, OSyncObjTypeSinkFunctions functions, void *userdata);
OSYNC_EXPORT void *osync_objtype_sink_get_userdata(OSyncObjTypeSink *sink); OSYNC_EXPORT void *osync_objtype_sink_get_userdata(OSyncObjTypeSink *sink);
OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_read(OSyncObjTypeSi nk *sink); OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_read(OSyncObjTypeSi nk *sink);
OSYNC_EXPORT void osync_objtype_sink_set_function_read(OSyncObjTypeSink *si nk, osync_bool read); OSYNC_EXPORT void osync_objtype_sink_set_function_read(OSyncObjTypeSink *si nk, osync_bool read);
OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_getchanges(OSyncObj TypeSink *sink); OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_getchanges(OSyncObj TypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_function_getchanges(OSyncObjTypeSi nk *sink, osync_bool getchanges); OSYNC_EXPORT void osync_objtype_sink_set_function_getchanges(OSyncObjTypeSi nk *sink, osync_bool getchanges);
skipping to change at line 97 skipping to change at line 100
OSYNC_EXPORT osync_bool osync_objtype_sink_get_getchanges(OSyncObjTypeSink *sink); OSYNC_EXPORT osync_bool osync_objtype_sink_get_getchanges(OSyncObjTypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_getchanges(OSyncObjTypeSink *sink, osync_bool write); OSYNC_EXPORT void osync_objtype_sink_set_getchanges(OSyncObjTypeSink *sink, osync_bool write);
OSYNC_EXPORT osync_bool osync_objtype_sink_get_read(OSyncObjTypeSink *sink) ; OSYNC_EXPORT osync_bool osync_objtype_sink_get_read(OSyncObjTypeSink *sink) ;
OSYNC_EXPORT void osync_objtype_sink_set_read(OSyncObjTypeSink *sink, osync _bool read); OSYNC_EXPORT void osync_objtype_sink_set_read(OSyncObjTypeSink *sink, osync _bool read);
OSYNC_EXPORT osync_bool osync_objtype_sink_get_slowsync(OSyncObjTypeSink *s ink); OSYNC_EXPORT osync_bool osync_objtype_sink_get_slowsync(OSyncObjTypeSink *s ink);
OSYNC_EXPORT void osync_objtype_sink_set_slowsync(OSyncObjTypeSink *sink, o sync_bool slowsync); OSYNC_EXPORT void osync_objtype_sink_set_slowsync(OSyncObjTypeSink *sink, o sync_bool slowsync);
const OSyncList *osync_objtype_sink_get_objformats(OSyncObjTypeSink *sink); OSYNC_EXPORT void osync_objtype_sink_set_connect_timeout(OSyncObjTypeSink *
sink, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_connect_timeout_or_default
(OSyncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_connect_timeout(OSyncObjTy
peSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_disconnect_timeout(OSyncObjTypeSin
k *sink, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_disconnect_timeout_or_defa
ult(OSyncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_disconnect_timeout(OSyncOb
jTypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_getchanges_timeout(OSyncObjTypeSin
k *sink, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_getchanges_timeout_or_defa
ult(OSyncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_getchanges_timeout(OSyncOb
jTypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_commit_timeout(OSyncObjTypeSink *s
ink, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_commit_timeout_or_default(
OSyncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_commit_timeout(OSyncObjTyp
eSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_batchcommit_timeout(OSyncObjTypeSi
nk *sink, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_batchcommit_timeout_or_def
ault(OSyncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_batchcommit_timeout(OSyncO
bjTypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_committedall_timeout(OSyncObjTypeS
ink *sink, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_committedall_timeout_or_de
fault(OSyncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_committedall_timeout(OSync
ObjTypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_syncdone_timeout(OSyncObjTypeSink
*sink, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_syncdone_timeout_or_defaul
t(OSyncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_syncdone_timeout(OSyncObjT
ypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_write_timeout(OSyncObjTypeSink *si
nk, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_write_timeout_or_default(O
SyncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_write_timeout(OSyncObjType
Sink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_read_timeout(OSyncObjTypeSink *sin
k, unsigned int timeout);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_read_timeout_or_default(OS
yncObjTypeSink *sink);
OSYNC_EXPORT unsigned int osync_objtype_sink_get_read_timeout(OSyncObjTypeS
ink *sink);
#endif //_OPENSYNC_SINK_H_ #endif //_OPENSYNC_SINK_H_
 End of changes. 3 change blocks. 
8 lines changed or deleted 75 lines changed or added


 opensync_time.h   opensync_time.h 
/*
* libopensync - A synchronization framework
* Copyright (C) 2007-2008 Daniel Gollub <dgollub@suse.de>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef _OPENSYNC_TIME_H_ #ifndef _OPENSYNC_TIME_H_
#define _OPENSYNC_TIME_H_ #define _OPENSYNC_TIME_H_
/* /*
* Note: in all functions below that require a timezone offset, * Note: in all functions below that require a timezone offset,
* they *require* the caller to be completely accurate with it, * they *require* the caller to be completely accurate with it,
* including in the DST case. The result is only as accurate * including in the DST case. The result is only as accurate
* as the offset you provide. * as the offset you provide.
*/ */
/* Timeformat helper */ /* Timeformat helper */
char *osync_time_timestamp(const char *vtime); OSYNC_EXPORT char *osync_time_timestamp(const char *vtime);
char *osync_time_datestamp(const char *vtime); OSYNC_EXPORT char *osync_time_datestamp(const char *vtime);
osync_bool osync_time_isdate(const char *vformat); OSYNC_EXPORT osync_bool osync_time_isdate(const char *vformat);
osync_bool osync_time_isutc(const char *vformat); OSYNC_EXPORT osync_bool osync_time_isutc(const char *vformat);
//char *osync_time_set_vtime(const char *vtime, const char *time, osync_boo l is_utc); //char *osync_time_set_vtime(const char *vtime, const char *time, osync_boo l is_utc);
/* String <-> struct converters, no smarts */ /* String <-> struct converters, no smarts */
struct tm *osync_time_vtime2tm(const char *vtime); OSYNC_EXPORT struct tm *osync_time_vtime2tm(const char *vtime);
char *osync_time_tm2vtime(const struct tm *time, osync_bool is_utc); OSYNC_EXPORT char *osync_time_tm2vtime(const struct tm *time, osync_bool is
_utc);
/* Timetype helper */ /* Timetype helper */
time_t osync_time_vtime2unix(const char *vtime, int offset); OSYNC_EXPORT time_t osync_time_vtime2unix(const char *vtime, int offset);
char *osync_time_unix2vtime(const time_t *timestamp); OSYNC_EXPORT char *osync_time_unix2vtime(const time_t *timestamp);
/* Unix time_t converters */ /* Unix time_t converters */
time_t osync_time_localtm2unix(const struct tm *tmtime); // aka, mktime() OSYNC_EXPORT time_t osync_time_localtm2unix(const struct tm *tmtime); // ak
time_t osync_time_utctm2unix(const struct tm *tmtime); // actually usef a, mktime()
ul! OSYNC_EXPORT time_t osync_time_utctm2unix(const struct tm *tmtime); //
struct tm *osync_time_unix2localtm(const time_t *timestamp);// aka, localti actually useful!
me() OSYNC_EXPORT struct tm *osync_time_unix2localtm(const time_t *timestamp);//
struct tm *osync_time_unix2utctm(const time_t *timestamp); // aka, gmtime( aka, localtime()
) OSYNC_EXPORT struct tm *osync_time_unix2utctm(const time_t *timestamp); //
aka, gmtime()
/* Timezone helper */ /* Timezone helper */
/* System Timezone-Reliable Helpers */ /* System Timezone-Reliable Helpers */
int osync_time_timezone_diff(const struct tm *local); OSYNC_EXPORT int osync_time_timezone_diff(const struct tm *local);
struct tm *osync_time_tm2utc(const struct tm *ltime, int offset); OSYNC_EXPORT struct tm *osync_time_tm2utc(const struct tm *ltime, int offse
struct tm *osync_time_tm2localtime(const struct tm *utime, int offset); t);
char *osync_time_vtime2utc(const char* localtime, int offset); OSYNC_EXPORT struct tm *osync_time_tm2localtime(const struct tm *utime, int
char *osync_time_vtime2localtime(const char* utc, int offset); offset);
OSYNC_EXPORT char *osync_time_vtime2utc(const char* localtime, int offset);
OSYNC_EXPORT char *osync_time_vtime2localtime(const char* utc, int offset);
/* XXX This functions should only be used as workaround for plugins which /* XXX This functions should only be used as workaround for plugins which
only supports localtime without any timezone information. */ only supports localtime without any timezone information. */
char *osync_time_vcal2localtime(const char *vcal); OSYNC_EXPORT char *osync_time_vcal2localtime(const char *vcal);
char *osync_time_vcal2utc(const char *vcal); OSYNC_EXPORT char *osync_time_vcal2utc(const char *vcal);
/* Alarm Duration Timeformat helper */ /* Alarm Duration Timeformat helper */
char *osync_time_sec2alarmdu(int seconds); OSYNC_EXPORT char *osync_time_sec2alarmdu(int seconds);
int osync_time_alarmdu2sec(const char *alarm); OSYNC_EXPORT int osync_time_alarmdu2sec(const char *alarm);
/* Timezone ID helper */ /* Timezone ID helper */
// FIXME: how do we handle iCal weekday strings with multiple days? // FIXME: how do we handle iCal weekday strings with multiple days?
// something like the following? // something like the following?
//int osync_time_str2wday(const char *weekday, int *wdaymap); //int osync_time_str2wday(const char *weekday, int *wdaymap);
int osync_time_str2wday(const char *weekday); OSYNC_EXPORT int osync_time_str2wday(const char *weekday);
struct tm *osync_time_relative2tm(const char *byday, const int bymonth, con OSYNC_EXPORT struct tm *osync_time_relative2tm(const char *byday, const int
st int year); bymonth, const int year);
int osync_time_utcoffset2sec(const char *offset); OSYNC_EXPORT int osync_time_utcoffset2sec(const char *offset);
/* Recurrence API */ /* Recurrence API */
//struct OSyncRecur *osync_recur_parse_rules(OSyncXMLFormat *event); //struct OSyncRecur *osync_recur_parse_rules(OSyncXMLFormat *event);
// hmmm, recurrence rules only pertain to a certain // hmmm, recurrence rules only pertain to a certain
// field.... how do we get that data? can we get a sub // field.... how do we get that data? can we get a sub
// field of a field? // field of a field?
//struct tm *osync_recur_get_next(OSyncRecur *recur, struct tm *current); //struct tm *osync_recur_get_next(OSyncRecur *recur, struct tm *current);
/* Smart Timezone Helpers */ /* Smart Timezone Helpers */
/* /*
skipping to change at line 83 skipping to change at line 103
*/ */
//struct tm *osync_time_dstchange(OSyncXMLFormat *event, OSyncXMLField *dat eTimeContent); //struct tm *osync_time_dstchange(OSyncXMLFormat *event, OSyncXMLField *dat eTimeContent);
//osync_bool osync_time_isdst(OSyncXMLFormat *event, OSyncXMLField *dateTim eContent); //osync_bool osync_time_isdst(OSyncXMLFormat *event, OSyncXMLField *dateTim eContent);
//int osync_time_tzoffset(const char *vtime, xmlNode *tz); //int osync_time_tzoffset(const char *vtime, xmlNode *tz);
//char *osync_time_tzid(xmlNode *tz); //char *osync_time_tzid(xmlNode *tz);
//char *osync_time_tzlocation(xmlNode *tz); //char *osync_time_tzlocation(xmlNode *tz);
//xmlNode *osync_time_tzinfo(xmlNode *root, const char *tzid); //xmlNode *osync_time_tzinfo(xmlNode *root, const char *tzid);
//char *osync_time_tzlocal2utc(xmlNode *root, const char *field); //char *osync_time_tzlocal2utc(xmlNode *root, const char *field);
time_t osync_time_xml2unix(OSyncXMLFormat *event, OSyncXMLField *dateTimeCo ntent); OSYNC_EXPORT time_t osync_time_xml2unix(OSyncXMLFormat *event, OSyncXMLFiel d *dateTimeContent);
#endif // _OPENSYNC_TIME_H_ #endif /*_OPENSYNC_TIME_H_*/
 End of changes. 11 change blocks. 
29 lines changed or deleted 53 lines changed or added


 opensync_version.h   opensync_version.h 
skipping to change at line 26 skipping to change at line 26
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Author: Daniel Friedrich <daniel.friedrich@opensync.org> * Author: Daniel Friedrich <daniel.friedrich@opensync.org>
* *
*/ */
#ifndef OPENSYNC_VERSION_H_ #ifndef OPENSYNC_VERSION_H_
#define OPENSYNC_VERSION_H_ #define OPENSYNC_VERSION_H_
#include <opensync/opensync_list.h>
OSYNC_EXPORT OSyncVersion *osync_version_new(OSyncError **error); OSYNC_EXPORT OSyncVersion *osync_version_new(OSyncError **error);
OSYNC_EXPORT OSyncVersion *osync_version_ref(OSyncVersion *version); OSYNC_EXPORT OSyncVersion *osync_version_ref(OSyncVersion *version);
OSYNC_EXPORT void osync_version_unref(OSyncVersion *version); OSYNC_EXPORT void osync_version_unref(OSyncVersion *version);
OSYNC_EXPORT char *osync_version_get_plugin(OSyncVersion *version); OSYNC_EXPORT char *osync_version_get_plugin(OSyncVersion *version);
OSYNC_EXPORT char *osync_version_get_priority(OSyncVersion *version); OSYNC_EXPORT char *osync_version_get_priority(OSyncVersion *version);
OSYNC_EXPORT char *osync_version_get_vendor(OSyncVersion *version); OSYNC_EXPORT char *osync_version_get_vendor(OSyncVersion *version);
OSYNC_EXPORT char *osync_version_get_modelversion(OSyncVersion *version); OSYNC_EXPORT char *osync_version_get_modelversion(OSyncVersion *version);
OSYNC_EXPORT char *osync_version_get_firmwareversion(OSyncVersion *version) ; OSYNC_EXPORT char *osync_version_get_firmwareversion(OSyncVersion *version) ;
OSYNC_EXPORT char *osync_version_get_softwareversion(OSyncVersion *version) ; OSYNC_EXPORT char *osync_version_get_softwareversion(OSyncVersion *version) ;
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 opensync_xmlformat.h   opensync_xmlformat.h 
skipping to change at line 51 skipping to change at line 51
OSYNC_EXPORT OSyncXMLFormat *osync_xmlformat_ref(OSyncXMLFormat *xmlformat) ; OSYNC_EXPORT OSyncXMLFormat *osync_xmlformat_ref(OSyncXMLFormat *xmlformat) ;
OSYNC_EXPORT void osync_xmlformat_unref(OSyncXMLFormat *xmlformat); OSYNC_EXPORT void osync_xmlformat_unref(OSyncXMLFormat *xmlformat);
OSYNC_EXPORT const char *osync_xmlformat_root_name(OSyncXMLFormat *xmlforma t); OSYNC_EXPORT const char *osync_xmlformat_root_name(OSyncXMLFormat *xmlforma t);
OSYNC_EXPORT const char *osync_xmlformat_get_objtype(OSyncXMLFormat *xmlfor mat); OSYNC_EXPORT const char *osync_xmlformat_get_objtype(OSyncXMLFormat *xmlfor mat);
OSYNC_EXPORT OSyncXMLField *osync_xmlformat_get_first_field(OSyncXMLFormat *xmlformat); OSYNC_EXPORT OSyncXMLField *osync_xmlformat_get_first_field(OSyncXMLFormat *xmlformat);
OSYNC_EXPORT OSyncXMLFieldList *osync_xmlformat_search_field(OSyncXMLFormat *xmlformat, const char *name, OSyncError **error, ...); OSYNC_EXPORT OSyncXMLFieldList *osync_xmlformat_search_field(OSyncXMLFormat *xmlformat, const char *name, OSyncError **error, ...);
OSYNC_EXPORT osync_bool osync_xmlformat_assemble(OSyncXMLFormat *xmlformat, char **buffer, unsigned int *size); OSYNC_EXPORT osync_bool osync_xmlformat_assemble(OSyncXMLFormat *xmlformat, char **buffer, unsigned int *size);
OSYNC_EXPORT osync_bool osync_xmlformat_validate(OSyncXMLFormat *xmlformat) ; OSYNC_EXPORT osync_bool osync_xmlformat_validate(OSyncXMLFormat *xmlformat, OSyncError **error);
OSYNC_EXPORT void osync_xmlformat_sort(OSyncXMLFormat *xmlformat); OSYNC_EXPORT void osync_xmlformat_sort(OSyncXMLFormat *xmlformat);
OSYNC_EXPORT OSyncConvCmpResult osync_xmlformat_compare(OSyncXMLFormat *xml format1, OSyncXMLFormat *xmlformat2, OSyncXMLPoints points[], int basic_poi nts, int treshold); OSYNC_EXPORT OSyncConvCmpResult osync_xmlformat_compare(OSyncXMLFormat *xml format1, OSyncXMLFormat *xmlformat2, OSyncXMLPoints points[], int basic_poi nts, int treshold);
OSYNC_EXPORT unsigned int osync_xmlformat_size(); OSYNC_EXPORT unsigned int osync_xmlformat_size();
#endif /*OPENSYNC_XMLFORMAT_H_*/ #endif /*OPENSYNC_XMLFORMAT_H_*/
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/