[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10063 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10063 - gnunet/src/util |
Date: |
Tue, 19 Jan 2010 15:52:38 +0100 |
Author: nevans
Date: 2010-01-19 15:52:38 +0100 (Tue, 19 Jan 2010)
New Revision: 10063
Modified:
gnunet/src/util/network.c
Log:
remove debug message
Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c 2010-01-19 14:33:36 UTC (rev 10062)
+++ gnunet/src/util/network.c 2010-01-19 14:52:38 UTC (rev 10063)
@@ -361,15 +361,14 @@
* @param desc socket
*/
unsigned int
-GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *
desc)
+GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle
+ *desc)
{
int error;
unsigned int pending;
/* How much is there to be read? */
- error = ioctl(desc->fd, FIONREAD, &pending);
- GNUNET_log_from(GNUNET_ERROR_TYPE_INFO, "udp", _
- ("pending is %u bytes, error is %d\n"), pending, error);
+ error = ioctl (desc->fd, FIONREAD, &pending);
if (error == 0)
return pending;
@@ -389,7 +388,8 @@
ssize_t
GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle * desc,
void *buffer, size_t length,
- struct sockaddr *src_addr, socklen_t *addrlen)
+ struct sockaddr * src_addr,
+ socklen_t * addrlen)
{
int ret;
int flags;
@@ -733,7 +733,9 @@
#ifdef MINGW
HANDLE hw;
GNUNET_DISK_internal_file_handle_ (h, &hw, sizeof (HANDLE));
- GNUNET_CONTAINER_slist_add (fds->handles,
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &hw, sizeof (HANDLE));
+ GNUNET_CONTAINER_slist_add (fds->handles,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ &hw, sizeof (HANDLE));
#else
int fd;
@@ -785,20 +787,23 @@
return GNUNET_YES;
#ifdef MINGW
{
- struct GNUNET_CONTAINER_SList_Iterator *it;
+ struct GNUNET_CONTAINER_SList_Iterator *it;
- for(it = GNUNET_CONTAINER_slist_begin (fds1->handles);
GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; GNUNET_CONTAINER_slist_next (it))
- {
- HANDLE *h;
+ for (it = GNUNET_CONTAINER_slist_begin (fds1->handles);
+ GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (it))
+ {
+ HANDLE *h;
- h = GNUNET_CONTAINER_slist_get (it, NULL);
- if (GNUNET_CONTAINER_slist_contains (fds2->handles, h, sizeof
(HANDLE)))
- {
- GNUNET_CONTAINER_slist_iter_destroy (it);
- return GNUNET_YES;
- }
- }
- GNUNET_CONTAINER_slist_iter_destroy (it);
+ h = GNUNET_CONTAINER_slist_get (it, NULL);
+ if (GNUNET_CONTAINER_slist_contains
+ (fds2->handles, h, sizeof (HANDLE)))
+ {
+ GNUNET_CONTAINER_slist_iter_destroy (it);
+ return GNUNET_YES;
+ }
+ }
+ GNUNET_CONTAINER_slist_iter_destroy (it);
}
#endif
return GNUNET_NO;
@@ -907,7 +912,8 @@
DWORD limit;
fd_set sock_read, sock_write, sock_except;
fd_set aread, awrite, aexcept;
- struct GNUNET_CONTAINER_SList *handles_read, *handles_write, *handles_except;
+ struct GNUNET_CONTAINER_SList *handles_read, *handles_write,
+ *handles_except;
int i;
struct timeval tvslice;
@@ -1014,8 +1020,8 @@
{
GNUNET_CONTAINER_slist_add (handles_read,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &h,
- sizeof (HANDLE));
+
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ &h, sizeof (HANDLE));
retcode++;
}
}
@@ -1039,8 +1045,8 @@
{
GNUNET_CONTAINER_slist_add (handles_except,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &h,
- sizeof (HANDLE));
+
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ &h, sizeof (HANDLE));
retcode++;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10063 - gnunet/src/util,
gnunet <=