NAMESTORE: Introduce GANA-managed error codes

4 files changed, 34 insertions, 35 deletions

diff --git a/src/reclaim/did_core.c b/src/reclaim/did_core.c
index 8c5e6c812..f3caff707 100644
--- a/src/reclaim/did_core.c
+++ b/src/reclaim/did_core.c
@@ -121,21 +121,20 @@ DID_resolve (const char *did,
 
 static void
 DID_create_did_store_cb (void *cls,
-                         int32_t success,
-                         const char *emsg)
+                         enum GNUNET_ErrorCode ec)
 {
   DID_action_callback *cb = ((struct DID_action_return *) cls)->cb;
   void *cls_did_create_cb = ((struct DID_action_return *) cls)->cls;
   free (cls);
 
-  if (GNUNET_OK == success)
+  if (GNUNET_EC_NONE == ec)
   {
     cb (GNUNET_OK, (void *) cls_did_create_cb);
   }
   else
   {
     // TODO: Log emsg. Not writing it to STDOUT
-    printf ("%s\n", emsg);
+    printf ("%s\n", GNUNET_ErrorCode_get_hint (ec));
     cb (GNUNET_NO, (void *) cls_did_create_cb);
   }
 }
diff --git a/src/reclaim/gnunet-did.c b/src/reclaim/gnunet-did.c
index 25f571520..b5f5f4922 100644
--- a/src/reclaim/gnunet-did.c
+++ b/src/reclaim/gnunet-did.c
@@ -223,11 +223,11 @@ struct Event
  * @param emgs
  */
 static void
-remove_did_document_namestore_cb (void *cls, int32_t success, const char *emgs)
+remove_did_document_namestore_cb (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct Event *event;
 
-  if (success != GNUNET_SYSERR)
+  if (GNUNET_EC_NONE == ec)
   {
     event = (struct Event *) cls;
 
@@ -246,10 +246,7 @@ remove_did_document_namestore_cb (void *cls, int32_t success, const char *emgs)
   else {
     printf ("Something went wrong when deleting the DID Document\n");
 
-    if (emgs != NULL)
-    {
-      printf ("%s\n", emgs);
-    }
+    printf ("%s\n", GNUNET_ErrorCode_get_hint (ec));
 
     GNUNET_SCHEDULER_add_now (cleanup, NULL);
     ret = 0;
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
index 5290621d6..5c484e55d 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -970,7 +970,7 @@ handle_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
  * @param emsg error message (NULL if success=GNUNET_OK)
  */
 static void
-attr_store_cont (void *cls, int32_t success, const char *emsg)
+attr_store_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct AttributeStoreHandle *ash = cls;
   struct GNUNET_MQ_Envelope *env;
@@ -981,11 +981,11 @@ attr_store_cont (void *cls, int32_t success, const char *emsg)
                                ash->client->store_op_tail,
                                ash);
 
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to store attribute %s\n",
-                emsg);
+                GNUNET_ErrorCode_get_hint (ec));
     cleanup_as_handle (ash);
     GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     return;
@@ -1108,7 +1108,7 @@ handle_attribute_store_message (void *cls,
  * @param emsg error message (NULL if success=GNUNET_OK)
  */
 static void
-cred_store_cont (void *cls, int32_t success, const char *emsg)
+cred_store_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct AttributeStoreHandle *ash = cls;
   struct GNUNET_MQ_Envelope *env;
@@ -1119,11 +1119,11 @@ cred_store_cont (void *cls, int32_t success, const char *emsg)
                                ash->client->store_op_tail,
                                ash);
 
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to store credential: %s\n",
-                emsg);
+                GNUNET_ErrorCode_get_hint (ec));
     cleanup_as_handle (ash);
     GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     return;
@@ -1395,7 +1395,7 @@ update_tickets (void *cls);
  * @param emsg error message (NULL if success=GNUNET_OK)
  */
 static void
-ticket_updated (void *cls, int32_t success, const char *emsg)
+ticket_updated (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct AttributeDeleteHandle *adh = cls;
 
@@ -1519,12 +1519,12 @@ static void
 purge_attributes (void *cls);;
 
 static void
-offending_attr_delete_cont (void *cls, int32_t success, const char *emsg)
+offending_attr_delete_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct AttributeDeleteHandle *adh = cls;
 
   adh->ns_qe = NULL;
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Error deleting attribute %s\n",
@@ -1664,12 +1664,12 @@ start_consistency_update (void *cls)
  * @param emsg error message (NULL if success=GNUNET_OK)
  */
 static void
-attr_delete_cont (void *cls, int32_t success, const char *emsg)
+attr_delete_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct AttributeDeleteHandle *adh = cls;
 
   adh->ns_qe = NULL;
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Error deleting attribute %s\n",
@@ -1755,12 +1755,12 @@ handle_attribute_delete_message (void *cls,
  * @param emsg error message (NULL if success=GNUNET_OK)
  */
 static void
-cred_delete_cont (void *cls, int32_t success, const char *emsg)
+cred_delete_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct AttributeDeleteHandle *adh = cls;
 
   adh->ns_qe = NULL;
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Error deleting credential `%s'\n",
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
index a17dfb0e2..9552094f1 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -394,7 +394,7 @@ process_tickets (void *cls);
  * @param emsg (NULL on success)
  */
 static void
-ticket_processed (void *cls, int32_t success, const char *emsg)
+ticket_processed (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
 
@@ -596,16 +596,16 @@ move_attrs_cont (void *cls)
  * @param emsg error message (NULL on success)
  */
 static void
-del_attr_finished (void *cls, int32_t success, const char *emsg)
+del_attr_finished (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
 
   rvk->ns_qe = NULL;
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Error removing attribute: %s\n",
-                emsg);
+                GNUNET_ErrorCode_get_hint (ec));
     rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
     cleanup_rvk (rvk);
     return;
@@ -625,15 +625,17 @@ del_attr_finished (void *cls, int32_t success, const char *emsg)
  * @param emsg error message (NULL on success)
  */
 static void
-move_attr_finished (void *cls, int32_t success, const char *emsg)
+move_attr_finished (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
   char *label;
 
   rvk->ns_qe = NULL;
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error moving attribute: %s\n", emsg);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Error moving attribute: %s\n",
+                GNUNET_ErrorCode_get_hint (ec));
     rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
     cleanup_rvk (rvk);
     return;
@@ -802,14 +804,15 @@ move_attrs (struct RECLAIM_TICKETS_RevokeHandle *rvk)
  * @param emsg error message (NULL on success)
  */
 static void
-remove_ticket_cont (void *cls, int32_t success, const char *emsg)
+remove_ticket_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct RECLAIM_TICKETS_RevokeHandle *rvk = cls;
 
   rvk->ns_qe = NULL;
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", emsg);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n",
+                GNUNET_ErrorCode_get_hint (ec));
     rvk->cb (rvk->cb_cls, GNUNET_SYSERR);
     cleanup_rvk (rvk);
     return;
@@ -1250,12 +1253,12 @@ cleanup_issue_handle (struct TicketIssueHandle *handle)
  * @param emsg error message (or NULL on success)
  */
 static void
-store_ticket_issue_cont (void *cls, int32_t success, const char *emsg)
+store_ticket_issue_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct TicketIssueHandle *handle = cls;
 
   handle->ns_qe = NULL;
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
     handle->cb (handle->cb_cls,
                 &handle->ticket,