wrapper: fixed spells & gamma

2 files changed, 17 insertions, 18 deletions

diff --git a/wrapper/ppswrapper-common.c b/wrapper/ppswrapper-common.c
index 5609303..eb79cd2 100644
--- a/wrapper/ppswrapper-common.c
+++ b/wrapper/ppswrapper-common.c
@@ -50,7 +50,7 @@ safe_read(int fildes, void *buf, size_t nbytes)
 
     if (ret < 0) {
 	error = errno;
-	fprintf (stderr, "read error: errno %d(%s)\n", error, strerror(errno));
+	fprintf (stderr, "Failed to read: errno %d(%s)\n", error, strerror(errno));
 	errno = error;
     }
 
@@ -85,7 +85,7 @@ safe_write(int fildes, const void *buf, size_t nbytes)
 
     if (ret < 0) {
 	error = errno;
-	fprintf (stderr, "write error: errno: %d(%s)\n", error, strerror(errno));
+	fprintf (stderr, "Failed to write: errno: %d(%s)\n", error, strerror(errno));
 	errno = error;
     }
 
@@ -198,7 +198,7 @@ ppsw_readb(ppsw_t* self,
 
     ret = ppsw_read(self, &val, 1);
     if (ret != 1) {
-	perror("read error");
+	perror("Failed to read a byte from peer");
 	return -1;
     }
 
@@ -277,25 +277,24 @@ ppsw_read_msg(ppsw_t* self,
 	      ppsw_msg_t* msg)
 {
     if (ppsw_readb(self, &msg->sync) < 0) {
-	perror("read message sync error");
+	perror("Failed to read message.sync from peer");
 	return -1;
     }
     if (msg->sync != PPSW_SYNC) {
 	fprintf(stderr, "%d unexpect sync: %d exepected: %d\n",
 		getpid(), msg->sync, PPSW_SYNC);
-	//__asm__ ("int $3");
 	return -1;
     }
     if (ppsw_reads(self, &msg->id) < 0) {
-	perror("read message id error");
+	perror("Failed to read message.id from peer");
 	return -1;
     }
     if (ppsw_reads(self, &msg->seq) < 0) {
-	perror("read message seqno error");
+	perror("Failed to read message.seqno from peer");
 	return -1;
     }
     if (ppsw_readl(self, &msg->len) < 0) {
-	perror("read message length error");
+	perror("Failed to read message.length from peer");
 	return -1;
     }
 
@@ -496,7 +495,7 @@ ppsw_packet_readb(ppsw_packet_t* self,
 
     ret = ppsw_packet_read(self, &val, 1);
     if (ret != 1) {
-	perror("read error");
+	perror("Failed to read a byte from peer");
 	ppsw_packet_fini(self);
 	errno = ENOSPC;
 	return -1;
@@ -722,7 +721,7 @@ ppsw_recv_packet(ppsw_t* self,
 	int i;
 	uint8_t val;
 
-	perror("failed to initialize packet");
+	perror("Failed to initialize packet");
 	for (i = 0; i < msg->len; i++)
 	    if (ppsw_read(self, &val, 1) < 0)
 		break;
@@ -737,7 +736,7 @@ ppsw_recv_packet(ppsw_t* self,
 
     ret = ppsw_read(self, &p->data[p->offset], msg->len);
     if (ret < 0) {
-	perror("failed to recv packet content");
+	perror("Failed to recv packet content");
 	//__asm__ ("int $3");
 	ppsw_packet_fini(p);
 	ret = -1;
diff --git a/wrapper/ppswrapper-server.c b/wrapper/ppswrapper-server.c
index 8304701..68719bf 100644
--- a/wrapper/ppswrapper-server.c
+++ b/wrapper/ppswrapper-server.c
@@ -1194,12 +1194,12 @@ ppsw_server_run(ppsw_t* super, int infinit)
 	int done = 0;
 
 	if (self->srv_sock >= 0) {
-	    printf ("wait for a client to come up\n");
+	    printf ("Waiting for a client to come up\n");
 	    self->base.sock = accept(self->srv_sock, NULL, NULL);
 	    if (self->base.sock < 0)
 		return;
 
-	    printf ("new client fd: %d\n", self->base.sock);
+	    printf ("New client (fd: %d)\n", self->base.sock);
 
 	    linger.l_onoff = 1;
 	    linger.l_linger = 1;
@@ -1235,24 +1235,24 @@ ppsw_server_run(ppsw_t* super, int infinit)
 	    if (ret < 0) {
 		if (errno != EINTR)
 		    done = 1;
-		perror("select error");
+		perror("Failed to select");
 		goto unlock;
 	    }
 
 	    if (FD_ISSET(self->base.sock, &efs)) {
 		done = 1;
-		fprintf(stderr, "socket in error state.\n");
+		fprintf(stderr, "Socket is in error state.\n");
 		goto unlock;
 	    }
 	    if (ret > 0 && FD_ISSET(self->base.sock, &rfs)) {
 		if (ppsw_recv_packet(super, &msg, &p) < 0) {
-		    perror("read message from client error");
+		    perror("Failed to read a message from client");
 		    done = 1;
 		    goto unlock;
 		}
 
 		if (ppsw_server_process_msg(self, &msg, &p) < 0) {
-		    fprintf (stderr, "unhandled message(%d)\n", msg.id);
+		    fprintf (stderr, "Unhandled message(%d)\n", msg.id);
 		    done = 1;
 		    goto unlock;
 		}
@@ -1268,7 +1268,7 @@ ppsw_server_run(ppsw_t* super, int infinit)
 
 	    pthread_mutex_unlock(&self->mutex);
 	}
-	printf ("disconnecting client(fd: %d)\n", self->base.sock);
+	printf ("Disconnecting the client (fd: %d).\n", self->base.sock);
 
 	self->play_quit = 1;
 	pthread_join (play_thread, NULL);