Compare commits

..

No commits in common. "5128495412fc0461929707d14c1c203e9fb44ca6" and "120c6d53e29015bf952381a5854d5905ea84791a" have entirely different histories.

5 changed files with 17 additions and 15 deletions

@ -1 +1 @@
Subproject commit b0dd85e8187f33a1f92dd5eb31082050d333e168 Subproject commit 560c1ac1d321f7da4fc43ef96858ac27b7eaa2bd

View File

@ -24,6 +24,12 @@
#include <ltdl.h> #include <ltdl.h>
/**
* Initialize the plugin.
*
* @param cfg configuration to use
* @return #GNUNET_OK on success
*/
struct TALER_EXCHANGEDB_Plugin * struct TALER_EXCHANGEDB_Plugin *
TALER_EXCHANGEDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg) TALER_EXCHANGEDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg)
{ {
@ -56,6 +62,11 @@ TALER_EXCHANGEDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg)
} }
/**
* Shutdown the plugin.
*
* @param plugin the plugin to unload
*/
void void
TALER_EXCHANGEDB_plugin_unload (struct TALER_EXCHANGEDB_Plugin *plugin) TALER_EXCHANGEDB_plugin_unload (struct TALER_EXCHANGEDB_Plugin *plugin)
{ {

View File

@ -557,7 +557,7 @@ TALER_extension_config_hash (const json_t *config,
* *
* @param root is the json object * @param root is the json object
* @param[out] mask on succes, will contain the age mask * @param[out] mask on succes, will contain the age mask
* @return #GNUNET_OK on success and #GNUNET_SYSERR on failure. * @return GNUNET_OK on success and GNUNET_SYSERR on failure.
*/ */
enum GNUNET_GenericReturnValue enum GNUNET_GenericReturnValue
TALER_agemask_parse_json (const json_t *root, TALER_agemask_parse_json (const json_t *root,

View File

@ -249,17 +249,6 @@ TALER_MHD_make_json_pack (const char *fmt,
TALER_MHD_make_json_steal (GNUNET_JSON_PACK (__VA_ARGS__)) TALER_MHD_make_json_steal (GNUNET_JSON_PACK (__VA_ARGS__))
/**
* Pack Taler error code @a ec and associated hint into a
* JSON object.
*
* @param ec error code to pack
* @return packer array entries (two!)
*/
#define TALER_MHD_PACK_EC(ec) \
GNUNET_JSON_pack_uint64 ("code", ec), \
GNUNET_JSON_pack_string ("hint", TALER_ErrorCode_get_hint (ec))
/** /**
* Create a response indicating an internal error. * Create a response indicating an internal error.
* *

View File

@ -371,7 +371,8 @@ TALER_MHD_make_error (enum TALER_ErrorCode ec,
const char *detail) const char *detail)
{ {
return TALER_MHD_MAKE_JSON_PACK ( return TALER_MHD_MAKE_JSON_PACK (
TALER_MHD_PACK_EC (ec), GNUNET_JSON_pack_uint64 ("code", ec),
GNUNET_JSON_pack_string ("hint", TALER_ErrorCode_get_hint (ec)),
GNUNET_JSON_pack_allow_null ( GNUNET_JSON_pack_allow_null (
GNUNET_JSON_pack_string ("detail", detail))); GNUNET_JSON_pack_string ("detail", detail)));
} }
@ -386,7 +387,8 @@ TALER_MHD_reply_with_error (struct MHD_Connection *connection,
return TALER_MHD_REPLY_JSON_PACK ( return TALER_MHD_REPLY_JSON_PACK (
connection, connection,
http_status, http_status,
TALER_MHD_PACK_EC (ec), GNUNET_JSON_pack_uint64 ("code", ec),
GNUNET_JSON_pack_string ("hint", TALER_ErrorCode_get_hint (ec)),
GNUNET_JSON_pack_allow_null ( GNUNET_JSON_pack_allow_null (
GNUNET_JSON_pack_string ("detail", detail))); GNUNET_JSON_pack_string ("detail", detail)));
} }