[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8883 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8883 - gnunet/src/util |
Date: |
Sat, 29 Aug 2009 14:00:37 -0600 |
Author: grothoff
Date: 2009-08-29 14:00:36 -0600 (Sat, 29 Aug 2009)
New Revision: 8883
Modified:
gnunet/src/util/disk.c
gnunet/src/util/server.c
gnunet/src/util/test_connection.c
gnunet/src/util/test_connection_addressing.c
gnunet/src/util/test_connection_receive_cancel.c
gnunet/src/util/test_connection_timeout.c
gnunet/src/util/test_crypto_hash.c
gnunet/src/util/test_scheduler.c
Log:
fix check for close
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2009-08-29 19:47:45 UTC (rev 8882)
+++ gnunet/src/util/disk.c 2009-08-29 20:00:36 UTC (rev 8883)
@@ -1481,18 +1481,17 @@
return p;
}
+
/**
* Closes an interprocess channel
- * @param p pipe
+ *
+ * @param p pipe to close
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
int
GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p)
{
- int ret;
-
- ret = GNUNET_OK;
-
+ int ret = GNUNET_OK;
#ifdef MINGW
if (!CloseHandle (p->fd[0].h))
{
@@ -1506,30 +1505,26 @@
ret = GNUNET_SYSERR;
}
#else
- {
- int save;
-
- if (close (p->fd[0].fd) != -1)
- {
- ret = GNUNET_SYSERR;
- save = errno;
- }
- else
- save = 0;
-
- if (close (p->fd[1].fd) != -1)
- {
- ret = GNUNET_SYSERR;
- }
- else
- errno = save;
- }
+ int save;
+
+ if (0 != close (p->fd[0].fd))
+ {
+ ret = GNUNET_SYSERR;
+ save = errno;
+ }
+ else
+ save = 0;
+
+ if (0 != close (p->fd[1].fd))
+ ret = GNUNET_SYSERR;
+ else
+ errno = save;
#endif
GNUNET_free (p);
-
return ret;
}
+
/**
* Get the handle to a particular pipe end
* @param p pipe
Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c 2009-08-29 19:47:45 UTC (rev 8882)
+++ gnunet/src/util/server.c 2009-08-29 20:00:36 UTC (rev 8883)
@@ -282,7 +282,9 @@
"Server shutting down.\n");
#endif
GNUNET_assert (server->listen_socket == NULL);
- GNUNET_break (GNUNET_YES == GNUNET_DISK_pipe_close (server->shutpipe));
+ if (GNUNET_OK != GNUNET_DISK_pipe_close (server->shutpipe))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+ "pipe-close");
while (server->clients != NULL)
{
pos = server->clients;
@@ -455,7 +457,7 @@
struct GNUNET_NETWORK_Descriptor *lsock;
struct GNUNET_NETWORK_FDSet *r;
- lsock = NULL; // FIXME NILS: this was -2, does that have a special meaning?
+ lsock = NULL;
if (serverAddr != NULL)
{
lsock = open_listen_socket (serverAddr, socklen);
@@ -464,7 +466,7 @@
}
ret = GNUNET_malloc (sizeof (struct GNUNET_SERVER_Handle));
ret->shutpipe = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileDescriptor
*[2]));
- if ((ret->shutpipe = GNUNET_DISK_pipe (GNUNET_NO)) == NULL)
+ if (NULL == (ret->shutpipe = GNUNET_DISK_pipe (GNUNET_NO)))
{
GNUNET_break (0 == GNUNET_NETWORK_socket_close (lsock));
GNUNET_free (ret->shutpipe);
Modified: gnunet/src/util/test_connection.c
===================================================================
--- gnunet/src/util/test_connection.c 2009-08-29 19:47:45 UTC (rev 8882)
+++ gnunet/src/util/test_connection.c 2009-08-29 20:00:36 UTC (rev 8883)
@@ -40,7 +40,7 @@
static size_t sofar;
-static int ls;
+static struct GNUNET_NETWORK_Descriptor *ls;
@@ -64,7 +64,9 @@
if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on,
sizeof (on)) < 0)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
- GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, &sa, sizeof (sa)) >= 0);
+ GNUNET_assert (GNUNET_NETWORK_socket_bind (desc,
+ (const struct sockaddr*) &sa,
+ sizeof (sa)) >= 0);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
@@ -113,7 +115,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test accepts connection\n");
#endif
asock = GNUNET_CONNECTION_create_from_accept (tc->sched,
- NULL, NULL, ls, 1024);
+ NULL, NULL, ls, 1024);
GNUNET_assert (asock != NULL);
GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock));
#if VERBOSE
Modified: gnunet/src/util/test_connection_addressing.c
===================================================================
--- gnunet/src/util/test_connection_addressing.c 2009-08-29 19:47:45 UTC
(rev 8882)
+++ gnunet/src/util/test_connection_addressing.c 2009-08-29 20:00:36 UTC
(rev 8883)
@@ -63,7 +63,9 @@
if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on,
sizeof (on)) < 0)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
- GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, &sa, sizeof (sa)) >= 0);
+ GNUNET_assert (GNUNET_NETWORK_socket_bind (desc,
+ (const struct sockaddr*) &sa,
+ sizeof (sa)) >= 0);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
Modified: gnunet/src/util/test_connection_receive_cancel.c
===================================================================
--- gnunet/src/util/test_connection_receive_cancel.c 2009-08-29 19:47:45 UTC
(rev 8882)
+++ gnunet/src/util/test_connection_receive_cancel.c 2009-08-29 20:00:36 UTC
(rev 8883)
@@ -64,7 +64,9 @@
if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on,
sizeof (on)) < 0)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
- GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, &sa, sizeof (sa)) >= 0);
+ GNUNET_assert (GNUNET_NETWORK_socket_bind (desc,
+ (const struct sockaddr*) &sa,
+ sizeof (sa)) >= 0);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
Modified: gnunet/src/util/test_connection_timeout.c
===================================================================
--- gnunet/src/util/test_connection_timeout.c 2009-08-29 19:47:45 UTC (rev
8882)
+++ gnunet/src/util/test_connection_timeout.c 2009-08-29 20:00:36 UTC (rev
8883)
@@ -57,7 +57,9 @@
if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on,
sizeof (on)) < 0)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
- GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, &sa, sizeof (sa)) >= 0);
+ GNUNET_assert (GNUNET_NETWORK_socket_bind (desc,
+ (const struct sockaddr*) &sa,
+ sizeof (sa)) >= 0);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
Modified: gnunet/src/util/test_crypto_hash.c
===================================================================
--- gnunet/src/util/test_crypto_hash.c 2009-08-29 19:47:45 UTC (rev 8882)
+++ gnunet/src/util/test_crypto_hash.c 2009-08-29 20:00:36 UTC (rev 8883)
@@ -98,7 +98,7 @@
if (1 != GNUNET_CRYPTO_hash_get_bit (&d, 6))
return 1;
memset (&d, 0, sizeof (d));
- GNUNET_CRYPTO_hash_to_AES_key (&d, &skey, &iv);
+ GNUNET_CRYPTO_hash_to_aes_key (&d, &skey, &iv);
if ((0 != memcmp (&skey, &zskey, sizeof (skey) - sizeof (unsigned int))) ||
(0 != memcmp (&iv, &ziv, sizeof (iv))))
return 1;
Modified: gnunet/src/util/test_scheduler.c
===================================================================
--- gnunet/src/util/test_scheduler.c 2009-08-29 19:47:45 UTC (rev 8882)
+++ gnunet/src/util/test_scheduler.c 2009-08-29 20:00:36 UTC (rev 8883)
@@ -57,7 +57,7 @@
}
struct GNUNET_DISK_PipeHandle *p;
-static struct GNUNET_DISK_FileHandle *fds[2];
+static const struct GNUNET_DISK_FileHandle *fds[2];
static void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8883 - gnunet/src/util,
gnunet <=