psyc service skeleton

4 files changed, 14 insertions, 21 deletions

diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c
index 8a21167e1..14945641f 100644
--- a/src/psycstore/gnunet-service-psycstore.c
+++ b/src/psycstore/gnunet-service-psycstore.c
@@ -23,11 +23,8 @@
  * @brief PSYCstore service
  * @author Gabor X Toth
  * @author Christian Grothoff
- *
- * The purpose of this service is to manage private keys that
- * represent the various egos/pseudonyms/identities of a GNUnet user.
- *
  */
+
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
@@ -666,15 +663,14 @@ handle_state_get_prefix (void *cls,
 
 
 /**
- * Handle PSYCstore clients.
+ * Initialize the PSYCstore service.
  *
- * @param cls closure
- * @param server the initialized server
- * @param c configuration to use
+ * @param cls Closure.
+ * @param server The initialized server.
+ * @param c Configuration to use.
  */
 static void
-run (void *cls,
-     struct GNUNET_SERVER_Handle *server,
+run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
@@ -766,7 +762,7 @@ run (void *cls,
 
 
 /**
- * The main function for the network size estimation service.
+ * The main function for the service.
  *
  * @param argc number of arguments from the command line
  * @param argv command line arguments
diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index 3a7a9feed..cc382a456 100644
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -24,8 +24,8 @@
  * @author Gabor X Toth
  */
 
-#ifndef PSYCSTORE_H
-#define PSYCSTORE_H
+#ifndef GNUNET_PSYCSTORE_H
+#define GNUNET_PSYCSTORE_H
 
 #include "gnunet_common.h"
 
diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c
index 15eb2de30..cfda6819e 100644
--- a/src/psycstore/test_psycstore.c
+++ b/src/psycstore/test_psycstore.c
@@ -500,13 +500,13 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 #else
-  run (void *cls,
-       const struct GNUNET_CONFIGURATION_Handle *cfg,
-       struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 #endif
 {
-  end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                                 &end_badly, NULL);
+  end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
   h = GNUNET_PSYCSTORE_connect (cfg);
   GNUNET_assert (NULL != h);
 
diff --git a/src/psycstore/test_psycstore.conf b/src/psycstore/test_psycstore.conf
index 4c52d1ce0..a7d334617 100644
--- a/src/psycstore/test_psycstore.conf
+++ b/src/psycstore/test_psycstore.conf
@@ -1,7 +1,6 @@
 [arm]
 UNIXPATH = /tmp/test-gnunet-service-arm.sock
 DEFAULTSERVICES = psycstore
-GLOBAL_POSTFIX = -L DEBUG
 
 [psycstore]
 AUTOSTART = YES
@@ -11,8 +10,6 @@ UNIXPATH = /tmp/test-gnunet-service-psycstore.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 DATABASE = sqlite
-OPTIONS = -L DEBUG
-DEBUG = YES
 
 [psycstore-sqlite]
 FILENAME = $SERVICEHOME/psycstore/sqlite_test.db