Просмотр исходного кода

Remove hard coded sync values and use defines from coroapi.h.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2314 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake 16 лет назад
Родитель
Сommit
56dbf70bb1
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      exec/main.c

+ 4 - 4
exec/main.c

@@ -272,11 +272,11 @@ static int corosync_sync_v2_callbacks_retrieve (
 {
 	int res;
 
-	if (minimum_sync_mode == CS_SYNC_V1 && service_id == CLM_SERVICE && ais_service[CLM_SERVICE] == NULL) {
+	if (minimum_sync_mode == CS_SYNC_V2 && service_id == CLM_SERVICE && ais_service[CLM_SERVICE] == NULL) {
 		res = evil_callbacks_load (service_id, callbacks);
 		return (res);
 	}
-	if (minimum_sync_mode == CS_SYNC_V1 && service_id == EVT_SERVICE && ais_service[EVT_SERVICE] == NULL) {
+	if (minimum_sync_mode == CS_SYNC_V2 && service_id == EVT_SERVICE && ais_service[EVT_SERVICE] == NULL) {
 		res = evil_callbacks_load (service_id, callbacks);
 		return (res);
 	}
@@ -990,13 +990,13 @@ int main (int argc, char **argv)
 	}
 	evil_init (api);
 
-	if (minimum_sync_mode == 1) {
+	if (minimum_sync_mode == CS_SYNC_V2) {
 		log_printf (LOGSYS_LEVEL_NOTICE, "Compatibility mode set to none.  Using V2 of the synchronization engine.\n");
 		sync_v2_init (
 			corosync_sync_v2_callbacks_retrieve,
 			corosync_sync_completed);
 	} else
-	if (minimum_sync_mode == 0) {
+	if (minimum_sync_mode == CS_SYNC_V1) {
 		log_printf (LOGSYS_LEVEL_NOTICE, "Compatibility mode set to whitetank.  Using V1 and V2 of the synchronization engine.\n");
 		sync_register (
 			corosync_sync_callbacks_retrieve,