diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-03-05 20:11:51 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-03-05 20:11:51 +0100 |
| commit | 09b01a179daf0de4ad2a14d22f584c105d7de22c (patch) | |
| tree | 74548bdbd5dc19f3fa2033e908fc4f7552f90bc3 /src/backend/taler-merchant-httpd.c | |
| parent | 2b78ff4482e5e25bc1880dd08ed4acc6182f134c (diff) | |
| download | merchant-09b01a179daf0de4ad2a14d22f584c105d7de22c.tar.gz merchant-09b01a179daf0de4ad2a14d22f584c105d7de22c.tar.bz2 merchant-09b01a179daf0de4ad2a14d22f584c105d7de22c.zip | |
towards implementing #4935: make sure all of the fee data is available for the /pay handler (but not yet checked)
Diffstat (limited to 'src/backend/taler-merchant-httpd.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index f13b8911..cb083017 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -632,7 +632,7 @@ get_instance (struct json_t *json) * @param config configuration handle * @param allowed which wire format is allowed/expected? * @return #GNUNET_OK if successful, #GNUNET_SYSERR upon errors - * (for example, if no "defaul" instance is defined) + * (for example, if no "default" instance is defined) */ static unsigned int iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config, @@ -716,7 +716,6 @@ run (void *cls, char *wireformat; int fh; - wireformat = NULL; result = GNUNET_SYSERR; GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); @@ -763,6 +762,7 @@ run (void *cls, GNUNET_SCHEDULER_shutdown (); return; } + wireformat = NULL; if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (config, "merchant", @@ -775,10 +775,10 @@ run (void *cls, GNUNET_SCHEDULER_shutdown (); return; } - - iterate_instances (config, wireformat); - + iterate_instances (config, + wireformat); GNUNET_free (wireformat); + if (NULL == (db = TALER_MERCHANTDB_plugin_load (config))) { |