From f2c620137fa5290d913373e5579a97f0fee25fa3 Mon Sep 17 00:00:00 2001
From: james <>
Date: Mon, 3 Mar 2008 06:04:42 +0000
Subject: *** empty log message ***

---
 src/symsocket.c | 96 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 53 insertions(+), 43 deletions(-)

(limited to 'src/symsocket.c')

diff --git a/src/symsocket.c b/src/symsocket.c
index 6f33fe7..0978914 100644
--- a/src/symsocket.c
+++ b/src/symsocket.c
@@ -11,6 +11,9 @@ static char rcsid[] =
 
 /*
  * $Log$
+ * Revision 1.8  2008/03/03 06:04:42  james
+ * *** empty log message ***
+ *
  * Revision 1.7  2008/03/02 10:37:56  james
  * *** empty log message ***
  *
@@ -83,10 +86,11 @@ socket_free (Socket * s)
     slide_free (s->read_buf);
   if (s->write_buf)
     slide_free (s->write_buf);
-  if (s->path_to_unlink) {
-    unlink (s->path_to_unlink);
-    free (s->path_to_unlink);
-  }
+  if (s->path_to_unlink)
+    {
+      unlink (s->path_to_unlink);
+      free (s->path_to_unlink);
+    }
   close (s->fd);
   free (s);
 }
@@ -131,18 +135,20 @@ socket_listen (char *path)
   sun->sun_family = AF_UNIX;
   strcpy (sun->sun_path, path);
 
-  if (bind (fd, (struct sockaddr *) sun, SUN_LEN (sun)) < 0) {
-    free (sun);
-    close (fd);
-    return NULL;
-  }
+  if (bind (fd, (struct sockaddr *) sun, SUN_LEN (sun)) < 0)
+    {
+      free (sun);
+      close (fd);
+      return NULL;
+    }
 
   free (sun);
 
-  if (listen (fd, 5) < 0) {
-    close (fd);
-    return NULL;
-  }
+  if (listen (fd, 5) < 0)
+    {
+      close (fd);
+      return NULL;
+    }
 
   set_nonblocking (fd);
 
@@ -210,11 +216,12 @@ socket_connect (char *path)
   sun->sun_family = AF_UNIX;
   strcpy (sun->sun_path, path);
 
-  if (connect (fd, (struct sockaddr *) sun, SUN_LEN (sun))) {
-    free (sun);
-    close (fd);
-    return NULL;
-  }
+  if (connect (fd, (struct sockaddr *) sun, SUN_LEN (sun)))
+    {
+      free (sun);
+      close (fd);
+      return NULL;
+    }
 
   free (sun);
 
@@ -251,10 +258,11 @@ socket_pre_select (Socket * s, fd_set * rfds, fd_set * wfds)
   int n;
 
   /*Server socket */
-  if (SOCKET_IS_LISTENER (s)) {
-    FD_SET (s->fd, rfds);
-    return;
-  }
+  if (SOCKET_IS_LISTENER (s))
+    {
+      FD_SET (s->fd, rfds);
+      return;
+    }
 
   if (!SLIDE_EMPTY (s->write_buf))
     FD_SET (s->fd, wfds);
@@ -272,27 +280,29 @@ socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds)
   int error = 0;
 
 
-  if ((!SLIDE_EMPTY (s->write_buf)) && FD_ISSET (s->fd, wfds)) {
-    n =
-      (SLIDE_BYTES (s->write_buf) >
-       MAX_TXN) ? MAX_TXN : SLIDE_BYTES (s->write_buf);
-    n = wrap_send (s->fd, SLIDE_RPTR (s->write_buf), n);
-    if (n > 0)
-      slide_consume (s->write_buf, n);
-    if (n < 0)
-      error = -1;
-  }
-
-  if (!SLIDE_FULL (s->read_buf) && FD_ISSET (s->fd, rfds)) {
-    n =
-      (SLIDE_SPACE (s->read_buf) >
-       MAX_TXN) ? MAX_TXN : SLIDE_SPACE (s->read_buf);
-    n = wrap_recv (s->fd, SLIDE_WPTR (s->read_buf), n);
-    if (n > 0)
-      slide_added (s->read_buf, n);
-    if (n < 0)
-      error = -1;
-  }
+  if ((!SLIDE_EMPTY (s->write_buf)) && FD_ISSET (s->fd, wfds))
+    {
+      n =
+        (SLIDE_BYTES (s->write_buf) >
+         MAX_TXN) ? MAX_TXN : SLIDE_BYTES (s->write_buf);
+      n = wrap_send (s->fd, SLIDE_RPTR (s->write_buf), n);
+      if (n > 0)
+        slide_consume (s->write_buf, n);
+      if (n < 0)
+        error = -1;
+    }
+
+  if (!SLIDE_FULL (s->read_buf) && FD_ISSET (s->fd, rfds))
+    {
+      n =
+        (SLIDE_SPACE (s->read_buf) >
+         MAX_TXN) ? MAX_TXN : SLIDE_SPACE (s->read_buf);
+      n = wrap_recv (s->fd, SLIDE_WPTR (s->read_buf), n);
+      if (n > 0)
+        slide_added (s->read_buf, n);
+      if (n < 0)
+        error = -1;
+    }
 
   s->msg = ipc_check_for_message_in_slide (s->read_buf);
 
-- 
cgit v1.2.3