REST/NAMESTORE: rework API

[oweals/gnunet.git] / src / ats-tests / ats-testing-experiment.c

diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index 38600219be2e9f6964b52e49e91b5536f2d0a0e7..b91c652b0d8e4fa8ae50e644887997809995c1b3 100644 (file)
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -2,20 +2,20 @@
  This file is part of GNUnet.
  Copyright (C) 2010-2013 GNUnet e.V.
 
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
 
  GNUnet is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
 
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats-tests/ats-testing-experiment.c
@@ -196,7 +196,8 @@ load_episode (struct Experiment *e,
     GNUNET_asprintf(&op_name, "op-%u-type", op_counter);
     if ( (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_string(cfg,
             sec_name, op_name, &type)) &&
-        ((STOP_SEND != o->type) || (STOP_PREFERENCE != o->type)))
+         (STOP_SEND != o->type) &&
+         (STOP_PREFERENCE != o->type) )
     {
       /* Load arguments for set_rate, start_send, set_preference */
       if (0 == strcmp (type, "constant"))
@@ -319,7 +320,6 @@ load_episode (struct Experiment *e,
               GNUNET_free (type);
               GNUNET_free (op_name);
               GNUNET_free (op);
-              GNUNET_free (pref);
               GNUNET_free_non_null (pref);
               GNUNET_free (o);
               GNUNET_free (sec_name);
@@ -416,8 +416,9 @@ load_episodes (struct Experiment *e, struct GNUNET_CONFIGURATION_Handle *cfg)
   return e_counter;
 }
 
+
 static void
-timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+timeout_experiment (void *cls)
 {
   struct Experiment *e = cls;
   e->experiment_timeout_task = NULL;
@@ -433,6 +434,7 @@ timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
       GNUNET_SYSERR);
 }
 
+
 static void
 enforce_start_send (struct GNUNET_ATS_TEST_Operation *op)
 {
@@ -574,10 +576,12 @@ static void enforce_episode (struct Episode *ep)
   }
 }
 
+
 static void
-timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+timeout_episode (void *cls)
 {
   struct Experiment *e = cls;
+
   e->episode_timeout_task = NULL;
   if (NULL != e->ep_done_cb)
     e->ep_done_cb (e->cur);
@@ -636,7 +640,7 @@ GNUNET_ATS_TEST_experimentation_run (struct Experiment *e,
 
 
 struct Experiment *
-GNUNET_ATS_TEST_experimentation_load (char *filename)
+GNUNET_ATS_TEST_experimentation_load (const char *filename)
 {
   struct Experiment *e;
   struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -742,4 +746,3 @@ GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e)
 }
 
 /* end of file ats-testing-experiment.c*/
-