[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13637 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13637 - gnunet/src/testing |
Date: |
Wed, 10 Nov 2010 13:36:43 +0100 |
Author: nevans
Date: 2010-11-10 13:36:43 +0100 (Wed, 10 Nov 2010)
New Revision: 13637
Modified:
gnunet/src/testing/test_testing_topology.c
gnunet/src/testing/testing.c
gnunet/src/testing/testing_group.c
Log:
codesonar fixes
Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c 2010-11-10 12:26:44 UTC (rev
13636)
+++ gnunet/src/testing/test_testing_topology.c 2010-11-10 12:36:43 UTC (rev
13637)
@@ -302,8 +302,7 @@
uint32_t distance,
const char *emsg)
{
- FILE *outfile;
- outfile = cls;
+ FILE *outfile = cls;
if (first != NULL)
{
if (outfile != NULL)
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2010-11-10 12:26:44 UTC (rev 13636)
+++ gnunet/src/testing/testing.c 2010-11-10 12:36:43 UTC (rev 13637)
@@ -790,6 +790,7 @@
#endif
if (NULL == ret->cfgfile)
{
+ GNUNET_free_non_null (ret->ssh_port_str);
GNUNET_free_non_null (ret->hostname);
GNUNET_free (ret);
return NULL;
Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c 2010-11-10 12:26:44 UTC (rev 13636)
+++ gnunet/src/testing/testing_group.c 2010-11-10 12:36:43 UTC (rev 13637)
@@ -2515,9 +2515,6 @@
break;
}
- if (num_connections < 0)
- return GNUNET_SYSERR;
-
if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "TESTING",
"F2F"))
{
ret = create_and_copy_friend_files(pg);
@@ -3025,7 +3022,7 @@
GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].allowed_peers,
&find_closest_peers, &closest_ctx);
if (closest_ctx.closest != NULL)
{
- GNUNET_assert((0 <= closest_ctx.closest_num) &&
(closest_ctx.closest_num < pg->total));
+ GNUNET_assert(closest_ctx.closest_num < pg->total);
proc(pg, pg_iter, closest_ctx.closest_num);
}
}
@@ -3196,7 +3193,13 @@
total_count++;
}
}
- topology_context->total = total_count;
+ if (total_count == 0)
+ {
+ cb(cls, NULL, NULL, GNUNET_TIME_relative_get_zero(), 0, "Cannot iterate
over topology, no running peers!");
+ GNUNET_free(topology_context);
+ }
+ else
+ topology_context->total = total_count;
return;
}
@@ -3333,7 +3336,8 @@
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(specific_peer->cfg,
"statistics", "unixpath", &unix_domain_socket))
return GNUNET_NO;
- GNUNET_CONFIGURATION_get_value_number(specific_peer->cfg, "statistics",
"port", &port);
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number(specific_peer->cfg,
"statistics", "port", &port))
+ return GNUNET_NO;
if (specific_peer->daemon->hostname != NULL)
GNUNET_asprintf(&to_match, "%s%s%llu", specific_peer->daemon->hostname,
unix_domain_socket, port);
@@ -3344,7 +3348,8 @@
{
if (0 == strcmp(to_match, pos->unique_string))
{
- GNUNET_free(to_match);
+ GNUNET_free (unix_domain_socket);
+ GNUNET_free (to_match);
return GNUNET_YES;
}
pos = pos->next;
@@ -3353,6 +3358,7 @@
pos->unique_string = to_match;
pos->next = *stats_list;
*stats_list = pos;
+ GNUNET_free (unix_domain_socket);
return GNUNET_NO;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13637 - gnunet/src/testing,
gnunet <=