Menu
▾
▴
[Opensync-commits] r5662 - in branches/opensync-ticket1084/opensync: capabilities group
|
From: <svn...@op...> - 2009-06-04 08:57:04
|
Author: dgollub Date: Thu Jun 4 10:56:54 2009 New Revision: 5662 URL: http://www.opensync.org/changeset/5662 Log: Move member related capabiliteis functions to opensync_member. TODO: rename interfaces (doesn't hurt just used internally) refs #1084 Modified: branches/opensync-ticket1084/opensync/capabilities/opensync_capabilities.c branches/opensync-ticket1084/opensync/capabilities/opensync_capabilities_internals.h branches/opensync-ticket1084/opensync/group/opensync_member.c branches/opensync-ticket1084/opensync/group/opensync_member_internals.h Modified: branches/opensync-ticket1084/opensync/capabilities/opensync_capabilities.c ============================================================================== --- branches/opensync-ticket1084/opensync/capabilities/opensync_capabilities.c Mon Jun 1 11:38:55 2009 (r5661) +++ branches/opensync-ticket1084/opensync/capabilities/opensync_capabilities.c Thu Jun 4 10:56:54 2009 (r5662) @@ -257,73 +257,3 @@ return capabilities; } -osync_bool osync_capabilities_member_has_capabilities(OSyncMember *member) -{ - char *filename = NULL; - gboolean res = FALSE; - - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, member); - osync_assert(member); - - filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); - res = g_file_test(filename, G_FILE_TEST_IS_REGULAR); - osync_free(filename); - - osync_trace(TRACE_EXIT, "%s: %i", __func__, res); - return res; -} - -OSyncCapabilities* osync_capabilities_member_get_capabilities(OSyncMember *member, OSyncError** error) -{ - unsigned int size; - char* buffer, *filename; - OSyncCapabilities *capabilities; - osync_bool res; - - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, member, error); - osync_assert(member); - - filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); - res = osync_file_read(filename, &buffer, &size, error); - osync_free(filename); - - if(!res) { - osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); - return NULL; - } - - capabilities = osync_capabilities_parse(buffer, size, error); - osync_free(buffer); - if(!capabilities) { - osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); - return NULL; - } - - osync_trace(TRACE_EXIT, "%s: %p", __func__, capabilities); - return capabilities; -} - -osync_bool osync_capabilities_member_set_capabilities(OSyncMember *member, OSyncCapabilities* capabilities, OSyncError** error) -{ - int size; - char* buffer, *filename; - osync_bool res; - - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, member, capabilities, error); - osync_assert(member); - osync_assert(capabilities); - - osync_capabilities_assemble(capabilities, &buffer, &size); - filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); - res = osync_file_write(filename, buffer, size, 0600, error); - osync_free(filename); - osync_free(buffer); - if(!res) { - osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); - return FALSE; - } - - osync_trace(TRACE_EXIT, "%s: %i", __func__, res); - return res; -} - Modified: branches/opensync-ticket1084/opensync/capabilities/opensync_capabilities_internals.h ============================================================================== --- branches/opensync-ticket1084/opensync/capabilities/opensync_capabilities_internals.h Mon Jun 1 11:38:55 2009 (r5661) +++ branches/opensync-ticket1084/opensync/capabilities/opensync_capabilities_internals.h Thu Jun 4 10:56:54 2009 (r5662) @@ -48,38 +48,6 @@ */ OSyncCapabilities *osync_capabilities_load(const char *file, OSyncError **error); -/** - * @brief Checks if the capabilities are already cached - * @param member The member which should be tested for cached capabilities - * @return TRUE if the capabilities for this member are cached otherwise FALSE - */ -osync_bool osync_capabilities_member_has_capabilities(OSyncMember *member); - -/** - * @brief Get the cached capabilities of a member. The cache capabilities is stored as - * "capabilities.xml" in the member directory. This function should be only used - * internal. To get the current capabilities of a member please use: - * osync_member_get_capabilities() - * - * @param member The pointer to a member object - * @param error The error which will hold the info in case of an error - * @return The objtype of the xmlformat - */ -OSyncCapabilities* osync_capabilities_member_get_capabilities(OSyncMember *member, OSyncError** error); - -/** - * @brief Set the capabilities of a member. The capabilities get cached in the member directory - * as "capabilities.xml". This function should be only used internal. To set member - * capabilities, please use: - * osync_member_set_capabilities() - * - * @param member The pointer to a member object - * @param capabilities The pointer to a capabilities object - * @param error The error which will hold the info in case of an error - * @return TRUE on success otherwise FALSE - */ -osync_bool osync_capabilities_member_set_capabilities(OSyncMember *member, OSyncCapabilities* capabilities, OSyncError** error); - /*@}*/ OSYNC_TEST_EXPORT OSyncCapabilityParameter *osync_capability_parameter_new(OSyncError **error); Modified: branches/opensync-ticket1084/opensync/group/opensync_member.c ============================================================================== --- branches/opensync-ticket1084/opensync/group/opensync_member.c Mon Jun 1 11:38:55 2009 (r5661) +++ branches/opensync-ticket1084/opensync/group/opensync_member.c Thu Jun 4 10:56:54 2009 (r5662) @@ -967,3 +967,74 @@ osync_trace(TRACE_EXIT, "%s(%p)", __func__, member); return uptodate; } + +osync_bool osync_capabilities_member_has_capabilities(OSyncMember *member) +{ + char *filename = NULL; + gboolean res = FALSE; + + osync_trace(TRACE_ENTRY, "%s(%p)", __func__, member); + osync_assert(member); + + filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); + res = g_file_test(filename, G_FILE_TEST_IS_REGULAR); + osync_free(filename); + + osync_trace(TRACE_EXIT, "%s: %i", __func__, res); + return res; +} + +OSyncCapabilities* osync_capabilities_member_get_capabilities(OSyncMember *member, OSyncError** error) +{ + unsigned int size; + char* buffer, *filename; + OSyncCapabilities *capabilities; + osync_bool res; + + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, member, error); + osync_assert(member); + + filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); + res = osync_file_read(filename, &buffer, &size, error); + osync_free(filename); + + if(!res) { + osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); + return NULL; + } + + capabilities = osync_capabilities_parse(buffer, size, error); + osync_free(buffer); + if(!capabilities) { + osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); + return NULL; + } + + osync_trace(TRACE_EXIT, "%s: %p", __func__, capabilities); + return capabilities; +} + +osync_bool osync_capabilities_member_set_capabilities(OSyncMember *member, OSyncCapabilities* capabilities, OSyncError** error) +{ + int size; + char* buffer, *filename; + osync_bool res; + + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, member, capabilities, error); + osync_assert(member); + osync_assert(capabilities); + + osync_capabilities_assemble(capabilities, &buffer, &size); + filename = osync_strdup_printf("%s%ccapabilities.xml", osync_member_get_configdir(member), G_DIR_SEPARATOR); + res = osync_file_write(filename, buffer, size, 0600, error); + osync_free(filename); + osync_free(buffer); + if(!res) { + osync_trace(TRACE_EXIT_ERROR, "%s: %s" , __func__, osync_error_print(error)); + return FALSE; + } + + osync_trace(TRACE_EXIT, "%s: %i", __func__, res); + return res; +} + Modified: branches/opensync-ticket1084/opensync/group/opensync_member_internals.h ============================================================================== --- branches/opensync-ticket1084/opensync/group/opensync_member_internals.h Mon Jun 1 11:38:55 2009 (r5661) +++ branches/opensync-ticket1084/opensync/group/opensync_member_internals.h Thu Jun 4 10:56:54 2009 (r5662) @@ -137,6 +137,37 @@ */ OSYNC_TEST_EXPORT const char *osync_member_nth_objtype(OSyncMember *member, int nth); +/** + * @brief Checks if the capabilities are already cached + * @param member The member which should be tested for cached capabilities + * @return TRUE if the capabilities for this member are cached otherwise FALSE + */ +osync_bool osync_capabilities_member_has_capabilities(OSyncMember *member); + +/** + * @brief Get the cached capabilities of a member. The cache capabilities is stored as + * "capabilities.xml" in the member directory. This function should be only used + * internal. To get the current capabilities of a member please use: + * osync_member_get_capabilities() + * + * @param member The pointer to a member object + * @param error The error which will hold the info in case of an error + * @return The objtype of the xmlformat + */ +OSyncCapabilities* osync_capabilities_member_get_capabilities(OSyncMember *member, OSyncError** error); + +/** + * @brief Set the capabilities of a member. The capabilities get cached in the member directory + * as "capabilities.xml". This function should be only used internal. To set member + * capabilities, please use: + * osync_member_set_capabilities() + * + * @param member The pointer to a member object + * @param capabilities The pointer to a capabilities object + * @param error The error which will hold the info in case of an error + * @return TRUE on success otherwise FALSE + */ +osync_bool osync_capabilities_member_set_capabilities(OSyncMember *member, OSyncCapabilities* capabilities, OSyncError** error); /*@}*/ |
