NAMESTORE: Introduce GANA-managed error codes

1 files changed, 9 insertions, 28 deletions

diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index ea35269a4..37c1576bc 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -117,23 +117,10 @@ struct RecordStoreResponseMessage
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
-   * #GNUNET_SYSERR on failure, #GNUNET_OK on success
+   * GNUNET_ErrorCode
    */
-  int32_t op_result GNUNET_PACKED;
+  uint32_t ec GNUNET_PACKED;
 
-  /**
-   * Error message length
-   */
-  uint16_t emsg_len GNUNET_PACKED;
-
-  /**
-   * Reserved for alignment.
-   */
-  uint16_t reserved GNUNET_PACKED;
-
-  /**
-   * Followed by error message
-   */
 };
 
 
@@ -264,10 +251,12 @@ struct ZoneToNameResponseMessage
   uint16_t rd_count GNUNET_PACKED;
 
   /**
-   * result in NBO: #GNUNET_OK on success, #GNUNET_NO if there were no
-   * results, #GNUNET_SYSERR on error
+   * result in NBO: #GNUNET_EC_NONE on success,
+   * #GNUNET_EC_NAMESTORE_NO_RESULTS if there were no
+   * results.
+   * Other error messages on error.
    */
-  int16_t res GNUNET_PACKED;
+  int32_t ec GNUNET_PACKED;
 
   /**
    * The private key of the zone that contained the name.
@@ -361,18 +350,10 @@ struct TxControlResultMessage
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
-   * The type of control message to send
-   */
-  uint16_t control GNUNET_PACKED;
-
-  /**
-   * Of type GNUNET_GenericReturnValue
+   * Of type GNUNET_ErrorCode
    */
-  uint16_t success GNUNET_PACKED;
+  uint32_t ec GNUNET_PACKED;
 
-  /* followed by:
-   * an error message if status != ntohs(GNUNET_OK)
-   */
 };