[GNUnet-SVN] r28074 - gnunet/src/identity

[gnunet]

Author: grothoff
Date: 2013-07-16 09:42:11 +0200 (Tue, 16 Jul 2013)
New Revision: 28074

Modified:
   gnunet/src/identity/gnunet-service-identity.c
   gnunet/src/identity/identity_api.c
Log:
-handle get failure properly

Modified: gnunet/src/identity/gnunet-service-identity.c
===================================================================
--- gnunet/src/identity/gnunet-service-identity.c       2013-07-16 00:11:14 UTC 
(rev 28073)
+++ gnunet/src/identity/gnunet-service-identity.c       2013-07-16 07:42:11 UTC 
(rev 28074)
@@ -315,7 +315,6 @@
                                             "DEFAULT_IDENTIFIER",
                                             &identifier))
   {
-    /* FIXME: not sure client API handles this case correctly right now... */
     send_result_code (client, 1, gettext_noop ("no default known"));
     GNUNET_SERVER_receive_done (client, GNUNET_OK);   
     return;
@@ -333,7 +332,6 @@
       return;
     }
   }
-  /* FIXME: not sure client API handles this case correctly right now... */
   send_result_code (client, 1, 
                    gettext_noop ("default configured, but ego unknown 
(internal error)"));
   GNUNET_SERVER_receive_done (client, GNUNET_OK);

Modified: gnunet/src/identity/identity_api.c
===================================================================
--- gnunet/src/identity/identity_api.c  2013-07-16 00:11:14 UTC (rev 28073)
+++ gnunet/src/identity/identity_api.c  2013-07-16 07:42:11 UTC (rev 28074)
@@ -276,7 +276,8 @@
     if (NULL != op->cont)
       op->cont (op->cls,
                str);
-    GNUNET_break (NULL == op->cb);
+    else if (NULL != op->cb)
+      op->cb (op->cls, NULL, NULL, NULL);
     GNUNET_free (op);
     break;
   case GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE:
@@ -340,10 +341,11 @@
       GNUNET_CRYPTO_ecc_key_free (priv);
     }
     /* inform application about change */
-    h->cb (h->cb_cls,
-          ego,
-          &ego->ctx,
-          str);
+    if (NULL != h->cb)
+      h->cb (h->cb_cls,
+            ego,
+            &ego->ctx,
+            str);
     if (NULL == str)
     {
       /* ego was deleted */
@@ -413,7 +415,6 @@
              ego,
              &ego->ctx,
              ego->identifier);
-    GNUNET_break (NULL == op->cont);
     GNUNET_free (op);
     break;
   default: