[PATCH] maint: remove trailing blanks
Jim Meyering
meyering at redhat.com
Fri Jun 19 03:35:51 PDT 2009
By running this command from a git-cloned directory:
perl -pi -e 's/[ \t]+$//' $(git grep -E '[[:blank:]]+$')
---
exec/coroipcs.c | 2 +-
exec/main.c | 2 +-
exec/service.c | 32 ++++++++++++++++----------------
exec/totemconfig.c | 4 ++--
exec/totemip.c | 2 +-
exec/vsf_ykd.c | 2 +-
include/corosync/engine/coroapi.h | 2 +-
lcr/Makefile.am | 2 +-
lib/coroipcc.c | 2 +-
services/Makefile.am | 2 +-
10 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/exec/coroipcs.c b/exec/coroipcs.c
index c8e9eb0..e7b0934 100644
--- a/exec/coroipcs.c
+++ b/exec/coroipcs.c
@@ -100,7 +100,7 @@ struct zcb_mapped {
size_t size;
};
-#if defined(_SEM_SEMUN_UNDEFINED)
+#if defined(_SEM_SEMUN_UNDEFINED)
union semun {
int val;
struct semid_ds *buf;
diff --git a/exec/main.c b/exec/main.c
index d9cde9a..500f7c1 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -823,7 +823,7 @@ int main (int argc, char **argv)
log_printf (LOGSYS_LEVEL_ERROR, "Required directory not present %s. Please create it.\n", corosync_lib_dir);
corosync_exit_error (AIS_DONE_DIR_NOT_PRESENT);
}
-
+
res = totem_config_read (objdb, &totem_config, &error_string);
if (res == -1) {
diff --git a/exec/service.c b/exec/service.c
index 267549a..1b8b411 100644
--- a/exec/service.c
+++ b/exec/service.c
@@ -207,7 +207,7 @@ unsigned int corosync_service_link_and_init (
return (res);
}
-static int service_priority_max(void)
+static int service_priority_max(void)
{
int lpc = 0, max = 0;
for(; lpc < SERVICE_HANDLER_MAXIMUM_COUNT; lpc++) {
@@ -218,7 +218,7 @@ static int service_priority_max(void)
return max;
}
-extern unsigned int corosync_service_unlink_priority (struct corosync_api_v1 *corosync_api, int priority)
+extern unsigned int corosync_service_unlink_priority (struct corosync_api_v1 *corosync_api, int priority)
{
char *service_name;
unsigned int *service_ver;
@@ -233,13 +233,13 @@ extern unsigned int corosync_service_unlink_priority (struct corosync_api_v1 *co
} else {
log_printf(LOGSYS_LEVEL_NOTICE, "Unloading corosync components up to (and including) priority %d\n", priority);
}
-
+
for( ; p >= priority; p--) {
for(lpc = 0; lpc < SERVICE_HANDLER_MAXIMUM_COUNT; lpc++) {
if(ais_service[lpc] == NULL || ais_service[lpc]->priority != p) {
continue;
}
-
+
/* unload
*
* If we had a pointer to the objdb entry, we'd not need to go looking again...
@@ -247,43 +247,43 @@ extern unsigned int corosync_service_unlink_priority (struct corosync_api_v1 *co
corosync_api->object_find_create (
object_internal_configuration_handle,
"service", strlen ("service"), &object_find_handle);
-
+
while(corosync_api->object_find_next (
object_find_handle, &object_service_handle) == 0) {
int res = corosync_api->object_key_get (
object_service_handle,
"service_id", strlen ("service_id"), (void *)&service_id, NULL);
-
+
service_name = NULL;
if(res == 0 && *service_id == ais_service[lpc]->id) {
hdb_handle_t *found_service_handle;
corosync_api->object_key_get (
object_service_handle,
"name", strlen ("name"), (void *)&service_name, NULL);
-
+
corosync_api->object_key_get (
object_service_handle,
"ver", strlen ("ver"), (void *)&service_ver, NULL);
-
+
res = corosync_api->object_key_get (
object_service_handle,
"handle", strlen ("handle"), (void *)&found_service_handle, NULL);
-
+
res = corosync_api->object_key_get (
object_service_handle,
"service_id", strlen ("service_id"), (void *)&service_id, NULL);
-
+
log_printf(LOGSYS_LEVEL_NOTICE, "Unloading corosync component: %s v%u\n",
service_name, *service_ver);
-
+
if (ais_service[*service_id]->exec_exit_fn) {
ais_service[*service_id]->exec_exit_fn ();
}
ais_service[*service_id] = NULL;
-
+
lcr_ifact_release (*found_service_handle);
-
+
corosync_api->object_destroy (object_service_handle);
break;
}
@@ -338,17 +338,17 @@ extern unsigned int corosync_service_unlink_and_exit (
if (service_ver != *found_service_ver) {
continue;
}
-
+
corosync_api->object_key_get (
object_service_handle,
"service_id", strlen ("service_id"),
(void *)&service_id, NULL);
-
+
if(service_id != NULL
&& *service_id > 0
&& *service_id < SERVICE_HANDLER_MAXIMUM_COUNT
&& ais_service[*service_id] != NULL) {
-
+
corosync_api->object_find_destroy (object_find_handle);
return corosync_service_unlink_priority (corosync_api, ais_service[*service_id]->priority);
}
diff --git a/exec/totemconfig.c b/exec/totemconfig.c
index 81e13cf..93fd845 100644
--- a/exec/totemconfig.c
+++ b/exec/totemconfig.c
@@ -329,7 +329,7 @@ printf ("couldn't find totem handle\n");
totem_config->clear_node_high_bit = 1;
}
}
-
+
objdb_get_int (objdb,object_totem_handle, "threads", &totem_config->threads);
@@ -366,7 +366,7 @@ printf ("couldn't find totem handle\n");
&totem_config->interfaces[ringnumber].mcast_addr,
"255.255.255.255", 0);
}
-
+
}
diff --git a/exec/totemip.c b/exec/totemip.c
index ecac57b..3f37b53 100644
--- a/exec/totemip.c
+++ b/exec/totemip.c
@@ -314,7 +314,7 @@ int totemip_sockaddr_to_totemip_convert(const struct sockaddr_storage *saddr,
return ret;
}
-/*
+/*
* On Solaris, man if_tcp describes this method
*/
#if defined(COROSYNC_SOLARIS)
diff --git a/exec/vsf_ykd.c b/exec/vsf_ykd.c
index 4646651..3097edd 100644
--- a/exec/vsf_ykd.c
+++ b/exec/vsf_ykd.c
@@ -549,7 +549,7 @@ static struct lcr_comp vsf_ykd_comp_ver0 = {
void corosync_lcr_component_register (void);
void corosync_lcr_component_register (void) {
-#else
+#else
__attribute__ ((constructor)) static void corosync_lcr_component_register (void) {
#endif
lcr_component_register (&vsf_ykd_comp_ver0);
diff --git a/include/corosync/engine/coroapi.h b/include/corosync/engine/coroapi.h
index 48adc42..bee174a 100644
--- a/include/corosync/engine/coroapi.h
+++ b/include/corosync/engine/coroapi.h
@@ -601,7 +601,7 @@ struct corosync_service_engine {
unsigned short id;
unsigned short priority; /* Lower priority are loaded first, unloaded last.
* 0 is a special case which always loaded _and_ unloaded last
- */
+ */
unsigned int private_data_size;
enum cs_lib_flow_control flow_control;
enum cs_lib_allow_inquorate allow_inquorate;
diff --git a/lcr/Makefile.am b/lcr/Makefile.am
index 7830aa3..628843c 100644
--- a/lcr/Makefile.am
+++ b/lcr/Makefile.am
@@ -53,7 +53,7 @@ if BUILD_DARWIN
%.lcrso: %.o
$(CC) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@
-else
+else
if BUILD_SOLARIS
diff --git a/lib/coroipcc.c b/lib/coroipcc.c
index 35f7aa2..064de17 100644
--- a/lib/coroipcc.c
+++ b/lib/coroipcc.c
@@ -123,7 +123,7 @@ socket_send (
msg_send.msg_name = 0;
msg_send.msg_namelen = 0;
-#if !defined(COROSYNC_SOLARIS)
+#if !defined(COROSYNC_SOLARIS)
msg_send.msg_control = 0;
msg_send.msg_controllen = 0;
msg_send.msg_flags = 0;
diff --git a/services/Makefile.am b/services/Makefile.am
index a0fd864..61f42d6 100644
--- a/services/Makefile.am
+++ b/services/Makefile.am
@@ -67,7 +67,7 @@ quorum_%.lcrso: %.o
service_%.lcrso: %.o
$(LD) $(LDFLAGS) -G $^ -o $@
-
+
else
quorum_%.lcrso: %.o
$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
--
1.6.3.2.416.g04d0
More information about the Openais
mailing list