Procházet zdrojové kódy

maint: remove trailing blanks

By running this command from a git-cloned directory:
git grep -z -l -E '[[:blank:]]+$' | xargs -0 perl -pi -e 's/[ \t]+$//'

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2266 fd59a12c-fef9-0310-b244-a6a79926bd2f
Jim Meyering před 16 roky
rodič
revize
74a2fa1194

+ 1 - 1
exec/coroipcs.c

@@ -100,7 +100,7 @@ struct zcb_mapped {
 	size_t size;
 	size_t size;
 };
 };
 
 
-#if defined(_SEM_SEMUN_UNDEFINED) 
+#if defined(_SEM_SEMUN_UNDEFINED)
 union semun {
 union semun {
 	int val;
 	int val;
 	struct semid_ds *buf;
 	struct semid_ds *buf;

+ 1 - 1
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);
 		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);
 		corosync_exit_error (AIS_DONE_DIR_NOT_PRESENT);
 	}
 	}
-	
+
 
 
 	res = totem_config_read (objdb, &totem_config, &error_string);
 	res = totem_config_read (objdb, &totem_config, &error_string);
 	if (res == -1) {
 	if (res == -1) {

+ 16 - 16
exec/service.c

@@ -207,7 +207,7 @@ unsigned int corosync_service_link_and_init (
 	return (res);
 	return (res);
 }
 }
 
 
-static int service_priority_max(void) 
+static int service_priority_max(void)
 {
 {
     int lpc = 0, max = 0;
     int lpc = 0, max = 0;
     for(; lpc < SERVICE_HANDLER_MAXIMUM_COUNT; lpc++) {
     for(; lpc < SERVICE_HANDLER_MAXIMUM_COUNT; lpc++) {
@@ -218,7 +218,7 @@ static int service_priority_max(void)
     return max;
     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;
 	char *service_name;
 	unsigned int *service_ver;
 	unsigned int *service_ver;
@@ -233,13 +233,13 @@ extern unsigned int corosync_service_unlink_priority (struct corosync_api_v1 *co
 	} else {
 	} else {
 	    log_printf(LOGSYS_LEVEL_NOTICE, "Unloading corosync components up to (and including) priority %d\n", priority);
 	    log_printf(LOGSYS_LEVEL_NOTICE, "Unloading corosync components up to (and including) priority %d\n", priority);
 	}
 	}
-	
+
 	for( ; p >= priority; p--) {
 	for( ; p >= priority; p--) {
 	    for(lpc = 0; lpc < SERVICE_HANDLER_MAXIMUM_COUNT; lpc++) {
 	    for(lpc = 0; lpc < SERVICE_HANDLER_MAXIMUM_COUNT; lpc++) {
 		if(ais_service[lpc] == NULL || ais_service[lpc]->priority != p) {
 		if(ais_service[lpc] == NULL || ais_service[lpc]->priority != p) {
 		    continue;
 		    continue;
 		}
 		}
-		
+
 		/* unload
 		/* unload
 		 *
 		 *
 		 * If we had a pointer to the objdb entry, we'd not need to go looking again...
 		 * 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 (
  		corosync_api->object_find_create (
 		    object_internal_configuration_handle,
 		    object_internal_configuration_handle,
 		    "service", strlen ("service"), &object_find_handle);
 		    "service", strlen ("service"), &object_find_handle);
-		
+
 		while(corosync_api->object_find_next (
 		while(corosync_api->object_find_next (
 			  object_find_handle, &object_service_handle) == 0) {
 			  object_find_handle, &object_service_handle) == 0) {
 
 
 		    int res = corosync_api->object_key_get (
 		    int res = corosync_api->object_key_get (
 			object_service_handle,
 			object_service_handle,
 			"service_id", strlen ("service_id"), (void *)&service_id, NULL);
 			"service_id", strlen ("service_id"), (void *)&service_id, NULL);
-		    
+
 		    service_name = NULL;
 		    service_name = NULL;
 		    if(res == 0 && *service_id == ais_service[lpc]->id) {
 		    if(res == 0 && *service_id == ais_service[lpc]->id) {
 			hdb_handle_t *found_service_handle;
 			hdb_handle_t *found_service_handle;
 			corosync_api->object_key_get (
 			corosync_api->object_key_get (
 			    object_service_handle,
 			    object_service_handle,
 			    "name", strlen ("name"), (void *)&service_name, NULL);
 			    "name", strlen ("name"), (void *)&service_name, NULL);
-			
+
 			corosync_api->object_key_get (
 			corosync_api->object_key_get (
 			    object_service_handle,
 			    object_service_handle,
 			    "ver", strlen ("ver"), (void *)&service_ver, NULL);
 			    "ver", strlen ("ver"), (void *)&service_ver, NULL);
-			
+
 			res = corosync_api->object_key_get (
 			res = corosync_api->object_key_get (
 			    object_service_handle,
 			    object_service_handle,
 			    "handle", strlen ("handle"), (void *)&found_service_handle, NULL);
 			    "handle", strlen ("handle"), (void *)&found_service_handle, NULL);
-			
+
 			res = corosync_api->object_key_get (
 			res = corosync_api->object_key_get (
 			    object_service_handle,
 			    object_service_handle,
 			    "service_id", strlen ("service_id"), (void *)&service_id, NULL);
 			    "service_id", strlen ("service_id"), (void *)&service_id, NULL);
-			
+
 			log_printf(LOGSYS_LEVEL_NOTICE, "Unloading corosync component: %s v%u\n",
 			log_printf(LOGSYS_LEVEL_NOTICE, "Unloading corosync component: %s v%u\n",
 				   service_name, *service_ver);
 				   service_name, *service_ver);
-			
+
 			if (ais_service[*service_id]->exec_exit_fn) {
 			if (ais_service[*service_id]->exec_exit_fn) {
 			    ais_service[*service_id]->exec_exit_fn ();
 			    ais_service[*service_id]->exec_exit_fn ();
 			}
 			}
 			ais_service[*service_id] = NULL;
 			ais_service[*service_id] = NULL;
-			
+
 			lcr_ifact_release (*found_service_handle);
 			lcr_ifact_release (*found_service_handle);
-			
+
 			corosync_api->object_destroy (object_service_handle);
 			corosync_api->object_destroy (object_service_handle);
 			break;
 			break;
 		    }
 		    }
@@ -338,17 +338,17 @@ extern unsigned int corosync_service_unlink_and_exit (
 		if (service_ver != *found_service_ver) {
 		if (service_ver != *found_service_ver) {
 		    continue;
 		    continue;
 		}
 		}
-		    
+
 		corosync_api->object_key_get (
 		corosync_api->object_key_get (
 		    object_service_handle,
 		    object_service_handle,
 		    "service_id", strlen ("service_id"),
 		    "service_id", strlen ("service_id"),
 		    (void *)&service_id, NULL);
 		    (void *)&service_id, NULL);
-		
+
 		if(service_id != NULL
 		if(service_id != NULL
 		   && *service_id > 0
 		   && *service_id > 0
 		   && *service_id < SERVICE_HANDLER_MAXIMUM_COUNT
 		   && *service_id < SERVICE_HANDLER_MAXIMUM_COUNT
 		   && ais_service[*service_id] != NULL) {
 		   && ais_service[*service_id] != NULL) {
-		    
+
 		    corosync_api->object_find_destroy (object_find_handle);
 		    corosync_api->object_find_destroy (object_find_handle);
 		    return corosync_service_unlink_priority (corosync_api, ais_service[*service_id]->priority);
 		    return corosync_service_unlink_priority (corosync_api, ais_service[*service_id]->priority);
 		}
 		}

+ 2 - 2
exec/totemconfig.c

@@ -329,7 +329,7 @@ printf ("couldn't find totem handle\n");
 			totem_config->clear_node_high_bit = 1;
 			totem_config->clear_node_high_bit = 1;
 		}
 		}
 	}
 	}
-	
+
 	objdb_get_int (objdb,object_totem_handle, "threads", &totem_config->threads);
 	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,
 					&totem_config->interfaces[ringnumber].mcast_addr,
 					"255.255.255.255", 0);
 					"255.255.255.255", 0);
 			}
 			}
-			
+
 
 
 		}
 		}
 
 

+ 1 - 1
exec/totemip.c

@@ -314,7 +314,7 @@ int totemip_sockaddr_to_totemip_convert(const struct sockaddr_storage *saddr,
 	return ret;
 	return ret;
 }
 }
 
 
-/* 
+/*
  * On Solaris, man if_tcp describes this method
  * On Solaris, man if_tcp describes this method
  */
  */
 #if defined(COROSYNC_SOLARIS)
 #if defined(COROSYNC_SOLARIS)

+ 1 - 1
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);
 
 
 void corosync_lcr_component_register (void) {
 void corosync_lcr_component_register (void) {
-#else 
+#else
 __attribute__ ((constructor)) static void corosync_lcr_component_register (void) {
 __attribute__ ((constructor)) static void corosync_lcr_component_register (void) {
 #endif
 #endif
 	lcr_component_register (&vsf_ykd_comp_ver0);
 	lcr_component_register (&vsf_ykd_comp_ver0);

+ 1 - 1
include/corosync/engine/coroapi.h

@@ -601,7 +601,7 @@ struct corosync_service_engine {
 	unsigned short id;
 	unsigned short id;
 	unsigned short priority; /* Lower priority are loaded first, unloaded last.
 	unsigned short priority; /* Lower priority are loaded first, unloaded last.
 				  * 0 is a special case which always loaded _and_ unloaded last
 				  * 0 is a special case which always loaded _and_ unloaded last
-				  */ 
+				  */
 	unsigned int private_data_size;
 	unsigned int private_data_size;
 	enum cs_lib_flow_control flow_control;
 	enum cs_lib_flow_control flow_control;
 	enum cs_lib_allow_inquorate allow_inquorate;
 	enum cs_lib_allow_inquorate allow_inquorate;

+ 1 - 1
lcr/Makefile.am

@@ -53,7 +53,7 @@ if BUILD_DARWIN
 
 
 %.lcrso: %.o
 %.lcrso: %.o
 	$(CC) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@
 	$(CC) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@
-else 
+else
 
 
 if BUILD_SOLARIS
 if BUILD_SOLARIS
 
 

+ 1 - 1
lib/coroipcc.c

@@ -123,7 +123,7 @@ socket_send (
 	msg_send.msg_name = 0;
 	msg_send.msg_name = 0;
 	msg_send.msg_namelen = 0;
 	msg_send.msg_namelen = 0;
 
 
-#if !defined(COROSYNC_SOLARIS) 
+#if !defined(COROSYNC_SOLARIS)
 	msg_send.msg_control = 0;
 	msg_send.msg_control = 0;
 	msg_send.msg_controllen = 0;
 	msg_send.msg_controllen = 0;
 	msg_send.msg_flags = 0;
 	msg_send.msg_flags = 0;

+ 1 - 1
services/Makefile.am

@@ -65,7 +65,7 @@ quorum_%.lcrso: %.o
 
 
 service_%.lcrso: %.o
 service_%.lcrso: %.o
 	$(LD) $(LDFLAGS) -G $^ -o $@
 	$(LD) $(LDFLAGS) -G $^ -o $@
- 
+
 else
 else
 quorum_%.lcrso: %.o
 quorum_%.lcrso: %.o
 	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@