[Opensync-commits] r5663 - branches/opensync-ticket1084/opensync/group

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

Author: dgollub
Date: Thu Jun  4 11:05:28 2009
New Revision: 5663
URL: http://www.opensync.org/changeset/5663

Log:
Rename internal member capabilities interfaces to fit the OSyncMember
namespace

refs #1084

Modified:
   branches/opensync-ticket1084/opensync/group/opensync_member.c
   branches/opensync-ticket1084/opensync/group/opensync_member_internals.h

Modified: branches/opensync-ticket1084/opensync/group/opensync_member.c
==============================================================================
--- branches/opensync-ticket1084/opensync/group/opensync_member.c	Thu Jun  4 10:56:54 2009	(r5662)
+++ branches/opensync-ticket1084/opensync/group/opensync_member.c	Thu Jun  4 11:05:28 2009	(r5663)
@@ -410,15 +410,14 @@
 	}
 	osync_xml_free_doc(doc);
 
-	if(osync_capabilities_member_has_capabilities(member))
-		{
-			OSyncCapabilities* capabilities = osync_capabilities_member_get_capabilities(member, error);
-			if(!capabilities)
-				goto error;
-			if(!osync_member_set_capabilities(member, capabilities, error))
-				goto error;
-			osync_capabilities_unref(capabilities);
-		}
+	if (osync_member_has_capabilities(member)) {
+		OSyncCapabilities* capabilities = osync_member_load_capabilities(member, error);
+		if (!capabilities)
+			goto error;
+		if (!osync_member_set_capabilities(member, capabilities, error))
+			goto error;
+		osync_capabilities_unref(capabilities);
+	}
 	
 	osync_trace(TRACE_EXIT, "%s", __func__);
 	return TRUE;
@@ -578,8 +577,8 @@
 	}
 	
 	capabilities = osync_member_get_capabilities(member);
-	if(capabilities) {
-		if(!osync_capabilities_member_set_capabilities(member, capabilities, error)) {
+	if (capabilities) {
+		if (!osync_member_save_capabilities(member, capabilities, error)) {
 			goto error;
 		}
 	}
@@ -968,7 +967,7 @@
 	return uptodate;
 }
 
-osync_bool osync_capabilities_member_has_capabilities(OSyncMember *member)
+osync_bool osync_member_has_capabilities(OSyncMember *member)
 {
 	char *filename = NULL;
 	gboolean res = FALSE;
@@ -984,7 +983,7 @@
 	return res;
 }
 
-OSyncCapabilities* osync_capabilities_member_get_capabilities(OSyncMember *member, OSyncError** error)
+OSyncCapabilities* osync_member_load_capabilities(OSyncMember *member, OSyncError** error)
 {
 	unsigned int size;
 	char* buffer, *filename;
@@ -1014,7 +1013,7 @@
 	return capabilities;
 }
 
-osync_bool osync_capabilities_member_set_capabilities(OSyncMember *member, OSyncCapabilities* capabilities, OSyncError** error)
+osync_bool osync_member_save_capabilities(OSyncMember *member, OSyncCapabilities* capabilities, OSyncError** error)
 {
 	int size;
 	char* buffer, *filename;

Modified: branches/opensync-ticket1084/opensync/group/opensync_member_internals.h
==============================================================================
--- branches/opensync-ticket1084/opensync/group/opensync_member_internals.h	Thu Jun  4 10:56:54 2009	(r5662)
+++ branches/opensync-ticket1084/opensync/group/opensync_member_internals.h	Thu Jun  4 11:05:28 2009	(r5663)
@@ -142,10 +142,10 @@
  * @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);
+OSYNC_TEST_EXPORT osync_bool osync_member_has_capabilities(OSyncMember *member);
 
 /**
- * @brief Get the cached capabilities of a member. The cache capabilities is stored as
+ * @brief Load 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()
@@ -154,10 +154,10 @@
  * @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);
+OSYNC_TEST_EXPORT OSyncCapabilities* osync_member_load_capabilities(OSyncMember *member, OSyncError** error);
 
 /**
- * @brief Set the capabilities of a member. The capabilities get cached in the member directory
+ * @brief Save 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()
@@ -167,7 +167,7 @@
  * @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 osync_bool osync_member_save_capabilities(OSyncMember *member, OSyncCapabilities* capabilities, OSyncError** error);
 
 /*@}*/