4 files changed, 21 insertions, 10 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5de74c9b4..1589c02bb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -116,12 +116,6 @@ src/env/env.c
 src/exit/gnunet-daemon-exit.c
 src/exit/gnunet-helper-exit.c
 src/exit/gnunet-helper-exit-windows.c
-src/experimentation/gnunet-daemon-experimentation.c
-src/experimentation/gnunet-daemon-experimentation_capabilities.c
-src/experimentation/gnunet-daemon-experimentation_experiments.c
-src/experimentation/gnunet-daemon-experimentation_nodes.c
-src/experimentation/gnunet-daemon-experimentation_scheduler.c
-src/experimentation/gnunet-daemon-experimentation_storage.c
 src/fragmentation/defragmentation.c
 src/fragmentation/fragmentation.c
 src/fs/fs_api.c
@@ -386,7 +380,6 @@ src/util/container_meta_data.c
 src/util/container_multihashmap32.c
 src/util/container_multihashmap.c
 src/util/container_multipeermap.c
-src/util/container_slist.c
 src/util/crypto_crc.c
 src/util/crypto_ecc.c
 src/util/crypto_hash.c
@@ -436,6 +429,7 @@ src/vpn/gnunet-helper-vpn-windows.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
+src/fs/fs_api.h
 src/include/gnunet_common.h
 src/include/gnunet_mq_lib.h
 src/include/gnunet_postgres_lib.h
diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index 97409e2a2..a6feee07c 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -97,6 +97,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
   char *type;
   char *pref;
   int op_counter = 0;
+
   fprintf (stderr, "Parsing episode %u\n",cur->id);
   GNUNET_asprintf(&sec_name, "episode-%u", cur->id);
 
@@ -134,6 +135,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
           op_counter, op, cur->id);
       GNUNET_free (op);
       GNUNET_free (op_name);
+      GNUNET_free (o);
       return GNUNET_SYSERR;
     }
     GNUNET_free (op_name);
@@ -147,6 +149,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
           op_counter, op, cur->id);
       GNUNET_free (op);
       GNUNET_free (op_name);
+      GNUNET_free (o);
       return GNUNET_SYSERR;
     }
     if (o->src_id > (e->num_masters - 1))
@@ -155,6 +158,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
           o->src_id, op_counter, op, cur->id);
       GNUNET_free (op);
       GNUNET_free (op_name);
+      GNUNET_free (o);
       return GNUNET_SYSERR;
     }
     GNUNET_free (op_name);
@@ -168,6 +172,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
           op_counter, op, cur->id);
       GNUNET_free (op);
       GNUNET_free (op_name);
+      GNUNET_free (o);
       return GNUNET_SYSERR;
     }
     if (o->dest_id > (e->num_slaves - 1))
@@ -176,6 +181,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
           o->dest_id, op_counter, op, cur->id);
       GNUNET_free (op);
       GNUNET_free (op_name);
+      GNUNET_free (o);
       return GNUNET_SYSERR;
     }
     GNUNET_free (op_name);
@@ -209,6 +215,8 @@ load_episode (struct Experiment *e, struct Episode *cur,
         GNUNET_free (type);
         GNUNET_free (op);
         GNUNET_free (op_name);
+        GNUNET_free (sec_name);
+        GNUNET_free (o);
         return GNUNET_SYSERR;
       }
       GNUNET_free (op_name);
@@ -223,6 +231,8 @@ load_episode (struct Experiment *e, struct Episode *cur,
         GNUNET_free (type);
         GNUNET_free (op);
         GNUNET_free (op_name);
+        GNUNET_free (sec_name);
+        GNUNET_free (o);
         return GNUNET_SYSERR;
       }
       GNUNET_free (op_name);
@@ -241,6 +251,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
           GNUNET_free (type);
           GNUNET_free (op_name);
           GNUNET_free (op);
+          GNUNET_free (o);
           return GNUNET_SYSERR;
         }
       }
@@ -267,6 +278,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
               GNUNET_free (type);
               GNUNET_free (op_name);
               GNUNET_free (op);
+              GNUNET_free (o);
               return GNUNET_SYSERR;
           }
           GNUNET_free (op_name);
@@ -282,6 +294,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
               GNUNET_free (op_name);
               GNUNET_free (op);
               GNUNET_free_non_null (pref);
+              GNUNET_free (o);
               return GNUNET_SYSERR;
           }
 
@@ -298,6 +311,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
               GNUNET_free (op);
               GNUNET_free (pref);
               GNUNET_free_non_null (pref);
+              GNUNET_free (o);
               return GNUNET_SYSERR;
           }
           GNUNET_free (pref);
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c
index dd856a2d5..ab8fdefcd 100644
--- a/src/ats-tests/ats-testing-log.c
+++ b/src/ats-tests/ats-testing-log.c
@@ -483,6 +483,7 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l,
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot open log file `%s'\n", filename_slaves[c_s]);
         GNUNET_free (filename_slaves[c_s]);
+        GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close(f_m));
         return;
       }
 
@@ -601,8 +602,10 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l,
 
     if (GNUNET_SYSERR == GNUNET_DISK_file_close(f_m))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-          "Cannot close log file `%s'\n", filename_master);
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                                "close",
+                                filename_master);
+      GNUNET_free (filename_master);
       return;
     }
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c
index 8453edfc7..9b3b5acf5 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -215,7 +215,7 @@ zone_proc (void *cls,
     GNUNET_SCHEDULER_add_now (&end, NULL);
     return;
   }
-
+  GNUNET_assert (NULL != zone);
   if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
   {
     failed = check_zone_1 (label, rd_count, rd);