[SCM] libav/experimental: change write/read to send/recv on socket operations
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:56:43 UTC 2013
The following commit has been merged in the experimental branch:
commit c60202dffe995aef7dae4419ca6e2895e976767e
Author: Alex Beregszaszi <alex at rtfs.hu>
Date: Thu Feb 22 12:38:37 2007 +0000
change write/read to send/recv on socket operations
Originally committed as revision 8069 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffserver.c b/ffserver.c
index 8b1e5af..394134b 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -787,7 +787,7 @@ static int handle_connection(HTTPContext *c)
return 0;
/* read the data */
read_loop:
- len = read(c->fd, c->buffer_ptr, 1);
+ len = recv(c->fd, c->buffer_ptr, 1, 0);
if (len < 0) {
if (errno != EAGAIN && errno != EINTR)
return -1;
@@ -822,7 +822,7 @@ static int handle_connection(HTTPContext *c)
/* no need to write if no events */
if (!(c->poll_entry->revents & POLLOUT))
return 0;
- len = write(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr);
+ len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
if (len < 0) {
if (errno != EAGAIN && errno != EINTR) {
/* error : close connection */
@@ -889,7 +889,7 @@ static int handle_connection(HTTPContext *c)
/* no need to write if no events */
if (!(c->poll_entry->revents & POLLOUT))
return 0;
- len = write(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr);
+ len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
if (len < 0) {
if (errno != EAGAIN && errno != EINTR) {
/* error : close connection */
@@ -914,8 +914,8 @@ static int handle_connection(HTTPContext *c)
/* no need to write if no events */
if (!(c->poll_entry->revents & POLLOUT))
return 0;
- len = write(c->fd, c->packet_buffer_ptr,
- c->packet_buffer_end - c->packet_buffer_ptr);
+ len = send(c->fd, c->packet_buffer_ptr,
+ c->packet_buffer_end - c->packet_buffer_ptr, 0);
if (len < 0) {
if (errno != EAGAIN && errno != EINTR) {
/* error : close connection */
@@ -2286,8 +2286,8 @@ static int http_send_data(HTTPContext *c)
c->buffer_ptr += len;
/* send everything we can NOW */
- len = write(rtsp_c->fd, rtsp_c->packet_buffer_ptr,
- rtsp_c->packet_buffer_end - rtsp_c->packet_buffer_ptr);
+ len = send(rtsp_c->fd, rtsp_c->packet_buffer_ptr,
+ rtsp_c->packet_buffer_end - rtsp_c->packet_buffer_ptr, 0);
if (len > 0) {
rtsp_c->packet_buffer_ptr += len;
}
@@ -2311,7 +2311,7 @@ static int http_send_data(HTTPContext *c)
}
} else {
/* TCP data output */
- len = write(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr);
+ len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
if (len < 0) {
if (errno != EAGAIN && errno != EINTR) {
/* error : close connection */
@@ -2368,7 +2368,7 @@ static int http_receive_data(HTTPContext *c)
if (c->buffer_end > c->buffer_ptr) {
int len;
- len = read(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr);
+ len = recv(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0);
if (len < 0) {
if (errno != EAGAIN && errno != EINTR) {
/* error : close connection */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list