[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10475 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10475 - gnunet/src/testing |
Date: |
Thu, 4 Mar 2010 10:07:22 +0100 |
Author: grothoff
Date: 2010-03-04 10:07:22 +0100 (Thu, 04 Mar 2010)
New Revision: 10475
Modified:
gnunet/src/testing/testing_group.c
Log:
code clean up
Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c 2010-03-04 08:28:06 UTC (rev 10474)
+++ gnunet/src/testing/testing_group.c 2010-03-04 09:07:22 UTC (rev 10475)
@@ -311,18 +311,34 @@
unsigned int useAnd;
int connect_attempts;
- GNUNET_CONFIGURATION_get_value_string(pg->cfg, "TESTING", "LOGNMODIFIER",
&p_string);
- if ((p_string == NULL) || (sscanf(p_string, "%lf", &logNModifier) != 1))
- logNModifier = 0.5; /* FIXME: default modifier? */
-
- GNUNET_free_non_null(p_string);
-
- GNUNET_CONFIGURATION_get_value_string(pg->cfg, "TESTING", "PERCENTAGE",
&p_string);
- if ((p_string == NULL) || (sscanf(p_string, "%lf", &percentage) != 1))
- percentage = 0.5; /* FIXME: default percentage? */
-
- GNUNET_free_non_null(p_string);
-
+ logNModifier = 0.5; /* FIXME: default value? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
+ "TESTING",
+ "LOGNMODIFIER",
+ &p_string))
+ {
+ if (sscanf(p_string, "%lf", &logNModifier) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid value `%s' for option `%s' in section `%s':
expected float\n"),
+ p_string,
+ "LOGNMODIFIER",
+ "TESTING");
+ GNUNET_free (p_string);
+ }
+ percentage = 0.5; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
+ "TESTING",
+ "PERCENTAGE",
+ &p_string))
+ {
+ if (sscanf(p_string, "%lf", &percentage) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid value `%s' for option `%s' in section `%s':
expected float\n"),
+ p_string,
+ "PERCENTAGE",
+ "TESTING");
+ GNUNET_free (p_string);
+ }
natLog = log (pg->total);
connsPerPeer = ceil (natLog * logNModifier);
@@ -400,12 +416,23 @@
double nat_percentage;
char *p_string;
- GNUNET_CONFIGURATION_get_value_string(pg->cfg, "TESTING", "NATPERCENTAGE",
&p_string);
- if ((p_string == NULL) || (sscanf(p_string, "%lf", &nat_percentage) != 1))
- nat_percentage = 0.6; /* FIXME: default modifier? */
+ nat_percentage = 0.6; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
+ "TESTING",
+ "NATPERCENTAGE",
+ &p_string))
+ {
+ if (sscanf(p_string, "%lf", &nat_percentage) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid value `%s' for option `%s' in section `%s':
expected float\n"),
+ p_string,
+ "NATPERCENTAGE",
+ "TESTING");
+ GNUNET_free (p_string);
+ }
- GNUNET_free_non_null(p_string);
+
cutoff = (unsigned int) (nat_percentage * pg->total);
connect_attempts = 0;
@@ -455,19 +482,35 @@
square = floor (sqrt (pg->total));
rows = square;
cols = square;
-
- GNUNET_CONFIGURATION_get_value_string(pg->cfg, "TESTING", "PERCENTAGE",
&p_string);
- if ((p_string == NULL) || (sscanf(p_string, "%lf", &percentage) != 1))
- percentage = 0.5; /* FIXME: default percentage? */
-
- GNUNET_free_non_null(p_string);
-
- GNUNET_CONFIGURATION_get_value_string(pg->cfg, "TESTING", "PROBABILITY",
&p_string);
- if ((p_string == NULL) || (sscanf(p_string, "%lf", &probability) != 1))
- probability = 0.5; /* FIXME: default probability? */
-
- GNUNET_free_non_null(p_string);
-
+
+ percentage = 0.5; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
+ "TESTING",
+ "PERCENTAGE",
+ &p_string))
+ {
+ if (sscanf(p_string, "%lf", &percentage) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid value `%s' for option `%s' in section `%s':
expected float\n"),
+ p_string,
+ "PERCENTAGE",
+ "TESTING");
+ GNUNET_free (p_string);
+ }
+ probability = 0.5; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
+ "TESTING",
+ "PROBABILITY",
+ &p_string))
+ {
+ if (sscanf(p_string, "%lf", &probability) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Invalid value `%s' for option `%s' in section `%s':
expected float\n"),
+ p_string,
+ "PROBABILITY",
+ "TESTING");
+ GNUNET_free (p_string);
+ }
if (square * square != pg->total)
{
while (rows * cols < pg->total)
@@ -770,13 +813,14 @@
fclose(temp_friend_handle);
- GNUNET_CONFIGURATION_get_value_string(pg->peers[pg_iter].daemon->cfg,
"PATHS", "SERVICEHOME", &temp_service_path);
-
- if (temp_service_path == NULL)
- {
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string(pg->peers[pg_iter].daemon->cfg,
"PATHS", "SERVICEHOME", &temp_service_path))
+ {
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("No SERVICEHOME specified in peer configuration, can't
copy friends file!\n"));
- if (unlink(mytemp) != 0)
+ _("No `%s' specified in peer configuration in section
`%s', cannot copy friends file!\n"),
+ "SERVICEHOME",
+ "PATHS");
+ if (UNLINK (mytemp) != 0)
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
mytemp);
GNUNET_free (mytemp);
break;
@@ -917,7 +961,7 @@
int num_connections;
GNUNET_assert (pg->notify_connection != NULL);
- ret = 0;
+ ret = GNUNET_OK;
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_number (pg->cfg, "testing", "topology",
&topology_num))
@@ -977,7 +1021,7 @@
num_connections = 0;
break;
default:
- ret = GNUNET_SYSERR;
+ num_connections = 0;
break;
}
if (num_connections < 1)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10475 - gnunet/src/testing,
gnunet <=