taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mark parameter as const; free correct object

Browse Source
This commit is contained in:
Özgür Kesim 2023-01-02 17:47:06 +01:00
parent 4f0d85935f
commit 8e6b086753
Signed by: oec
GPG Key ID: 3D76A56D79EDD9D7
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/exchange/taler-exchange-httpd_extensions.c
View File

@ -118,14 +118,14 @@ extension_update_event_cb (void *cls,
err.text, err.text,
err.source); err.source);
GNUNET_break (0); GNUNET_break (0);
free (manifest_js); free (manifest_str);
return; return;
} }
// Call the parser for the extension // Call the parser for the extension
ret = extension->load_config ( ret = extension->load_config (
(struct TALER_Extension *) extension, json_object_get (manifest_js, "config"),
json_object_get (manifest_js, "config")); (struct TALER_Extension *) extension);
if (GNUNET_OK != ret) if (GNUNET_OK != ret)
{ {

5
src/extensions/age_restriction/age_restriction.c
View File

@ -64,8 +64,8 @@ age_restriction_disable (
*/ */
static enum GNUNET_GenericReturnValue static enum GNUNET_GenericReturnValue
age_restriction_load_config ( age_restriction_load_config (
struct TALER_Extension *ext, const json_t *jconfig,
json_t *jconfig) struct TALER_Extension *ext)
{ {
struct TALER_AgeMask mask = {0}; struct TALER_AgeMask mask = {0};
enum GNUNET_GenericReturnValue ret; enum GNUNET_GenericReturnValue ret;
@ -93,7 +93,6 @@ age_restriction_load_config (
ext->config = &AR_config; ext->config = &AR_config;
ext->enabled = true; ext->enabled = true;
json_decref (jconfig);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"loaded new age restriction config with age groups: %s\n", "loaded new age restriction config with age groups: %s\n",

4
src/extensions/extensions.c
View File

@ -334,12 +334,12 @@ TALER_extensions_load_manifests (
if (critical != extension->critical if (critical != extension->critical
|| 0 != strcmp (version, extension->version) // TODO: libtool compare? || 0 != strcmp (version, extension->version) // TODO: libtool compare?
|| NULL == config || NULL == config
|| GNUNET_OK != extension->load_config (NULL, config)) || GNUNET_OK != extension->load_config (config, NULL))
return GNUNET_SYSERR; return GNUNET_SYSERR;
/* This _should_ work now */ /* This _should_ work now */
if (GNUNET_OK != if (GNUNET_OK !=
extension->load_config (extension, config)) extension->load_config (config, extension))
return GNUNET_SYSERR; return GNUNET_SYSERR;
extension->enabled = true; extension->enabled = true;

8
src/include/taler_extensions.h
View File

@ -128,13 +128,13 @@ struct TALER_Extension
* @brief Handler to read an extension-specific configuration in JSON * @brief Handler to read an extension-specific configuration in JSON
* encoding and enable the extension. Must be implemented by the extension. * encoding and enable the extension. Must be implemented by the extension.
* *
* @param ext The extension object. If NULL, the configuration will only be checked. * @param[in] ext The extension object. If NULL, the configuration will only be checked.
* @param config A JSON blob * @param[in,out] config A JSON blob
* @return GNUNET_OK if the json was a valid configuration for the extension. * @return GNUNET_OK if the json was a valid configuration for the extension.
*/ */
enum GNUNET_GenericReturnValue (*load_config)( enum GNUNET_GenericReturnValue (*load_config)(
struct TALER_Extension *ext, const json_t *config,
json_t *config); struct TALER_Extension *ext);
/** /**
* @brief Handler to return the manifest of the extension in JSON encoding. * @brief Handler to return the manifest of the extension in JSON encoding.