[GNUnet-SVN] r28106 - in gnunet/src: identity include

[gnunet]

Author: grothoff
Date: 2013-07-17 12:01:33 +0200 (Wed, 17 Jul 2013)
New Revision: 28106

Modified:
   gnunet/src/identity/gnunet-service-identity.c
   gnunet/src/identity/identity.conf.in
   gnunet/src/identity/identity_api.c
   gnunet/src/identity/test_identity.c
   gnunet/src/include/gnunet_identity_service.h
Log:
-fix typos

Modified: gnunet/src/identity/gnunet-service-identity.c
===================================================================
--- gnunet/src/identity/gnunet-service-identity.c       2013-07-17 09:41:22 UTC 
(rev 28105)
+++ gnunet/src/identity/gnunet-service-identity.c       2013-07-17 10:01:33 UTC 
(rev 28106)
@@ -916,6 +916,13 @@
   stats = GNUNET_STATISTICS_create ("identity", cfg);
   GNUNET_SERVER_add_handlers (server, handlers);
   nc = GNUNET_SERVER_notification_context_create (server, 1);
+  if (GNUNET_OK !=
+      GNUNET_DISK_directory_create (ego_directory))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               _("Failed to create directory `%s' for storing egos\n"),
+               ego_directory);
+  }
   GNUNET_DISK_directory_scan (ego_directory,
                              &process_ego_file,
                              NULL);

Modified: gnunet/src/identity/identity.conf.in
===================================================================
--- gnunet/src/identity/identity.conf.in        2013-07-17 09:41:22 UTC (rev 
28105)
+++ gnunet/src/identity/identity.conf.in        2013-07-17 10:01:33 UTC (rev 
28106)
@@ -13,3 +13,5 @@
 # Directory where we store information about our egos
 EGODIR = $SERVICEHOME/egos/
 
+# File where we store default identities for subsystems
+SUBSYSTEM_CFG = $SERVICEHOME/subsystem_defaults.conf

Modified: gnunet/src/identity/identity_api.c
===================================================================
--- gnunet/src/identity/identity_api.c  2013-07-17 09:41:22 UTC (rev 28105)
+++ gnunet/src/identity/identity_api.c  2013-07-17 10:01:33 UTC (rev 28106)
@@ -910,6 +910,7 @@
 GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h)
 {
   GNUNET_assert (NULL != h);
+  GNUNET_assert (h->op_head == h->op_tail);
   if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel (h->reconnect_task);

Modified: gnunet/src/identity/test_identity.c
===================================================================
--- gnunet/src/identity/test_identity.c 2013-07-17 09:41:22 UTC (rev 28105)
+++ gnunet/src/identity/test_identity.c 2013-07-17 10:01:33 UTC (rev 28106)
@@ -60,16 +60,16 @@
 static void
 cleanup ()
 {
+  if (NULL != op)
+  {
+    GNUNET_IDENTITY_cancel (op);
+    op = NULL;
+  }
   if (NULL != h)
   {
     GNUNET_IDENTITY_disconnect (h);
     h = NULL;
   }
-  if (NULL != op)
-  {
-    GNUNET_IDENTITY_cancel (op);
-    op = NULL;
-  }
   GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -113,7 +113,7 @@
     GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  GNUNET_SCHEDULER_add_now (&end, NULL);
+  GNUNET_SCHEDULER_add_now (&end_normally, NULL);
 }
 
 
@@ -155,11 +155,11 @@
           const char *identifier)
 {
   op = NULL;
+  fprintf (stderr, "HERE!\n");
   end (); /* yepee */
 }
 
 
-
 /**
  * Main function of the test, run from scheduler.
  *
@@ -184,8 +184,6 @@
 }
 
 
-
-
 int
 main (int argc, char *argv[])
 {

Modified: gnunet/src/include/gnunet_identity_service.h
===================================================================
--- gnunet/src/include/gnunet_identity_service.h        2013-07-17 09:41:22 UTC 
(rev 28105)
+++ gnunet/src/include/gnunet_identity_service.h        2013-07-17 10:01:33 UTC 
(rev 28106)
@@ -246,7 +246,7 @@
  * @param op operation to cancel
  */
 void
-GNUNET_IDENITY_cancel (struct GNUNET_IDENTITY_Operation *op);
+GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */