[GNUnet-SVN] r3767 - GNUnet/src/applications/identity

[grothoff]

Author: grothoff
Date: 2006-11-14 17:14:56 -0800 (Tue, 14 Nov 2006)
New Revision: 3767

Modified:
   GNUnet/src/applications/identity/Makefile.am
   GNUnet/src/applications/identity/identitytest.c
Log:
fix

Modified: GNUnet/src/applications/identity/Makefile.am
===================================================================
--- GNUnet/src/applications/identity/Makefile.am        2006-11-14 12:16:23 UTC 
(rev 3766)
+++ GNUnet/src/applications/identity/Makefile.am        2006-11-15 01:14:56 UTC 
(rev 3767)
@@ -30,4 +30,5 @@
  identitytest.c 
 identitytest_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/util/config_impl/libgnunetutil_config.la  \
  $(top_builddir)/src/server/libgnunetcore.la  

Modified: GNUnet/src/applications/identity/identitytest.c
===================================================================
--- GNUnet/src/applications/identity/identitytest.c     2006-11-14 12:16:23 UTC 
(rev 3766)
+++ GNUnet/src/applications/identity/identitytest.c     2006-11-15 01:14:56 UTC 
(rev 3767)
@@ -30,6 +30,7 @@
 #include "gnunet_identity_service.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_core.h"
+#include "gnunet_util_config_impl.h"
 #include "core.h"
 
 #define ASSERT(cond) do { \
@@ -101,35 +102,28 @@
   return OK;
 }
 
-/**
- * Perform option parsing from the command line.
- */
-static int parser(int argc,
-                 char * argv[]) {
-  FREENONNULL(setConfigurationString("FILES",
-                                    "gnunet.conf",
-                                    "check.conf"));
-  FREENONNULL(setConfigurationString("GNUNETD",
-                                    "_MAGIC_",
-                                    "YES"));
-  FREENONNULL(setConfigurationString("GNUNETD",
-                                    "LOGFILE",
-                                    NULL));
-  return OK;
-}
-
 int main(int argc, char *argv[]) {
   int err;
+  struct GC_Configuration * cfg;
+  struct CronManager * cron;
 
-  if (OK != initUtil(argc, argv, &parser))
-    return SYSERR;
-  initCore();
+  cfg = GC_create_C_impl();
+  if (-1 == GC_parse_configuration(cfg,
+                                  "check.conf")) {
+    GC_free(cfg);
+    return -1;
+  }
+  cron = cron_create(NULL);
+  initCore(NULL,
+          cfg,
+          cron,
+          NULL);
   err = 0;
   if (OK != runTest())
     err = 1;
-
   doneCore();
-  doneUtil();
+  cron_destroy(cron);
+  GC_free(cfg);
   return err;
 }