--- a/src/libident/id_open.c	Mon Oct 27 16:21:27 2008 +0100
+++ b/src/libident/id_open.c	Mon Oct 27 16:23:10 2008 +0100
@@ -39,129 +39,120 @@
 
 
 /*
-ident_t *id_open __P3(struct in_addr *, laddr,
-		      struct in_addr *, faddr,
-		      struct timeval *, timeout)
+ident_t *id_open __P3(struct in_addr *, laddr, struct in_addr *, faddr, struct timeval *, timeout)
 */
 
-ident_t *id_open __P((	__STRUCT_IN_ADDR_P laddr,
-			__STRUCT_IN_ADDR_P faddr,
-			__STRUCT_TIMEVAL_P timeout))
+ident_t*
+id_open __P((__STRUCT_IN_ADDR_P laddr, __STRUCT_IN_ADDR_P faddr, __STRUCT_TIMEVAL_P timeout))
 {
-    ident_t *id;
-    int res, tmperrno;
-    struct sockaddr_in sin_laddr, sin_faddr;
-    fd_set rs, ws, es;
+	ident_t *id;
+	int res, tmperrno;
+	struct sockaddr_in sin_laddr, sin_faddr;
+	fd_set rs, ws, es;
 #ifndef OLD_SETSOCKOPT
-    int on = 1;
-    struct linger linger;
+	int on = 1;
+	struct linger linger;
 #endif
-    
-    if ((id = (ident_t *) malloc(sizeof(*id))) == 0)
-	return 0;
-    
-    if ((id->fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-    {
-	free(id);
-	return 0;
-    }
-    
-    if (timeout)
-    {
-	if ((res = fcntl(id->fd, F_GETFL, 0)) < 0)
-	    goto ERROR;
+
+	if ((id = (ident_t *) malloc(sizeof(*id))) == 0)
+		return 0;
+
+	if ((id->fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+		free(id);
+		return 0;
+	}
+
+	if (timeout) {
+		if ((res = fcntl(id->fd, F_GETFL, 0)) < 0)
+			goto ERROR;
 
 #ifndef VMS
-	if (fcntl(id->fd, F_SETFL, res | FNDELAY) < 0)
-	    goto ERROR;
+		if (fcntl(id->fd, F_SETFL, res | FNDELAY) < 0)
+			goto ERROR;
 #endif
-    }
+	}
 
-    /* We silently ignore errors if we can't change LINGER */
+	/* We silently ignore errors if we can't change LINGER */
 #ifdef OLD_SETSOCKOPT
-    /* Old style setsockopt() */
-    (void) setsockopt(id->fd, SOL_SOCKET, SO_DONTLINGER);
-    (void) setsockopt(id->fd, SOL_SOCKET, SO_REUSEADDR);
+	/* Old style setsockopt() */
+	(void) setsockopt(id->fd, SOL_SOCKET, SO_DONTLINGER);
+	(void) setsockopt(id->fd, SOL_SOCKET, SO_REUSEADDR);
 #else
-    /* New style setsockopt() */
-    linger.l_onoff = 0;
-    linger.l_linger = 0;
-    
-    (void) setsockopt(id->fd, SOL_SOCKET, SO_LINGER, (void *) &linger, sizeof(linger));
-    (void) setsockopt(id->fd, SOL_SOCKET, SO_REUSEADDR, (void *) &on, sizeof(on));
+	/* New style setsockopt() */
+	linger.l_onoff = 0;
+	linger.l_linger = 0;
+
+	(void) setsockopt(id->fd, SOL_SOCKET, SO_LINGER, (void *) &linger, sizeof(linger));
+	(void) setsockopt(id->fd, SOL_SOCKET, SO_REUSEADDR, (void *) &on, sizeof(on));
 #endif
-    
-    id->buf[0] = '\0';
-    
-    bzero((char *)&sin_laddr, sizeof(sin_laddr));
-    sin_laddr.sin_family = AF_INET;
-    sin_laddr.sin_addr = *laddr;
-    sin_laddr.sin_port = 0;
-    
-    if (bind(id->fd, (struct sockaddr *) &sin_laddr, sizeof(sin_laddr)) < 0)
-    {
+
+	id->buf[0] = '\0';
+
+	bzero((char *) &sin_laddr, sizeof(sin_laddr));
+	sin_laddr.sin_family = AF_INET;
+	sin_laddr.sin_addr = *laddr;
+	sin_laddr.sin_port = 0;
+
+	if (bind(id->fd, (struct sockaddr *) &sin_laddr, sizeof(sin_laddr)) < 0) {
 #ifdef DEBUG
-	perror("libident: bind");
+		perror("libident: bind");
 #endif
-	goto ERROR;
-    }
-    
-    bzero((char *)&sin_faddr, sizeof(sin_faddr));
-    sin_faddr.sin_family = AF_INET;
-    sin_faddr.sin_addr = *faddr;
-    sin_faddr.sin_port = htons(IDPORT);
+		goto ERROR;
+	}
 
-    errno = 0;
-    res = connect(id->fd, (struct sockaddr *) &sin_faddr, sizeof(sin_faddr));
-    if (res < 0 && errno != EINPROGRESS)
-    {
+	bzero((char *) &sin_faddr, sizeof(sin_faddr));
+	sin_faddr.sin_family = AF_INET;
+	sin_faddr.sin_addr = *faddr;
+	sin_faddr.sin_port = htons(IDPORT);
+
+	errno = 0;
+	res = connect(id->fd, (struct sockaddr *) &sin_faddr, sizeof(sin_faddr));
+	if (res < 0 && errno != EINPROGRESS) {
 #ifdef DEBUG
-	perror("libident: connect");
+		perror("libident: connect");
 #endif
-	goto ERROR;
-    }
+		goto ERROR;
+	}
 
-    if (timeout)
-    {
-	FD_ZERO(&rs);
-	FD_ZERO(&ws);
-	FD_ZERO(&es);
-	
-	FD_SET(id->fd, &rs);
-	FD_SET(id->fd, &ws);
-	FD_SET(id->fd, &es);
+	if (timeout) {
+		FD_ZERO(&rs);
+		FD_ZERO(&ws);
+		FD_ZERO(&es);
+
+		FD_SET(id->fd, &rs);
+		FD_SET(id->fd, &ws);
+		FD_SET(id->fd, &es);
 
 #ifdef __hpux
-	if ((res = select(FD_SETSIZE, (int *) &rs, (int *) &ws, (int *) &es, timeout)) < 0)
+		if ((res = select(FD_SETSIZE, (int *) &rs, (int *) &ws, (int *) &es, timeout)) < 0)
 #else
-	if ((res = select(FD_SETSIZE, &rs, &ws, &es, timeout)) < 0)
+		if ((res = select(FD_SETSIZE, &rs, &ws, &es, timeout)) < 0)
 #endif
-	{
+		{
 #ifdef DEBUG
-	    perror("libident: select");
+			perror("libident: select");
 #endif
-	    goto ERROR;
-	}
-	
-	if (res == 0)
-	{
-	    errno = ETIMEDOUT;
-	    goto ERROR;
+			goto ERROR;
+		}
+
+		if (res == 0) {
+			errno = ETIMEDOUT;
+			goto ERROR;
+		}
+
+		if (FD_ISSET(id->fd, &es))
+			goto ERROR;
+
+		if (!FD_ISSET(id->fd, &rs) && !FD_ISSET(id->fd, &ws))
+			goto ERROR;
 	}
-	
-	if (FD_ISSET(id->fd, &es))
-	    goto ERROR;
-	
-	if (!FD_ISSET(id->fd, &rs) && !FD_ISSET(id->fd, &ws))
-	    goto ERROR;
-    }
-    
-    return id;
-    
+
+	return id;
+
   ERROR:
-    tmperrno = errno;		/* Save, so close() won't erase it */
-    close(id->fd);
-    free(id);
-    errno = tmperrno;
-    return 0;
+	tmperrno = errno;  /* Save, so close() won't erase it */
+	close(id->fd);
+	free(id);
+	errno = tmperrno;
+	return 0;
 }