Changeset 7435ccf

Timestamp:

2007-10-18T19:03:02Z (17 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

2231302

Parents:

e9b755e

Message:

Fix indentation.

Files:

• bitlbee.c (modified) (4 diffs)
• irc.c (modified) (2 diffs)

bitlbee.c

@@ -45 +45 @@
         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) );
@@ -60 +60 @@
         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;
 
@@ -71 +71 @@
                                         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 )
                 {
@@ -81 +81 @@
         }
 
-        freeaddrinfo(addrinfo_bind);
+        freeaddrinfo( addrinfo_bind );
 
         i = listen( global.listen_socket, 10 );

irc.c

@@ -46 +46 @@
         irc_t *irc;
         struct sockaddr_storage sock;
-        socklen_t socklen = sizeof(sock);
+        socklen_t socklen = sizeof( sock );
         
         irc = g_new0( irc_t, 1 );
@@ -67 +67 @@
         if( global.conf->hostname )
                 irc->myhost = g_strdup( global.conf->hostname );
-        else if( getsockname( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0) 
-        {
-                irc->myhost = g_new0(char, NI_MAXHOST);
-
-                if (getnameinfo((struct sockaddr *)&sock, socklen, irc->myhost, 
-                                                NI_MAXHOST, NULL, -1, 0)) {
+        else if( getsockname( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0 ) 
+        {
+                irc->myhost = g_new0( char, NI_MAXHOST );
+
+                if (getnameinfo( (struct sockaddr *) &sock, socklen, irc->myhost, 
+                                                NI_MAXHOST, NULL, -1, 0) ) {
                         /* Rare, but possible. */
-                        strncpy(irc->myhost, "localhost.", NI_MAXHOST);
-                }
-        }
-        
-        if( getpeername( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0)
-        {
-                irc->host = g_new0(char, NI_MAXHOST);
-
-                if (getnameinfo((struct sockaddr *)&sock, socklen, irc->host, 
-                                                NI_MAXHOST, NULL, -1, 0)) {
+                        strncpy( irc->myhost, "localhost.", NI_MAXHOST );
+                }
+        }
+        
+        if( getpeername( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0 )
+        {
+                irc->host = g_new0( char, NI_MAXHOST );
+
+                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 );
                 }
         }