aboutsummaryrefslogtreecommitdiffstats
path: root/src/symsocket.c
diff options
context:
space:
mode:
authorjames <>2008-02-14 02:46:45 +0000
committerjames <>2008-02-14 02:46:45 +0000
commitbc6a29d06c22bdcada4cb18d8401e5d37f46fd36 (patch)
treecbe671b5cad8d7af21450915e2e312119ef0406d /src/symsocket.c
parente65130e63d050d37b9605339c0abfdcef73c4472 (diff)
downloadsympathy-bc6a29d06c22bdcada4cb18d8401e5d37f46fd36.tar.gz
sympathy-bc6a29d06c22bdcada4cb18d8401e5d37f46fd36.tar.bz2
sympathy-bc6a29d06c22bdcada4cb18d8401e5d37f46fd36.zip
*** empty log message ***
Diffstat (limited to 'src/symsocket.c')
-rw-r--r--src/symsocket.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/symsocket.c b/src/symsocket.c
index 25657db..061ff6d 100644
--- a/src/symsocket.c
+++ b/src/symsocket.c
@@ -11,6 +11,9 @@ static char rcsid[] =
/*
* $Log$
+ * Revision 1.3 2008/02/14 02:46:44 james
+ * *** empty log message ***
+ *
* Revision 1.2 2008/02/14 00:57:58 james
* *** empty log message ***
*
@@ -164,6 +167,7 @@ socket_connect (char *path)
return ret;
}
+
void
socket_consume_msg (Socket * s)
{
@@ -172,7 +176,7 @@ socket_consume_msg (Socket * s)
if (!s->msg)
return;
- ipc_consume_message_in_slide(s->read_buf);
+ ipc_consume_message_in_slide (s->read_buf);
s->msg = ipc_check_for_message_in_slide (s->read_buf);
}
@@ -203,7 +207,7 @@ socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds)
{
char buf[1024];
int n;
- int error=0;
+ int error = 0;
if ((!SLIDE_EMPTY (s->write_buf)) && FD_ISSET (s->fd, wfds))
@@ -214,7 +218,8 @@ socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds)
n = wrap_write (s->fd, SLIDE_RPTR (s->write_buf), n);
if (n > 0)
slide_consume (s->write_buf, n);
- if (n<0) error=-1;
+ if (n < 0)
+ error = -1;
}
if (!SLIDE_FULL (s->read_buf) && FD_ISSET (s->fd, rfds))
@@ -225,7 +230,8 @@ socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds)
n = wrap_read (s->fd, SLIDE_WPTR (s->read_buf), n);
if (n > 0)
slide_added (s->read_buf, n);
- if (n<0) error=-1;
+ if (n < 0)
+ error = -1;
}
s->msg = ipc_check_for_message_in_slide (s->read_buf);
@@ -248,14 +254,15 @@ socket_write (Socket * s, void *buf, int len)
(SLIDE_BYTES (s->write_buf) >
MAX_TXN) ? MAX_TXN : SLIDE_BYTES (s->write_buf);
n = wrap_write (s->fd, SLIDE_RPTR (s->write_buf), n);
- {
- uint8_t *c=SLIDE_RPTR(s->write_buf);
+ {
+ uint8_t *c = SLIDE_RPTR (s->write_buf);
}
if (n > 0)
slide_consume (s->write_buf, n);
-
- if (n<0) return -1;
+
+ if (n < 0)
+ return -1;
return len;
}