[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash libbase/network.cpp ChangeLog
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash libbase/network.cpp ChangeLog |
Date: |
Wed, 19 Mar 2008 17:48:50 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/03/19 17:48:50
Modified files:
libbase : network.cpp
. : ChangeLog
Log message:
* libbase/network.cpp: Actually use the timeout parameter to set
the timeout. Turn off overly verbose debugging.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5978&r2=1.5979
Patches:
Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- libbase/network.cpp 18 Mar 2008 15:15:13 -0000 1.35
+++ libbase/network.cpp 19 Mar 2008 17:48:49 -0000 1.36
@@ -71,7 +71,7 @@
_port(0),
_connected(false),
_debug(false),
- _timeout(5)
+ _timeout(0)
{
//GNASH_REPORT_FUNCTION;
#if defined(HAVE_WINSOCK_H) && !defined(__OS2__)
@@ -675,12 +675,12 @@
FD_ZERO(&fdset);
FD_SET(fd, &fdset);
- if (timeout < 0) {
- tval.tv_sec = 5;
+ if (timeout == 0) {
+ ret = select(fd+1, &fdset, NULL, NULL, NULL);
+ } else {
+ tval.tv_sec = timeout;
tval.tv_usec = 0;
ret = select(fd+1, &fdset, NULL, NULL, &tval);
- } else {
- ret = select(fd+1, &fdset, NULL, NULL, NULL);
}
// If interupted by a system call, try again
@@ -702,7 +702,7 @@
if (_debug) {
log_debug (_("read %d bytes from fd %d"), ret, fd);
}
-#if 1
+#if 0
if (ret) {
log_debug (_("%s: Read packet data from fd %d (%d bytes): \n%s"),
__FUNCTION__, fd, ret, hexify(buffer, ret, true));
@@ -814,7 +814,7 @@
// return ret;
}
}
-#if 1
+#if 0
if (ret) {
log_debug (_("%s: Wrote packet data to fd %d: \n%s"),
__FUNCTION__, fd, hexify(buffer, ret, true));
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5978
retrieving revision 1.5979
diff -u -b -r1.5978 -r1.5979
--- ChangeLog 19 Mar 2008 14:47:17 -0000 1.5978
+++ ChangeLog 19 Mar 2008 17:48:49 -0000 1.5979
@@ -1,3 +1,8 @@
+2008-03-19 Rob Savoye <address@hidden>
+
+ * libbase/network.cpp: Actually use the timeout parameter to set
+ the timeout. Turn off overly verbose debugging.
+
2008-03-19 Sandro Santilli <address@hidden>
* testsuite/actionscript.all/array.as: test addProperty(<valid_index>)
- [Gnash-commit] gnash libbase/network.cpp ChangeLog,
Rob Savoye <=