Bläddra i källkod

remove trailing blanks

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2188 fd59a12c-fef9-0310-b244-a6a79926bd2f
Jim Meyering 16 år sedan
förälder
incheckning
d1c1e78fd0
7 ändrade filer med 19 tillägg och 19 borttagningar
  1. 6 6
      SECURITY
  2. 1 1
      configure.ac
  3. 4 4
      exec/totemsrp.c
  4. 1 1
      include/corosync/corodefs.h
  5. 1 1
      include/corosync/coroipc_ipc.h
  6. 1 1
      include/corosync/coroipc_types.h
  7. 5 5
      services/cpg.c

+ 6 - 6
SECURITY

@@ -133,7 +133,7 @@ never reused.
 USING LIBNSS
 USING LIBNSS
 ------------
 ------------
 
 
-The process is similar in concept to the above, but most of the details are 
+The process is similar in concept to the above, but most of the details are
 hidden inside the NSS library. When corosync is started up libnss is initialised,
 hidden inside the NSS library. When corosync is started up libnss is initialised,
 the private key is read into memory and stored for later use by the code.
 the private key is read into memory and stored for later use by the code.
 
 
@@ -156,12 +156,12 @@ Compatibility
 -------------
 -------------
 
 
 The default mode of operation is to allow for wire-compatibility with existing
 The default mode of operation is to allow for wire-compatibility with existing
-openais systems. That means that the internal encryption system is used 
+openais systems. That means that the internal encryption system is used
 and all received packets are expected to use that system. This allows a rolling
 and all received packets are expected to use that system. This allows a rolling
-upgrade from openais to corosync. 
+upgrade from openais to corosync.
 
 
 Once all nodes in the cluster are running corosync they can be changed to allow
 Once all nodes in the cluster are running corosync they can be changed to allow
-the newer libnss-based encryption by setting the 
+the newer libnss-based encryption by setting the
 totem {
 totem {
     crypto_accept: new
     crypto_accept: new
 }
 }
@@ -170,14 +170,14 @@ option in corosync.conf.
 This enables the new encryption system but does not switch it on. It simply
 This enables the new encryption system but does not switch it on. It simply
 adds a byte to the end of the packets to indicate the encryption type.
 adds a byte to the end of the packets to indicate the encryption type.
 
 
-Once all nodes have been upgraded and 'crypto_accept: new' has been set, 
+Once all nodes have been upgraded and 'crypto_accept: new' has been set,
 the encryption type can be set using a single command:
 the encryption type can be set using a single command:
 
 
 # corosync-cfgtool -c1
 # corosync-cfgtool -c1
 
 
 This will tell all cluster nodes to start using libnss encryption. Note that
 This will tell all cluster nodes to start using libnss encryption. Note that
 it is possible to upgrade node individially by seetting the encryption type in
 it is possible to upgrade node individially by seetting the encryption type in
-corosync.conf. The last byte of the packet indicates the decryption algorithm 
+corosync.conf. The last byte of the packet indicates the decryption algorithm
 that the receiver should use.
 that the receiver should use.
 
 
 Once all nodes are using libnss encryption, the option should be set in
 Once all nodes are using libnss encryption, the option should be set in

+ 1 - 1
configure.ac

@@ -267,7 +267,7 @@ fi
 # Look for libnss
 # Look for libnss
 if test "x${enable_nss}" = xyes; then
 if test "x${enable_nss}" = xyes; then
 	PKG_CHECK_MODULES([nss],[nss])
 	PKG_CHECK_MODULES([nss],[nss])
-	AC_DEFINE_UNQUOTED([HAVE_LIBNSS], 1, [have libnss])	
+	AC_DEFINE_UNQUOTED([HAVE_LIBNSS], 1, [have libnss])
 	PACKAGE_FEATURES="$PACKAGE_FEATURES nss"
 	PACKAGE_FEATURES="$PACKAGE_FEATURES nss"
 fi
 fi
 
 

+ 4 - 4
exec/totemsrp.c

@@ -2858,14 +2858,14 @@ static void memb_join_message_send (struct totemsrp_instance *instance)
 		instance->my_proc_list,
 		instance->my_proc_list,
 		instance->my_proc_list_entries *
 		instance->my_proc_list_entries *
 			sizeof (struct srp_addr));
 			sizeof (struct srp_addr));
-	addr_idx += 
+	addr_idx +=
 		instance->my_proc_list_entries *
 		instance->my_proc_list_entries *
 		sizeof (struct srp_addr);
 		sizeof (struct srp_addr);
 	memcpy (&addr[addr_idx],
 	memcpy (&addr[addr_idx],
 		instance->my_failed_list,
 		instance->my_failed_list,
 		instance->my_failed_list_entries *
 		instance->my_failed_list_entries *
 		sizeof (struct srp_addr));
 		sizeof (struct srp_addr));
-	addr_idx += 
+	addr_idx +=
 		instance->my_failed_list_entries *
 		instance->my_failed_list_entries *
 		sizeof (struct srp_addr);
 		sizeof (struct srp_addr);
 
 
@@ -2927,14 +2927,14 @@ static void memb_leave_message_send (struct totemsrp_instance *instance)
 		active_memb,
 		active_memb,
 		active_memb_entries *
 		active_memb_entries *
 			sizeof (struct srp_addr));
 			sizeof (struct srp_addr));
-	addr_idx += 
+	addr_idx +=
 		active_memb_entries *
 		active_memb_entries *
 		sizeof (struct srp_addr);
 		sizeof (struct srp_addr);
 	memcpy (&addr[addr_idx],
 	memcpy (&addr[addr_idx],
 		instance->my_failed_list,
 		instance->my_failed_list,
 		instance->my_failed_list_entries *
 		instance->my_failed_list_entries *
 		sizeof (struct srp_addr));
 		sizeof (struct srp_addr));
-	addr_idx += 
+	addr_idx +=
 		instance->my_failed_list_entries *
 		instance->my_failed_list_entries *
 		sizeof (struct srp_addr);
 		sizeof (struct srp_addr);
 
 

+ 1 - 1
include/corosync/corodefs.h

@@ -6,7 +6,7 @@
  * Author: Steven Dake (sdake@redhat.com)
  * Author: Steven Dake (sdake@redhat.com)
  *
  *
  * This software licensed under BSD license, the text of which follows:
  * This software licensed under BSD license, the text of which follows:
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * modification, are permitted provided that the following conditions are met:
  *
  *

+ 1 - 1
include/corosync/coroipc_ipc.h

@@ -6,7 +6,7 @@
  * Author: Steven Dake (sdake@redhat.com)
  * Author: Steven Dake (sdake@redhat.com)
  *
  *
  * This software licensed under BSD license, the text of which follows:
  * This software licensed under BSD license, the text of which follows:
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * modification, are permitted provided that the following conditions are met:
  *
  *

+ 1 - 1
include/corosync/coroipc_types.h

@@ -6,7 +6,7 @@
  * Author: Steven Dake (sdake@redhat.com)
  * Author: Steven Dake (sdake@redhat.com)
  *
  *
  * This software licensed under BSD license, the text of which follows:
  * This software licensed under BSD license, the text of which follows:
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * modification, are permitted provided that the following conditions are met:
  *
  *

+ 5 - 5
services/cpg.c

@@ -4,7 +4,7 @@
  * All rights reserved.
  * All rights reserved.
  *
  *
  * Author: Christine Caulfield (ccaulfie@redhat.com)
  * Author: Christine Caulfield (ccaulfie@redhat.com)
- * Author: Jan Friesse (jfriesse@redhat.com) 
+ * Author: Jan Friesse (jfriesse@redhat.com)
  *
  *
  * This software licensed under BSD license, the text of which follows:
  * This software licensed under BSD license, the text of which follows:
  *
  *
@@ -955,7 +955,7 @@ static void message_handler_req_lib_cpg_mcast (void *conn, const void *message)
 	const struct req_lib_cpg_mcast *req_lib_cpg_mcast = message;
 	const struct req_lib_cpg_mcast *req_lib_cpg_mcast = message;
  	struct cpg_pd *cpd = (struct cpg_pd *)api->ipc_private_data_get (conn);
  	struct cpg_pd *cpd = (struct cpg_pd *)api->ipc_private_data_get (conn);
 	mar_cpg_name_t group_name = cpd->group_name;
 	mar_cpg_name_t group_name = cpd->group_name;
- 
+
 	struct iovec req_exec_cpg_iovec[2];
 	struct iovec req_exec_cpg_iovec[2];
 	struct req_exec_cpg_mcast req_exec_cpg_mcast;
 	struct req_exec_cpg_mcast req_exec_cpg_mcast;
 	struct res_lib_cpg_mcast res_lib_cpg_mcast;
 	struct res_lib_cpg_mcast res_lib_cpg_mcast;
@@ -989,12 +989,12 @@ static void message_handler_req_lib_cpg_mcast (void *conn, const void *message)
  		api->ipc_source_set (&req_exec_cpg_mcast.source, conn);
  		api->ipc_source_set (&req_exec_cpg_mcast.source, conn);
  		memcpy(&req_exec_cpg_mcast.group_name, &group_name,
  		memcpy(&req_exec_cpg_mcast.group_name, &group_name,
  			sizeof(mar_cpg_name_t));
  			sizeof(mar_cpg_name_t));
- 
+
  		req_exec_cpg_iovec[0].iov_base = (char *)&req_exec_cpg_mcast;
  		req_exec_cpg_iovec[0].iov_base = (char *)&req_exec_cpg_mcast;
  		req_exec_cpg_iovec[0].iov_len = sizeof(req_exec_cpg_mcast);
  		req_exec_cpg_iovec[0].iov_len = sizeof(req_exec_cpg_mcast);
  		req_exec_cpg_iovec[1].iov_base = (char *)&req_lib_cpg_mcast->message;
  		req_exec_cpg_iovec[1].iov_base = (char *)&req_lib_cpg_mcast->message;
  		req_exec_cpg_iovec[1].iov_len = msglen;
  		req_exec_cpg_iovec[1].iov_len = msglen;
- 
+
  		result = api->totem_mcast (req_exec_cpg_iovec, 2, TOTEM_AGREED);
  		result = api->totem_mcast (req_exec_cpg_iovec, 2, TOTEM_AGREED);
  		assert(result == 0);
  		assert(result == 0);
  	}
  	}
@@ -1012,7 +1012,7 @@ static void message_handler_req_lib_cpg_membership (void *conn,
 	struct cpg_pd *cpd = (struct cpg_pd *)api->ipc_private_data_get (conn);
 	struct cpg_pd *cpd = (struct cpg_pd *)api->ipc_private_data_get (conn);
 	cs_error_t error = CPG_ERR_NOT_EXIST;
 	cs_error_t error = CPG_ERR_NOT_EXIST;
 	coroipc_response_header_t res;
 	coroipc_response_header_t res;
- 
+
 	switch (cpd->cpd_state) {
 	switch (cpd->cpd_state) {
 	case CPD_STATE_UNJOINED:
 	case CPD_STATE_UNJOINED:
 		error = CPG_ERR_NOT_EXIST;
 		error = CPG_ERR_NOT_EXIST;