[Opensync-commits] r5456 - trunk/opensync/group

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

Author: dgollub
Date: Mon Mar 30 06:35:07 2009
New Revision: 5456
URL: http://www.opensync.org/changeset/5456

Log:
Fix data type of osync_group_get_conflict_resolution' paramter "winner"
to long long int, which represents a mmeber id (which is long long int)

refs #974

Modified:
   trunk/opensync/group/opensync_group.c
   trunk/opensync/group/opensync_group.h
   trunk/opensync/group/opensync_group_internals.h

Modified: trunk/opensync/group/opensync_group.c
==============================================================================
--- trunk/opensync/group/opensync_group.c	Mon Mar 30 06:29:09 2009	(r5455)
+++ trunk/opensync/group/opensync_group.c	Mon Mar 30 06:35:07 2009	(r5456)
@@ -974,21 +974,21 @@
 	return group->last_sync;
 }
 
-void osync_group_set_conflict_resolution(OSyncGroup *group, OSyncConflictResolution res, int num)
+void osync_group_set_conflict_resolution(OSyncGroup *group, OSyncConflictResolution res, long long int winner)
 {
 	osync_assert(group);
 	group->conflict_resolution = res;
-	group->conflict_winner = num;
+	group->conflict_winner = winner;
 }
 
-void osync_group_get_conflict_resolution(OSyncGroup *group, OSyncConflictResolution *res, int *num)
+void osync_group_get_conflict_resolution(OSyncGroup *group, OSyncConflictResolution *res, long long int *winner)
 {
 	osync_assert(group);
 	osync_assert(res);
-	osync_assert(num);
+	osync_assert(winner);
 	
 	*res = group->conflict_resolution;
-	*num = group->conflict_winner;
+	*winner = group->conflict_winner;
 }
 
 osync_bool osync_group_get_merger_enabled(OSyncGroup *group)

Modified: trunk/opensync/group/opensync_group.h
==============================================================================
--- trunk/opensync/group/opensync_group.h	Mon Mar 30 06:29:09 2009	(r5455)
+++ trunk/opensync/group/opensync_group.h	Mon Mar 30 06:35:07 2009	(r5456)
@@ -267,19 +267,19 @@
  * 
  * @param group The group
  * @param res The conflict resolution
- * @param num The Member ID which solves the conflict (winner)
+ * @param winner The Member ID which solves the conflict (winner)
  * 
  */
-OSYNC_EXPORT void osync_group_set_conflict_resolution(OSyncGroup *group, OSyncConflictResolution res, int num);
+OSYNC_EXPORT void osync_group_set_conflict_resolution(OSyncGroup *group, OSyncConflictResolution res, long long int winner);
 
 /** @brief Get fixed conflict resolution for the group for all appearing conflicts 
  * 
  * @param group The group
  * @param res Pointer to set conflict resolution value
- * @param num Pointer to set Member ID value which solves the conflict (winner)
+ * @param winner Pointer to set Member ID value which solves the conflict (winner)
  * 
  */
-OSYNC_EXPORT void osync_group_get_conflict_resolution(OSyncGroup *group, OSyncConflictResolution *res, int *num);
+OSYNC_EXPORT void osync_group_get_conflict_resolution(OSyncGroup *group, OSyncConflictResolution *res, long long int *winner);
 
 /** @brief Get group configured status of merger use. 
  * 

Modified: trunk/opensync/group/opensync_group_internals.h
==============================================================================
--- trunk/opensync/group/opensync_group_internals.h	Mon Mar 30 06:29:09 2009	(r5455)
+++ trunk/opensync/group/opensync_group_internals.h	Mon Mar 30 06:35:07 2009	(r5456)
@@ -52,7 +52,7 @@
 	/** The defined resolution for this group */
 	OSyncConflictResolution conflict_resolution;
 	/** The winning side if the select resolution is choosen */
-	int conflict_winner;
+	long long int conflict_winner;
 	/** The configured merger status of this group */
 	osync_bool merger_enabled;
 	/** The configured converter status of this group */