[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16531 - gnunet-gtk/src/lib
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16531 - gnunet-gtk/src/lib |
Date: |
Mon, 15 Aug 2011 14:45:54 +0200 |
Author: grothoff
Date: 2011-08-15 14:45:54 +0200 (Mon, 15 Aug 2011)
New Revision: 16531
Modified:
gnunet-gtk/src/lib/eventloop.c
Log:
some code cleanup
Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c 2011-08-15 12:44:36 UTC (rev 16530)
+++ gnunet-gtk/src/lib/eventloop.c 2011-08-15 12:45:54 UTC (rev 16531)
@@ -367,8 +367,7 @@
GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
GNUNET_CONTAINER_slist_next (t), i += 1)
{
- struct GNUNET_DISK_FileHandle *fh;
- fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get
(t, NULL);
+ struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get
(t, NULL);
if (fh->type == GNUNET_PIPE)
{
if (!ReadFile (fh->h, NULL, 0, NULL, fh->oOverlapRead))
@@ -436,9 +435,9 @@
GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
GNUNET_CONTAINER_slist_next (t), i += 1)
{
- struct GNUNET_DISK_FileHandle *fh;
+ struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get
(t, NULL);
+
DWORD dwBytes;
- fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get
(t, NULL);
if (fh->type == GNUNET_PIPE)
{
if (!PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
@@ -616,7 +615,9 @@
bret = PeekNamedPipe (ml->read_array[i]->h, NULL, 0, NULL, &waitstatus,
NULL);
error = GetLastError ();
#if DEBUG_NETWORK
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peek at read pipe %d (0x%x) returned
%d (%d bytes available) GLE %u\n", i, ml->read_array[i]->h, bret, waitstatus,
error);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peek at read pipe %d (0x%x) returned %d (%d bytes available)
GLE %u\n",
+ i, ml->read_array[i]->h, bret, waitstatus, error);
#endif
if (bret == 0 || (ml->cached_poll_array[i].revents & G_IO_ERR))
{
@@ -627,8 +628,7 @@
GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
GNUNET_CONTAINER_slist_next (t), i += 1)
{
- struct GNUNET_DISK_FileHandle *fh;
- fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get
(t, NULL);
+ struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get (t,
NULL);
if (fh == ml->read_array[i])
{
GNUNET_CONTAINER_slist_add (ml->handles_except,
@@ -666,7 +666,9 @@
status = send (wfds->sds.fd_array[i], NULL, 0, 0);
error = GetLastError ();
#if DEBUG_NETWORK
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "send to the socket %d returned %d
(%u)\n", i, status, error);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "send to the socket %d returned %d (%u)\n",
+ i, status, error);
#endif
if (status == 0
|| (error != WSAEWOULDBLOCK && error != WSAENOTCONN)
@@ -686,8 +688,7 @@
GNUNET_CONTAINER_slist_end (t) != GNUNET_YES;
GNUNET_CONTAINER_slist_next (t))
{
- struct GNUNET_DISK_FileHandle *fh;
- fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (t,
NULL);
+ struct GNUNET_DISK_FileHandle *fh = GNUNET_CONTAINER_slist_get (t, NULL);
if (fh->type == GNUNET_PIPE)
CancelIo (fh->h);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16531 - gnunet-gtk/src/lib,
gnunet <=