From a97605e07ad7f44f2f65e15be64880e61a39ab43 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 25 Jun 2010 01:08:29 +0200 Subject: from now on we enforce a strict whitespace regime --- avahi-compat-howl/include/salt/address.h | 4 +-- avahi-compat-howl/include/salt/debug.h | 4 +-- avahi-compat-howl/include/salt/interface.h | 2 +- avahi-compat-howl/include/salt/platform.h | 14 ++++---- avahi-compat-howl/include/salt/salt.h | 24 ++++++------- avahi-compat-howl/include/salt/signal.h | 6 ++-- avahi-compat-howl/include/salt/socket.h | 54 +++++++++++++++--------------- avahi-compat-howl/include/salt/time.h | 6 ++-- 8 files changed, 57 insertions(+), 57 deletions(-) (limited to 'avahi-compat-howl/include/salt') diff --git a/avahi-compat-howl/include/salt/address.h b/avahi-compat-howl/include/salt/address.h index b18a4af..ea83f8d 100644 --- a/avahi-compat-howl/include/salt/address.h +++ b/avahi-compat-howl/include/salt/address.h @@ -8,7 +8,7 @@ * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. @@ -91,7 +91,7 @@ sw_ipv4_address_fina( sw_bool HOWL_API sw_ipv4_address_is_any( sw_ipv4_address self); - + sw_saddr HOWL_API sw_ipv4_address_saddr( diff --git a/avahi-compat-howl/include/salt/debug.h b/avahi-compat-howl/include/salt/debug.h index 03bd453..c53977b 100644 --- a/avahi-compat-howl/include/salt/debug.h +++ b/avahi-compat-howl/include/salt/debug.h @@ -8,7 +8,7 @@ * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. @@ -36,7 +36,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #define SW_LOG_WARNING 1 << 0 diff --git a/avahi-compat-howl/include/salt/interface.h b/avahi-compat-howl/include/salt/interface.h index 5356398..a4b1b1d 100644 --- a/avahi-compat-howl/include/salt/interface.h +++ b/avahi-compat-howl/include/salt/interface.h @@ -8,7 +8,7 @@ * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. diff --git a/avahi-compat-howl/include/salt/platform.h b/avahi-compat-howl/include/salt/platform.h index fda0c77..6bb9dcc 100644 --- a/avahi-compat-howl/include/salt/platform.h +++ b/avahi-compat-howl/include/salt/platform.h @@ -8,7 +8,7 @@ * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. @@ -33,7 +33,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif #if defined(__VXWORKS__) @@ -119,7 +119,7 @@ typedef int sw_result; * for little endian platforms. * * The macro WORDS_BIGENDIAN will be defined - * by autoconf. If you are using Howl on + * by autoconf. If you are using Howl on * a platform that doesn't have autoconf, define * SW_ENDIAN directly * -------------------------------------------------------- @@ -185,19 +185,19 @@ extern sw_int32 sw_strcasecmp( sw_const_string arg1, sw_const_string arg2); - + extern sw_int32 sw_strncasecmp( sw_const_string arg1, sw_const_string arg2, sw_len n); - + extern sw_string sw_strtok_r( sw_string arg1, sw_const_string arg2, sw_string * lasts); - + # define sw_memset(ARG1, ARG2, ARG3) memset((char*) ARG1, ARG2, ARG3) # define sw_memcpy(ARG1, ARG2, ARG3) memcpy((char*) ARG1, (char*) ARG2, ARG3) # define sw_memcmp(ARG1, ARG2, ARG3) memcmp((char*) ARG1, ARG2, ARG3) @@ -413,7 +413,7 @@ sw_strerror(); /* * Obsolete types and macros. - * + * * These are here for backwards compatibility, but will * be removed in the future */ diff --git a/avahi-compat-howl/include/salt/salt.h b/avahi-compat-howl/include/salt/salt.h index 88ac0d9..ddb289b 100644 --- a/avahi-compat-howl/include/salt/salt.h +++ b/avahi-compat-howl/include/salt/salt.h @@ -8,7 +8,7 @@ * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. @@ -36,14 +36,14 @@ #ifdef __cplusplus extern "C" { -#endif +#endif typedef enum _sw_socket_event { SW_SOCKET_READ = (1 << 0), SW_SOCKET_WRITE = (1 << 1), - SW_SOCKET_OOB = (1 << 2) + SW_SOCKET_OOB = (1 << 2) } sw_socket_event; @@ -80,7 +80,7 @@ typedef sw_result sw_salt salt, struct _sw_network_interface * netif, sw_opaque extra); - + typedef sw_opaque sw_signal_handler; typedef sw_result (HOWL_API *sw_signal_handler_func)( @@ -95,13 +95,13 @@ sw_salt_init( sw_salt * self, int argc, char ** argv); - - + + sw_result HOWL_API sw_salt_fina( sw_salt self); - + sw_result HOWL_API sw_salt_register_socket( sw_salt self, @@ -116,8 +116,8 @@ sw_result HOWL_API sw_salt_unregister_socket( sw_salt self, struct _sw_socket * socket); - - + + sw_result HOWL_API sw_salt_register_timer( sw_salt self, @@ -126,8 +126,8 @@ sw_salt_register_timer( sw_timer_handler handler, sw_timer_handler_func func, sw_opaque extra); - - + + sw_result HOWL_API sw_salt_unregister_timer( sw_salt self, @@ -187,7 +187,7 @@ sw_salt_run( sw_result HOWL_API sw_salt_stop_run( sw_salt self); - + #define SW_FALSE 0 #define SW_TRUE 1 diff --git a/avahi-compat-howl/include/salt/signal.h b/avahi-compat-howl/include/salt/signal.h index 2ae5bb3..b36e02f 100644 --- a/avahi-compat-howl/include/salt/signal.h +++ b/avahi-compat-howl/include/salt/signal.h @@ -8,7 +8,7 @@ * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. @@ -35,7 +35,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif struct _sw_signal; @@ -55,7 +55,7 @@ sw_signal_fina( #ifdef __cplusplus } -#endif +#endif #endif diff --git a/avahi-compat-howl/include/salt/socket.h b/avahi-compat-howl/include/salt/socket.h index 88773e4..9eaa102 100644 --- a/avahi-compat-howl/include/salt/socket.h +++ b/avahi-compat-howl/include/salt/socket.h @@ -8,7 +8,7 @@ * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. @@ -36,7 +36,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif struct _sw_socket; @@ -66,8 +66,8 @@ sw_udp_socket_init( sw_result HOWL_API sw_multicast_socket_init( sw_socket * self); - - + + sw_result HOWL_API sw_socket_fina( sw_socket self); @@ -97,21 +97,21 @@ sw_result HOWL_API sw_socket_listen( sw_socket self, int qsize); - - + + sw_result HOWL_API sw_socket_connect( sw_socket self, sw_ipv4_address address, sw_port port); - - + + sw_result HOWL_API sw_socket_accept( sw_socket self, sw_socket * socket); - - + + sw_result HOWL_API sw_socket_send( sw_socket self, @@ -129,7 +129,7 @@ sw_socket_sendto( sw_ipv4_address to, sw_port port); - + sw_result HOWL_API sw_socket_recv( sw_socket self, @@ -154,13 +154,13 @@ sw_result HOWL_API sw_socket_set_blocking_mode( sw_socket self, sw_bool blocking_mode); - - + + sw_result HOWL_API sw_socket_set_options( sw_socket self, sw_socket_options options); - + sw_ipv4_address HOWL_API sw_socket_ipv4_address( @@ -185,31 +185,31 @@ sw_socket_close( sw_result HOWL_API sw_socket_options_init( sw_socket_options * self); - + sw_result HOWL_API sw_socket_options_fina( sw_socket_options self); - + sw_result HOWL_API sw_socket_options_set_debug( sw_socket_options self, sw_bool val); - + sw_result HOWL_API sw_socket_options_set_nodelay( sw_socket_options self, sw_bool val); - - + + sw_result HOWL_API sw_socket_options_set_dontroute( sw_socket_options self, sw_bool val); - - + + sw_result HOWL_API sw_socket_options_set_keepalive( sw_socket_options self, @@ -221,8 +221,8 @@ sw_socket_options_set_linger( sw_socket_options self, sw_bool onoff, sw_uint32 linger); - - + + sw_result HOWL_API sw_socket_options_set_reuseaddr( sw_socket_options self, @@ -233,8 +233,8 @@ sw_result HOWL_API sw_socket_options_set_rcvbuf( sw_socket_options self, sw_uint32 val); - - + + sw_result HOWL_API sw_socket_options_set_sndbuf( sw_socket_options self, @@ -242,7 +242,7 @@ sw_socket_options_set_sndbuf( int -sw_socket_error_code(void); +sw_socket_error_code(void); #define SW_E_SOCKET_BASE 0x80000200 @@ -257,7 +257,7 @@ sw_socket_error_code(void); #ifdef __cplusplus } -#endif +#endif #endif diff --git a/avahi-compat-howl/include/salt/time.h b/avahi-compat-howl/include/salt/time.h index b3ec226..8789b3a 100644 --- a/avahi-compat-howl/include/salt/time.h +++ b/avahi-compat-howl/include/salt/time.h @@ -8,7 +8,7 @@ * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. @@ -35,7 +35,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif struct _sw_timer; @@ -94,7 +94,7 @@ sw_time_cmp( #ifdef __cplusplus } -#endif +#endif #endif -- cgit