aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-10-18 21:03:02 +0200
committerJelmer Vernooij <jelmer@samba.org>2007-10-18 21:03:02 +0200
commit7435ccf486eee2f60d6a8b2ab0029b8f4ce17ab7 (patch)
treee3d275c3b2c1229cc12eb7aeb2531d009fc3c919
parente9b755e3726fa41ac2d4ed1c3a6192d1af68edbc (diff)
Fix indentation.
-rw-r--r--bitlbee.c20
-rw-r--r--irc.c22
2 files changed, 21 insertions, 21 deletions
diff --git a/bitlbee.c b/bitlbee.c
index 3065aa9d..625ea214 100644
--- a/bitlbee.c
+++ b/bitlbee.c
@@ -44,14 +44,14 @@ int bitlbee_daemon_init()
log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
- memset(&hints, 0, sizeof(hints));
+ memset( &hints, 0, sizeof( hints ) );
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
- i = getaddrinfo(global.conf->iface, global.conf->port, &hints,
- &addrinfo_bind);
- if (i) {
+ i = getaddrinfo( global.conf->iface, global.conf->port, &hints,
+ &addrinfo_bind );
+ if ( i ) {
log_message( LOGLVL_ERROR, "Couldn't parse address `%s': %s",
global.conf->iface, gai_strerror(i) );
return -1;
@@ -59,10 +59,10 @@ int bitlbee_daemon_init()
global.listen_socket = -1;
- for (res = addrinfo_bind; res; res = res->ai_next) {
- global.listen_socket = socket(res->ai_family, res->ai_socktype,
- res->ai_protocol);
- if (global.listen_socket < 0)
+ for ( res = addrinfo_bind; res; res = res->ai_next ) {
+ global.listen_socket = socket( res->ai_family, res->ai_socktype,
+ res->ai_protocol );
+ if ( global.listen_socket < 0 )
continue;
/* TIME_WAIT (?) sucks.. */
@@ -70,7 +70,7 @@ int bitlbee_daemon_init()
setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i,
sizeof( i ) );
- i = bind( global.listen_socket, res->ai_addr, res->ai_addrlen);
+ i = bind( global.listen_socket, res->ai_addr, res->ai_addrlen );
if( i == -1 )
{
log_error( "bind" );
@@ -80,7 +80,7 @@ int bitlbee_daemon_init()
break;
}
- freeaddrinfo(addrinfo_bind);
+ freeaddrinfo( addrinfo_bind );
i = listen( global.listen_socket, 10 );
if( i == -1 )
diff --git a/irc.c b/irc.c
index 0f8f1b82..1a1f511e 100644
--- a/irc.c
+++ b/irc.c
@@ -45,7 +45,7 @@ irc_t *irc_new( int fd )
{
irc_t *irc;
struct sockaddr_storage sock;
- socklen_t socklen = sizeof(sock);
+ socklen_t socklen = sizeof( sock );
irc = g_new0( irc_t, 1 );
@@ -66,25 +66,25 @@ irc_t *irc_new( int fd )
if( global.conf->hostname )
irc->myhost = g_strdup( global.conf->hostname );
- else if( getsockname( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0)
+ else if( getsockname( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0 )
{
- irc->myhost = g_new0(char, NI_MAXHOST);
+ irc->myhost = g_new0( char, NI_MAXHOST );
- if (getnameinfo((struct sockaddr *)&sock, socklen, irc->myhost,
- NI_MAXHOST, NULL, -1, 0)) {
+ if (getnameinfo( (struct sockaddr *) &sock, socklen, irc->myhost,
+ NI_MAXHOST, NULL, -1, 0) ) {
/* Rare, but possible. */
- strncpy(irc->myhost, "localhost.", NI_MAXHOST);
+ strncpy( irc->myhost, "localhost.", NI_MAXHOST );
}
}
- if( getpeername( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0)
+ if( getpeername( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0 )
{
- irc->host = g_new0(char, NI_MAXHOST);
+ irc->host = g_new0( char, NI_MAXHOST );
- if (getnameinfo((struct sockaddr *)&sock, socklen, irc->host,
- NI_MAXHOST, NULL, -1, 0)) {
+ if ( getnameinfo( (struct sockaddr *)&sock, socklen, irc->host,
+ NI_MAXHOST, NULL, -1, 0 ) ) {
/* Rare, but possible. */
- strncpy(irc->myhost, "localhost.", NI_MAXHOST);
+ strncpy( irc->myhost, "localhost.", NI_MAXHOST );
}
}