Commit 95a47d96 authored by Ramiro Polla's avatar Ramiro Polla Committed by Guillaume Poirier

BeOS cleanup

Patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Original thread:
date: Jan 20, 2007 8:56 PM
subject: [Ffmpeg-devel] [PATCH] [RFC] change socket read and write functions

Originally committed as revision 7613 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fe468b33
...@@ -142,11 +142,7 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size) ...@@ -142,11 +142,7 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size)
tv.tv_usec = 100 * 1000; tv.tv_usec = 100 * 1000;
ret = select(fd_max + 1, &rfds, NULL, NULL, &tv); ret = select(fd_max + 1, &rfds, NULL, NULL, &tv);
if (ret > 0 && FD_ISSET(s->fd, &rfds)) { if (ret > 0 && FD_ISSET(s->fd, &rfds)) {
#ifdef __BEOS__
len = recv(s->fd, buf, size, 0); len = recv(s->fd, buf, size, 0);
#else
len = read(s->fd, buf, size);
#endif
if (len < 0) { if (len < 0) {
if (errno != EINTR && errno != EAGAIN) if (errno != EINTR && errno != EAGAIN)
#ifdef __BEOS__ #ifdef __BEOS__
...@@ -179,11 +175,7 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size) ...@@ -179,11 +175,7 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size)
tv.tv_usec = 100 * 1000; tv.tv_usec = 100 * 1000;
ret = select(fd_max + 1, NULL, &wfds, NULL, &tv); ret = select(fd_max + 1, NULL, &wfds, NULL, &tv);
if (ret > 0 && FD_ISSET(s->fd, &wfds)) { if (ret > 0 && FD_ISSET(s->fd, &wfds)) {
#ifdef __BEOS__
len = send(s->fd, buf, size, 0); len = send(s->fd, buf, size, 0);
#else
len = write(s->fd, buf, size);
#endif
if (len < 0) { if (len < 0) {
if (errno != EINTR && errno != EAGAIN) { if (errno != EINTR && errno != EAGAIN) {
#ifdef __BEOS__ #ifdef __BEOS__
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment