[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 49/277: fix fmt string
From: |
gnunet |
Subject: |
[taler-merchant] 49/277: fix fmt string |
Date: |
Sun, 05 Jul 2020 20:49:22 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit 88bed1df5b0c23ef743d201c68a57cb56694cbb2
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Apr 24 20:44:20 2020 +0200
fix fmt string
---
.../taler-merchant-httpd_private-post-instances.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_private-post-instances.c
b/src/backend/taler-merchant-httpd_private-post-instances.c
index 228cc3a..6309d76 100644
--- a/src/backend/taler-merchant-httpd_private-post-instances.c
+++ b/src/backend/taler-merchant-httpd_private-post-instances.c
@@ -142,17 +142,15 @@ TMH_private_post_instances (const struct
TMH_RequestHandler *rh,
{
struct TALER_MERCHANTDB_InstanceSettings is;
json_t *payto_uris;
- const char *id;
- const char *name;
struct TMH_WireMethod *wm_head = NULL;
struct TMH_WireMethod *wm_tail = NULL;
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_json ("payto_uris",
&payto_uris),
GNUNET_JSON_spec_string ("id",
- &id),
+ (const char **) &is.id),
GNUNET_JSON_spec_string ("name",
- &name),
+ (const char **) &is.name),
GNUNET_JSON_spec_json ("address",
&is.address),
GNUNET_JSON_spec_json ("jurisdiction",
@@ -199,9 +197,9 @@ TMH_private_post_instances (const struct TMH_RequestHandler
*rh,
{
/* Check for idempotency */
if ( (0 == strcmp (mi->settings.id,
- id)) &&
+ is.id)) &&
(0 == strcmp (mi->settings.name,
- name)) &&
+ is.name)) &&
(1 == json_equal (mi->settings.address,
is.address)) &&
(1 == json_equal (mi->settings.jurisdiction,
@@ -288,7 +286,7 @@ TMH_private_post_instances (const struct TMH_RequestHandler
*rh,
&salt,
sizeof (salt));
wm = GNUNET_new (struct TMH_WireMethod);
- wm->j_wire = json_pack ("{s:O, s:s}",
+ wm->j_wire = json_pack ("{s:s, s:o}",
"payto_uri", payto_uri,
"salt", GNUNET_JSON_from_data_auto (&salt));
GNUNET_assert (NULL != wm->j_wire);
@@ -337,8 +335,8 @@ TMH_private_post_instances (const struct TMH_RequestHandler
*rh,
mi->wm_head = wm_head;
mi->wm_tail = wm_tail;
mi->settings = is;
- mi->settings.id = GNUNET_strdup (id);
- mi->settings.name = GNUNET_strdup (name);
+ mi->settings.id = GNUNET_strdup (is.id);
+ mi->settings.name = GNUNET_strdup (is.name);
GNUNET_CRYPTO_eddsa_key_create (&mi->merchant_priv.eddsa_priv);
GNUNET_CRYPTO_eddsa_key_get_public (&mi->merchant_priv.eddsa_priv,
&mi->merchant_pub.eddsa_pub);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] 33/277: move libtalermerchanttesting and test cases to src/testing/, (continued)
- [taler-merchant] 33/277: move libtalermerchanttesting and test cases to src/testing/, gnunet, 2020/07/05
- [taler-merchant] 36/277: add DELETE /instances/ID command, gnunet, 2020/07/05
- [taler-merchant] 37/277: add cmd for POST /instances, gnunet, 2020/07/05
- [taler-merchant] 39/277: add PATCH /instances/ID command, gnunet, 2020/07/05
- [taler-merchant] 45/277: baseURL construction helper function', gnunet, 2020/07/05
- [taler-merchant] 44/277: fix ftbfs in lock logic, gnunet, 2020/07/05
- [taler-merchant] 41/277: add DELETE/PURGE /instances/ID command, gnunet, 2020/07/05
- [taler-merchant] 42/277: implement purge, gnunet, 2020/07/05
- [taler-merchant] 43/277: toward stesting, gnunet, 2020/07/05
- [taler-merchant] 50/277: misc fixes, gnunet, 2020/07/05
- [taler-merchant] 49/277: fix fmt string,
gnunet <=
- [taler-merchant] 68/277: sql-ing, gnunet, 2020/07/05
- [taler-merchant] 53/277: implemente DELETE /orders/ID, gnunet, 2020/07/05
- [taler-merchant] 38/277: add PATCH /instances/ID command, gnunet, 2020/07/05
- [taler-merchant] 46/277: improve API, gnunet, 2020/07/05
- [taler-merchant] 54/277: first hack at POST /orders, gnunet, 2020/07/05
- [taler-merchant] 57/277: implement logic to complete POSTed /orders using inventory data, gnunet, 2020/07/05
- [taler-merchant] 62/277: mark as obsolete, gnunet, 2020/07/05
- [taler-merchant] 60/277: GET /orders logic, gnunet, 2020/07/05
- [taler-merchant] 48/277: fix tests, gnunet, 2020/07/05
- [taler-merchant] 56/277: implement POST /orders client with all optional arguments, gnunet, 2020/07/05