psycutil reorg: message, env, slicer

4 files changed, 22 insertions, 26 deletions

diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 4bb28ce0a..e00537e73 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -24,8 +24,7 @@ libgnunetpsyc_la_SOURCES = \
   psyc_api.c psyc.h
 libgnunetpsyc_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
-  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
+  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetpsyc_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -43,7 +42,7 @@ gnunet_service_psyc_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/multicast/libgnunetmulticast.la \
   $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
-  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
+  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(GN_LIBINTL)
 gnunet_service_psyc_CFLAGS = $(AM_CFLAGS)
 
@@ -62,10 +61,9 @@ test_psyc_SOURCES = \
  test_psyc.c
 test_psyc_LDADD = \
   libgnunetpsyc.la \
-  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
+  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c
index e9727c485..827f3d79b 100644
--- a/src/psyc/gnunet-service-psyc.c
+++ b/src/psyc/gnunet-service-psyc.c
@@ -2477,7 +2477,7 @@ store_recv_state_var (void *cls, const char *name,
     mod->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER);
     mod->name_size = htons (name_size);
     mod->value_size = htonl (value_size);
-    mod->oper = htons (GNUNET_ENV_OP_ASSIGN);
+    mod->oper = htons (GNUNET_PSYC_OP_ASSIGN);
     memcpy (&mod[1], name, name_size);
     memcpy (((char *) &mod[1]) + name_size, value, value_size);
   }
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c
index 8152fc47f..c9d74f3c8 100644
--- a/src/psyc/psyc_api.c
+++ b/src/psyc/psyc_api.c
@@ -34,7 +34,6 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_env_lib.h"
 #include "gnunet_multicast_service.h"
 #include "gnunet_psyc_service.h"
 #include "gnunet_psyc_util_lib.h"
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c
index f167e2697..74e27a48f 100644
--- a/src/psyc/test_psyc.c
+++ b/src/psyc/test_psyc.c
@@ -32,7 +32,6 @@
 #include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_env_lib.h"
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_psyc_service.h"
 #include "gnunet_core_service.h"
@@ -69,8 +68,8 @@ struct TransmitClosure
 {
   struct GNUNET_PSYC_MasterTransmitHandle *mst_tmit;
   struct GNUNET_PSYC_SlaveTransmitHandle *slv_tmit;
-  struct GNUNET_ENV_Environment *env;
-  struct GNUNET_ENV_Modifier *mod;
+  struct GNUNET_PSYC_Environment *env;
+  struct GNUNET_PSYC_Modifier *mod;
   char *data[16];
   const char *mod_value;
   size_t mod_value_size;
@@ -116,7 +115,7 @@ void master_stopped (void *cls)
 {
   if (NULL != tmit)
   {
-    GNUNET_ENV_environment_destroy (tmit->env);
+    GNUNET_PSYC_env_destroy (tmit->env);
     GNUNET_free (tmit);
     tmit = NULL;
   }
@@ -617,7 +616,7 @@ tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Test #%d: Transmit notify modifier: %lu bytes available, "
               "%u modifiers left to process.\n",
-              test, *data_size, GNUNET_ENV_environment_get_count (tmit->env));
+              test, *data_size, GNUNET_PSYC_env_get_count (tmit->env));
 
   uint16_t name_size = 0;
   size_t value_size = 0;
@@ -697,12 +696,12 @@ slave_transmit ()
               "Test #%d: Slave sending request to master.\n", test);
 
   tmit = GNUNET_new (struct TransmitClosure);
-  tmit->env = GNUNET_ENV_environment_create ();
-  GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN,
+  tmit->env = GNUNET_PSYC_env_create ();
+  GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN,
                               "_abc", "abc def", 7);
-  GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN,
+  GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN,
                               "_abc_def", "abc def ghi", 11);
-  tmit->mod = GNUNET_ENV_environment_head (tmit->env);
+  tmit->mod = GNUNET_PSYC_env_head (tmit->env);
   tmit->n = 0;
   tmit->data[0] = "slave test";
   tmit->data_count = 1;
@@ -835,10 +834,10 @@ slave_join (int t)
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test #%d: Joining slave.\n");
 
   struct GNUNET_PeerIdentity origin = this_peer;
-  struct GNUNET_ENV_Environment *env = GNUNET_ENV_environment_create ();
-  GNUNET_ENV_environment_add (env, GNUNET_ENV_OP_ASSIGN,
+  struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create ();
+  GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_ASSIGN,
                               "_foo", "bar baz", 7);
-  GNUNET_ENV_environment_add (env, GNUNET_ENV_OP_ASSIGN,
+  GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_ASSIGN,
                               "_foo_bar", "foo bar baz", 11);
   struct GNUNET_PSYC_Message *
     join_msg = GNUNET_PSYC_message_create ("_request_join", env, "some data", 9);
@@ -851,7 +850,7 @@ slave_join (int t)
                                 join_msg);
   GNUNET_free (join_msg);
   slv_chn = GNUNET_PSYC_slave_get_channel (slv);
-  GNUNET_ENV_environment_destroy (env);
+  GNUNET_PSYC_env_destroy (env);
 }
 
 
@@ -881,20 +880,20 @@ master_transmit ()
     val_cont[i] = (0 == j % 10000) ? '0' + j / 10000 : '!';
 
   tmit = GNUNET_new (struct TransmitClosure);
-  tmit->env = GNUNET_ENV_environment_create ();
-  GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN,
+  tmit->env = GNUNET_PSYC_env_create ();
+  GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN,
                               "_foo", "bar baz", 7);
-  GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN,
+  GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN,
                               name_max, val_max,
                               GNUNET_PSYC_MODIFIER_MAX_PAYLOAD
                               - name_max_size);
-  GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN,
+  GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN,
                               "_foo_bar", "foo bar baz", 11);
-  GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN,
+  GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN,
                               name_cont, val_cont,
                               GNUNET_PSYC_MODIFIER_MAX_PAYLOAD - name_cont_size
                               + GNUNET_PSYC_MOD_CONT_MAX_PAYLOAD);
-  tmit->mod = GNUNET_ENV_environment_head (tmit->env);
+  tmit->mod = GNUNET_PSYC_env_head (tmit->env);
   tmit->data[0] = "foo";
   tmit->data[1] =  GNUNET_malloc (GNUNET_PSYC_DATA_MAX_PAYLOAD + 1);
   for (i = 0; i < GNUNET_PSYC_DATA_MAX_PAYLOAD; i++)