X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=8bca7b7f04e237e4bfb0b477b828ae6678f9f2aa;hp=409c51df5973d51ec61f04091b322203c3c9a9e0;hb=4c6dd71312400fc04b3f0582b23a0cff831ee8fa;hpb=e7966be29d104bc2932f402abbe3e36750a0f846

diff --git a/client_common.c b/client_common.c
index 409c51df..8bca7b7f 100644
--- a/client_common.c
+++ b/client_common.c
@@ -129,13 +129,13 @@ void client_pre_select(struct sched *s, struct task *t)
 		pcd->check_w = 1;
 		return;
 
-	case CL_RECEIVING_SERVER_OUTPUT:
+	case CL_RECEIVING:
 		if (pcd->loaded < CLIENT_BUFSIZE - 1) {
 			para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
 			pcd->check_r = 1;
 		}
 		return;
-	case CL_SENDING_STDIN:
+	case CL_SENDING:
 		if (*pcd->in_loaded) {
 			PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
 			para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
@@ -269,11 +269,11 @@ void client_post_select(struct sched *s, struct task *t)
 			return;
 		t->ret = -E_HANDSHAKE_COMPLETE;
 		if (strstr(pcd->buf, AWAITING_DATA_MSG))
-			pcd->status = CL_SENDING_STDIN;
+			pcd->status = CL_SENDING;
 		else
-			pcd->status = CL_RECEIVING_SERVER_OUTPUT;
+			pcd->status = CL_RECEIVING;
 		return;
-	case CL_SENDING_STDIN: /* FIXME: might block */
+	case CL_SENDING: /* FIXME: might block */
 		PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
 		t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded);
 		if (t->ret <= 0) {
@@ -283,7 +283,7 @@ void client_post_select(struct sched *s, struct task *t)
 		}
 		*pcd->in_loaded = 0; /* FIXME: short writes */
 		return;
-	case CL_RECEIVING_SERVER_OUTPUT:
+	case CL_RECEIVING:
 		t->ret = client_recv_buffer(pcd);
 		return;
 	}