diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2020-01-13 11:35:07 +0100 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2020-01-13 11:35:07 +0100 |
| commit | e54402d392c25aa0476308d51bcc75ce84178dc3 (patch) | |
| tree | 1b4b0e48876099f5959900e51133c4c76e12f022 /src/backend/taler-merchant-httpd.c | |
| parent | adfd806648d1a58e7ab67f7988f6a4e98500a8a3 (diff) | |
| download | merchant-e54402d392c25aa0476308d51bcc75ce84178dc3.tar.gz merchant-e54402d392c25aa0476308d51bcc75ce84178dc3.tar.bz2 merchant-e54402d392c25aa0476308d51bcc75ce84178dc3.zip | |
fix compilation after exchange refactor
Diffstat (limited to 'src/backend/taler-merchant-httpd.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 671aa978..a7241a32 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -27,9 +27,8 @@ #include <taler/taler_util.h> #include <taler/taler_json_lib.h> #include <taler/taler_mhd_lib.h> -#include <taler/taler_exchange_service.h> -#include <taler/taler_wire_plugin.h> #include <taler/taler_wire_lib.h> +#include <taler/taler_exchange_service.h> #include "taler_merchantdb_lib.h" #include "taler-merchant-httpd.h" #include "taler-merchant-httpd_mhd.h" @@ -719,10 +718,7 @@ wireformat_iterator_cb (void *cls, struct WireMethod *wm; char *payto; char *fn; - char *plugin_name; - struct TALER_WIRE_Plugin *plugin; json_t *j; - enum TALER_ErrorCode ec; struct GNUNET_HashCode jh_wire; char *wire_file_mode; @@ -755,49 +751,6 @@ wireformat_iterator_cb (void *cls, return; } - /* check payto://-URL is well-formed and matches plugin */ - if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (iic->config, - section, - "PLUGIN", - &plugin_name)) - { - GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - section, - "PLUGIN"); - GNUNET_free (payto); - iic->ret = GNUNET_SYSERR; - return; - } - if (NULL == - (plugin = TALER_WIRE_plugin_load (iic->config, - plugin_name))) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to load wire plugin `%s'\n", - plugin_name); - GNUNET_free (plugin_name); - GNUNET_free (payto); - iic->ret = GNUNET_SYSERR; - return; - } - if (TALER_EC_NONE != - (ec = plugin->wire_validate (plugin->cls, - payto))) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "payto:// URL `%s' not supported by plugin `%s'\n", - payto, - plugin_name); - GNUNET_free (plugin_name); - GNUNET_free (payto); - TALER_WIRE_plugin_unload (plugin); - iic->ret = GNUNET_SYSERR; - return; - } - TALER_WIRE_plugin_unload (plugin); - GNUNET_free (plugin_name); - if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (iic->config, section, |