Quellcode durchsuchen

remove trailing blanks

* corosync.spec.in:
* exec/evil.c:
* exec/main.c:
* exec/mainconfig.c:
* exec/syncv2.c:

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2322 fd59a12c-fef9-0310-b244-a6a79926bd2f
Jim Meyering vor 16 Jahren
Ursprung
Commit
6aad39be63
5 geänderte Dateien mit 25 neuen und 25 gelöschten Zeilen
  1. 2 2
      corosync.spec.in
  2. 9 9
      exec/evil.c
  3. 1 1
      exec/main.c
  4. 1 1
      exec/mainconfig.c
  5. 12 12
      exec/syncv2.c

+ 2 - 2
corosync.spec.in

@@ -58,7 +58,7 @@ rm -rf %{buildroot}%{_docdir}/*
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
-%description 
+%description
 This package contains the Corosync Cluster Engine Executive, several default
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 APIs and libraries, default configuration files, and an init script.
 
 
@@ -74,7 +74,7 @@ fi
 %postun
 %postun
 [ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || :
 [ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || :
 
 
-%files 
+%files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc LICENSE SECURITY
 %doc LICENSE SECURITY
 %{_sbindir}/corosync
 %{_sbindir}/corosync

+ 9 - 9
exec/evil.c

@@ -110,7 +110,7 @@ static void deliver_fn_evt_compat (
 	unsigned int nodeid,
 	unsigned int nodeid,
 	unsigned int service,
 	unsigned int service,
 	unsigned int fn_id,
 	unsigned int fn_id,
-	const void *msg, 
+	const void *msg,
 	unsigned int endian_conversion_required);
 	unsigned int endian_conversion_required);
 
 
 static struct sync_callbacks clm_sync_operations = {
 static struct sync_callbacks clm_sync_operations = {
@@ -225,7 +225,7 @@ void evil_deliver_fn (
 	unsigned int nodeid,
 	unsigned int nodeid,
 	unsigned int service,
 	unsigned int service,
 	unsigned int fn_id,
 	unsigned int fn_id,
-	const void *msg, 
+	const void *msg,
 	unsigned int endian_conversion_required)
 	unsigned int endian_conversion_required)
 {
 {
 	if (service == EVT_SERVICE) {
 	if (service == EVT_SERVICE) {
@@ -233,11 +233,11 @@ void evil_deliver_fn (
 			nodeid,
 			nodeid,
 			service,
 			service,
 			fn_id,
 			fn_id,
-			msg, 
+			msg,
 			endian_conversion_required);
 			endian_conversion_required);
 	}
 	}
 }
 }
-	
+
 /*
 /*
  * This sends the clm nodejoin message required by clm services
  * This sends the clm nodejoin message required by clm services
  * on whitetank as well as the event service
  * on whitetank as well as the event service
@@ -345,7 +345,7 @@ static int clm_hack_init (void)
 	int mib[2] = { CTL_KERN, KERN_BOOTTIME };
 	int mib[2] = { CTL_KERN, KERN_BOOTTIME };
 	struct timeval boot_time;
 	struct timeval boot_time;
 	size_t size = sizeof(boot_time);
 	size_t size = sizeof(boot_time);
-	
+
 	if ( sysctl(mib, 2, &boot_time, &size, NULL, 0) == -1 )
 	if ( sysctl(mib, 2, &boot_time, &size, NULL, 0) == -1 )
 		boot_time.tv_sec = time (NULL);
 		boot_time.tv_sec = time (NULL);
 	 /* (currenttime (s) - uptime (s)) * 1 billion (ns) / 1 (s) */
 	 /* (currenttime (s) - uptime (s)) * 1 billion (ns) / 1 (s) */
@@ -366,14 +366,14 @@ static int clm_nodejoin_send (void)
 	my_cluster_node_load ();
 	my_cluster_node_load ();
 
 
 	req_exec_clm_nodejoin.header.size = sizeof (struct req_exec_clm_nodejoin);
 	req_exec_clm_nodejoin.header.size = sizeof (struct req_exec_clm_nodejoin);
-	req_exec_clm_nodejoin.header.id = 
+	req_exec_clm_nodejoin.header.id =
 		SERVICE_ID_MAKE (CLM_SERVICE, MESSAGE_REQ_EXEC_CLM_NODEJOIN);
 		SERVICE_ID_MAKE (CLM_SERVICE, MESSAGE_REQ_EXEC_CLM_NODEJOIN);
 
 
 	my_cluster_node.initial_view_number = 0;
 	my_cluster_node.initial_view_number = 0;
 
 
 	memcpy (&req_exec_clm_nodejoin.cluster_node, &my_cluster_node,
 	memcpy (&req_exec_clm_nodejoin.cluster_node, &my_cluster_node,
 		sizeof (mar_clm_cluster_node_t));
 		sizeof (mar_clm_cluster_node_t));
-	
+
 	req_exec_clm_iovec.iov_base = (char *)&req_exec_clm_nodejoin;
 	req_exec_clm_iovec.iov_base = (char *)&req_exec_clm_nodejoin;
 	req_exec_clm_iovec.iov_len = sizeof (req_exec_clm_nodejoin);
 	req_exec_clm_iovec.iov_len = sizeof (req_exec_clm_nodejoin);
 
 
@@ -456,7 +456,7 @@ static void evt_sync_init (
 {
 {
 	my_member_list_entries = member_list_entries;
 	my_member_list_entries = member_list_entries;
 	my_evt_checked_in = 0;
 	my_evt_checked_in = 0;
-	
+
 	evt_sync_state = EVT_SYNC_PART_ONE;
 	evt_sync_state = EVT_SYNC_PART_ONE;
 	return;
 	return;
 }
 }
@@ -511,7 +511,7 @@ static void deliver_fn_evt_compat (
 	unsigned int nodeid,
 	unsigned int nodeid,
 	unsigned int service,
 	unsigned int service,
 	unsigned int fn_id,
 	unsigned int fn_id,
-	const void *msg, 
+	const void *msg,
 	unsigned int endian_conversion_required)
 	unsigned int endian_conversion_required)
 {
 {
 	const struct req_evt_chan_command *cpkt = msg;
 	const struct req_evt_chan_command *cpkt = msg;

+ 1 - 1
exec/main.c

@@ -703,7 +703,7 @@ static void corosync_setscheduler (void)
 		} else {
 		} else {
 			/*
 			/*
 			 * Turn on SCHED_RR in ipc system
 			 * Turn on SCHED_RR in ipc system
-			 */ 
+			 */
 			ipc_init_state.sched_policy = SCHED_RR;
 			ipc_init_state.sched_policy = SCHED_RR;
 		}
 		}
 	} else {
 	} else {

+ 1 - 1
exec/mainconfig.c

@@ -733,7 +733,7 @@ int corosync_main_config_compatibility_read (
 		if (strcmp (value, "none") == 0) {
 		if (strcmp (value, "none") == 0) {
 			*minimum_sync_mode = CS_SYNC_V2;
 			*minimum_sync_mode = CS_SYNC_V2;
 		} else {
 		} else {
-			
+
 			snprintf (error_string_response, sizeof (error_string_response),
 			snprintf (error_string_response, sizeof (error_string_response),
 				"Invalid compatibility option '%s' specified, must be none or whitetank.\n", value);
 				"Invalid compatibility option '%s' specified, must be none or whitetank.\n", value);
 			goto parse_error;
 			goto parse_error;

+ 12 - 12
exec/syncv2.c

@@ -72,7 +72,7 @@ enum sync_process_state {
 	PROCESS,
 	PROCESS,
 	ACTIVATE
 	ACTIVATE
 };
 };
-	
+
 enum sync_state {
 enum sync_state {
 	SYNC_SERVICELIST_BUILD,
 	SYNC_SERVICELIST_BUILD,
 	SYNC_PROCESS,
 	SYNC_PROCESS,
@@ -317,7 +317,7 @@ static void sync_service_build_handler (unsigned int nodeid, const void *msg)
 		return;
 		return;
 	}
 	}
 	for (i = 0; i < req_exec_service_build_message->service_list_entries; i++) {
 	for (i = 0; i < req_exec_service_build_message->service_list_entries; i++) {
-	
+
 		found = 0;
 		found = 0;
 		for (j = 0; j < my_service_list_entries; j++) {
 		for (j = 0; j < my_service_list_entries; j++) {
 			if (req_exec_service_build_message->service_list[i] ==
 			if (req_exec_service_build_message->service_list[i] ==
@@ -327,20 +327,20 @@ static void sync_service_build_handler (unsigned int nodeid, const void *msg)
 			}
 			}
 		}
 		}
 		if (found == 0) {
 		if (found == 0) {
-			my_service_list[my_service_list_entries].state = 
+			my_service_list[my_service_list_entries].state =
 				INIT;
 				INIT;
-			my_service_list[my_service_list_entries].service_id = 
+			my_service_list[my_service_list_entries].service_id =
 				req_exec_service_build_message->service_list[i];
 				req_exec_service_build_message->service_list[i];
 			sprintf (my_service_list[my_service_list_entries].name,
 			sprintf (my_service_list[my_service_list_entries].name,
-				"External Service (id = %d)\n", 
+				"External Service (id = %d)\n",
 				req_exec_service_build_message->service_list[i]);
 				req_exec_service_build_message->service_list[i]);
-			my_service_list[my_service_list_entries].sync_init = 
+			my_service_list[my_service_list_entries].sync_init =
 				dummy_sync_init;
 				dummy_sync_init;
-			my_service_list[my_service_list_entries].sync_abort = 
+			my_service_list[my_service_list_entries].sync_abort =
 				dummy_sync_abort;
 				dummy_sync_abort;
-			my_service_list[my_service_list_entries].sync_process = 
+			my_service_list[my_service_list_entries].sync_process =
 				dummy_sync_process;
 				dummy_sync_process;
-			my_service_list[my_service_list_entries].sync_activate = 
+			my_service_list[my_service_list_entries].sync_activate =
 				dummy_sync_activate;
 				dummy_sync_activate;
 			my_service_list_entries += 1;
 			my_service_list_entries += 1;
 
 
@@ -459,7 +459,7 @@ static void sync_process_enter (void)
 	/*
 	/*
 	 * No syncv2 services
 	 * No syncv2 services
 	 */
 	 */
-	if (my_service_list_entries == 0) { 
+	if (my_service_list_entries == 0) {
 		my_state = SYNC_SERVICELIST_BUILD;
 		my_state = SYNC_SERVICELIST_BUILD;
 		my_memb_determine_list_entries = 0;
 		my_memb_determine_list_entries = 0;
 		sync_synchronization_completed ();
 		sync_synchronization_completed ();
@@ -489,7 +489,7 @@ static void sync_servicelist_build_enter (
 	my_processor_list_entries = member_list_entries;
 	my_processor_list_entries = member_list_entries;
 
 
 	my_processing_idx = 0;
 	my_processing_idx = 0;
-	
+
 	memcpy (my_service_list, my_initial_service_list,
 	memcpy (my_service_list, my_initial_service_list,
 		sizeof (struct service_entry) *
 		sizeof (struct service_entry) *
 			my_initial_service_list_entries);
 			my_initial_service_list_entries);
@@ -526,7 +526,7 @@ static int schedwrk_processor (const void *context)
 	if (my_service_list[my_processing_idx].state == ACTIVATE) {
 	if (my_service_list[my_processing_idx].state == ACTIVATE) {
 		my_service_list[my_processing_idx].state = ACTIVATE;
 		my_service_list[my_processing_idx].state = ACTIVATE;
 		my_service_list[my_processing_idx].sync_activate ();
 		my_service_list[my_processing_idx].sync_activate ();
-		log_printf (LOGSYS_LEVEL_DEBUG, "Committing synchronization for %s\n", 
+		log_printf (LOGSYS_LEVEL_DEBUG, "Committing synchronization for %s\n",
 			my_service_list[my_processing_idx].name);
 			my_service_list[my_processing_idx].name);
 		sync_barrier_enter();
 		sync_barrier_enter();
 	}
 	}