- replace deprecated INCLUDES with AM_CPPFLAGS

[oweals/gnunet.git] / src / experimentation / gnunet-daemon-experimentation_experiments.c

diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c
index 891865b39f25e6e388e7ba842cd33343a0f1bf4e..c787c34167f718eb9a5936cc6923f03c326c5bc8 100644 (file)
--- a/src/experimentation/gnunet-daemon-experimentation_experiments.c
+++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -38,7 +38,7 @@
  */
 struct Issuer
 {
-       struct GNUNET_CRYPTO_EccPublicKey pubkey;
+       struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 };
 
 
@@ -86,7 +86,7 @@ int free_experiment (void *cls,
                                                                                 void *value)
 {
        struct Experiment *e = value;
-       GNUNET_CONTAINER_multihashmap_remove (experiments, key, value);
+       GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (experiments, key, value));
        GNUNET_free_non_null (e->description);
        GNUNET_free_non_null (e->name);
        GNUNET_free (e);
@@ -107,7 +107,7 @@ int free_issuer (void *cls,
                                                                 void *value)
 {
        struct Issuer *i = value;
-       GNUNET_CONTAINER_multihashmap_remove (valid_issuers, key, value);
+       GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (valid_issuers, key, value));
        GNUNET_free (i);
        return GNUNET_OK;
 }
@@ -354,9 +354,8 @@ void exp_file_iterator (void *cls,
        /* Optional fields */
 
        /* Description */
-       GNUNET_CONFIGURATION_get_value_string (exp, name, "DESCRIPTION", &description);
-
-
+       if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (exp, name, "DESCRIPTION", &description))
+               description = NULL;
 
        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value_us))
                        start = GNUNET_TIME_UNIT_ZERO_ABS;
@@ -410,7 +409,7 @@ GED_experiments_start ()
        char *pubkey;
        char *pos;
        struct GNUNET_PeerIdentity issuer_ID;
-       struct GNUNET_CRYPTO_EccPublicKey pub;
+       struct GNUNET_CRYPTO_EccPublicSignKey pub;
        struct GNUNET_HashCode hash;
 
        /* Load valid issuer */
@@ -449,7 +448,7 @@ GED_experiments_start ()
 
        if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (GED_cfg, "EXPERIMENTATION", "PUBKEY", &pubkey))
        {
-                       if (GNUNET_OK != GNUNET_CRYPTO_ecc_public_key_from_string(pubkey, strlen (pubkey), &pub))
+                       if (GNUNET_OK != GNUNET_CRYPTO_ecc_public_sign_key_from_string(pubkey, strlen (pubkey), &pub))
                        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid public key `%s'\n"), pubkey);
                        else
                        {