[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r11342 - in gnunet/src: arm fs topology util
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r11342 - in gnunet/src: arm fs topology util |
|
Date: |
Tue, 11 May 2010 22:34:28 +0200 |
Author: grothoff
Date: 2010-05-11 22:34:28 +0200 (Tue, 11 May 2010)
New Revision: 11342
Modified:
gnunet/src/arm/gnunet-service-manager.c
gnunet/src/fs/gnunet-service-fs.c
gnunet/src/topology/gnunet-daemon-topology.c
gnunet/src/util/peer.c
Log:
minor fixes
Modified: gnunet/src/arm/gnunet-service-manager.c
===================================================================
--- gnunet/src/arm/gnunet-service-manager.c 2010-05-11 20:23:07 UTC (rev
11341)
+++ gnunet/src/arm/gnunet-service-manager.c 2010-05-11 20:34:28 UTC (rev
11342)
@@ -591,7 +591,8 @@
(strcmp (pos->serviceName, serviceName) != 0) )
continue;
GNUNET_SCHEDULER_cancel (scheduler, pos->acceptTask);
- GNUNET_NETWORK_socket_close (pos->listeningSocket);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_NETWORK_socket_close (pos->listeningSocket));
GNUNET_CONTAINER_DLL_remove (serviceListeningInfoList_head,
serviceListeningInfoList_tail,
pos);
@@ -641,7 +642,8 @@
serviceListeningInfo);
return;
}
- GNUNET_NETWORK_socket_close (serviceListeningInfo->listeningSocket);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_NETWORK_socket_close
(serviceListeningInfo->listeningSocket));
GNUNET_CONTAINER_DLL_remove (serviceListeningInfoList_head,
serviceListeningInfoList_tail,
serviceListeningInfo);
@@ -712,6 +714,7 @@
serviceName,
GNUNET_a2s (sa, addr_len),
STRERROR (errno));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
GNUNET_free (sa);
return;
}
@@ -719,7 +722,7 @@
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
"listen");
- GNUNET_NETWORK_socket_close (sock);
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
GNUNET_free (sa);
return;
}
@@ -794,14 +797,18 @@
scheduler = sched;
cfg = configurationHandle;
/* Split the default services into a list */
- GNUNET_CONFIGURATION_get_value_string (cfg, "arm", "DEFAULTSERVICES",
- &defaultServicesString);
- addDefaultServicesToList (defaultServicesString);
- GNUNET_free (defaultServicesString);
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "arm", "DEFAULTSERVICES",
+ &defaultServicesString))
+ {
+ addDefaultServicesToList (defaultServicesString);
+ GNUNET_free (defaultServicesString);
#if DEBUG_SERVICE_MANAGER
- printDefaultServicesList ();
+ printDefaultServicesList ();
#endif
- /* Spot the services from the configuration and create a listening socket
for each */
+ }
+ /* Spot the services from the configuration and create a listening
+ socket for each */
GNUNET_CONFIGURATION_iterate (cfg, &checkPortNumberCB, NULL);
}
Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c 2010-05-11 20:23:07 UTC (rev 11341)
+++ gnunet/src/fs/gnunet-service-fs.c 2010-05-11 20:34:28 UTC (rev 11342)
@@ -769,10 +769,11 @@
cp = GNUNET_malloc (sizeof (struct ConnectedPeer));
cp->pid = GNUNET_PEER_intern (peer);
- GNUNET_CONTAINER_multihashmap_put (connected_peers,
- &peer->hashPubKey,
- cp,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (connected_peers,
+ &peer->hashPubKey,
+ cp,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
@@ -792,9 +793,10 @@
const struct GNUNET_PeerIdentity * peer = cls;
struct PendingRequest *pr = value;
- GNUNET_CONTAINER_multihashmap_remove (peer_request_map,
- &peer->hashPubKey,
- pr);
+ GNUNET_break (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (peer_request_map,
+ &peer->hashPubKey,
+ pr));
destroy_pending_request (pr);
return GNUNET_YES;
}
@@ -831,9 +833,10 @@
cp->last_client_replies[i] = NULL;
}
}
- GNUNET_CONTAINER_multihashmap_remove (connected_peers,
- &peer->hashPubKey,
- cp);
+ GNUNET_break (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (connected_peers,
+ &peer->hashPubKey,
+ cp));
GNUNET_PEER_change_rc (cp->pid, -1);
GNUNET_PEER_decrement_rcs (cp->last_p2p_replies, P2P_SUCCESS_LIST_SIZE);
if (NULL != cp->cth)
@@ -2588,14 +2591,16 @@
}
pr->cp = cp;
- GNUNET_CONTAINER_multihashmap_put (query_request_map,
- &gm->query,
- pr,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- GNUNET_CONTAINER_multihashmap_put (peer_request_map,
- &other->hashPubKey,
- pr,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (query_request_map,
+ &gm->query,
+ pr,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (peer_request_map,
+ &other->hashPubKey,
+ pr,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
pr->hnode = GNUNET_CONTAINER_heap_insert (requests_by_expiration_heap,
pr,
@@ -2810,10 +2815,11 @@
default:
break;
}
- GNUNET_CONTAINER_multihashmap_put (query_request_map,
- &sm->query,
- pr,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (query_request_map,
+ &sm->query,
+ pr,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
if (type == GNUNET_BLOCK_TYPE_DBLOCK)
type = GNUNET_BLOCK_TYPE_ANY; /* get on-demand blocks too! */
pr->drq = GNUNET_FS_drq_get (&sm->query,
Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c 2010-05-11 20:23:07 UTC
(rev 11341)
+++ gnunet/src/topology/gnunet-daemon-topology.c 2010-05-11 20:34:28 UTC
(rev 11342)
@@ -492,10 +492,11 @@
memcpy (ret->hello, hello,
GNUNET_HELLO_size (hello));
}
- GNUNET_CONTAINER_multihashmap_put (peers,
- &peer->hashPubKey,
- ret,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (peers,
+ &peer->hashPubKey,
+ ret,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
return ret;
}
Modified: gnunet/src/util/peer.c
===================================================================
--- gnunet/src/util/peer.c 2010-05-11 20:23:07 UTC (rev 11341)
+++ gnunet/src/util/peer.c 2010-05-11 20:34:28 UTC (rev 11342)
@@ -116,10 +116,11 @@
table[ret].id = *pid;
table[ret].rc = 1;
table[ret].pid = ret;
- GNUNET_CONTAINER_multihashmap_put (map,
- &pid->hashPubKey,
- &table[ret],
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (map,
+ &pid->hashPubKey,
+ &table[ret],
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
return ret;
}
@@ -148,9 +149,10 @@
table[id].rc--;
if (table[id].rc == 0)
{
- GNUNET_CONTAINER_multihashmap_remove (map,
- &table[id].id.hashPubKey,
- &table[id]);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_remove (map,
+
&table[id].id.hashPubKey,
+ &table[id]));
table[id].pid = free_list_start;
free_list_start = id;
}
@@ -175,9 +177,10 @@
table[id].rc += delta;
if (table[id].rc == 0)
{
- GNUNET_CONTAINER_multihashmap_remove (map,
- &table[id].id.hashPubKey,
- &table[id]);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_remove (map,
+
&table[id].id.hashPubKey,
+ &table[id]));
table[id].pid = free_list_start;
free_list_start = id;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r11342 - in gnunet/src: arm fs topology util,
gnunet <=