summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuo Jinghua <sunmoon1997@gmail.com>2009-09-04 16:55:43 +0800
committerLuo Jinghua <sunmoon1997@gmail.com>2009-09-04 16:55:43 +0800
commitc66fbe36a31d71a64f0629e59ab8ffd60d776df5 (patch)
treeded87e89b941ebb75a92ebf0ac9c2615cb25a6b9
parent22484173980dea33ee4eed41247e3f4a866ee7be (diff)
remove a specious file
-rw-r--r--.og1
-rw-r--r--wrapper/ppswrapper-server.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/.og b/.og
deleted file mode 100644
index 8735ac5..0000000
--- a/.og
+++ /dev/null
@@ -1 +0,0 @@
-Creating new server: 30716
diff --git a/wrapper/ppswrapper-server.c b/wrapper/ppswrapper-server.c
index c6667be..f3a3c88 100644
--- a/wrapper/ppswrapper-server.c
+++ b/wrapper/ppswrapper-server.c
@@ -748,6 +748,7 @@ process_read(ppsw_server_t* self,
ppsw_packet_t* p)
{
int ret;
+ int error;
uint32_t fd;
uint32_t length;
uint32_t position;
@@ -776,8 +777,11 @@ process_read(ppsw_server_t* self,
//printf ("ppsvod_read(%d, %d, %d, %d.%d)\n", fd, length, position, sec, usec);
ret = ppsvod_read(fd, buffer, length, position, &tv);
+ error = errno;
+ if (ret < 0 && errno != EAGAIN)
+ perror ("Failed to read data");
//printf ("read result: %d\n", ret);
- return send_read_reply(self, msg->seq, buffer, length, ret, errno);
+ return send_read_reply(self, msg->seq, buffer, length, ret, error);
}
static int