merchant

commit fafdb22f2926189c7f84a84aa3e1078ca1281401
parent c797af18ddffef334644ef2ff818e2d36414304d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon,  2 Aug 2021 22:18:33 +0200

-use new TALER_JSON_check_i18n

Diffstat:
M
src/backend/taler-merchant-httpd_helper.c
 | 
8
--------
M
src/backend/taler-merchant-httpd_helper.h
 | 
5
-----
M
src/backend/taler-merchant-httpd_private-patch-products-ID.c
 | 
2
+-
M
src/backend/taler-merchant-httpd_private-post-products.c
 | 
2
+-

4 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_helper.c b/src/backend/taler-merchant-httpd_helper.c
@@ -98,14 +98,6 @@ TMH_location_object_valid (const json_t *location)
 
 // FIXME
 bool
-TMH_i18n_object_valid (const json_t *i18n)
-{
-  return true; // FIXME
-}
-
-
-// FIXME
-bool
 TMH_image_data_url_valid (const char *image_data_url)
 {
   if (0 == strcmp (image_data_url,
diff --git a/src/backend/taler-merchant-httpd_helper.h b/src/backend/taler-merchant-httpd_helper.h
@@ -51,11 +51,6 @@ TMH_location_object_valid (const json_t *location);
 
 // FIXME
 bool
-TMH_i18n_object_valid (const json_t *i18n);
-
-
-// FIXME
-bool
 TMH_image_data_url_valid (const char *image_data_url);
 
 /**
diff --git a/src/backend/taler-merchant-httpd_private-patch-products-ID.c b/src/backend/taler-merchant-httpd_private-patch-products-ID.c
@@ -189,7 +189,7 @@ TMH_private_patch_products_ID (const struct TMH_RequestHandler *rh,
   if (NULL == pd.description_i18n)
     pd.description_i18n = json_object ();
 
-  if (! TMH_i18n_object_valid (pd.description_i18n))
+  if (! TALER_JSON_check_i18n (pd.description_i18n))
   {
     GNUNET_break_op (0);
     GNUNET_JSON_parse_free (spec);
diff --git a/src/backend/taler-merchant-httpd_private-post-products.c b/src/backend/taler-merchant-httpd_private-post-products.c
@@ -169,7 +169,7 @@ TMH_private_post_products (const struct TMH_RequestHandler *rh,
                                        "address");
   }
 
-  if (! TMH_i18n_object_valid (pd.description_i18n))
+  if (! TALER_JSON_check_i18n (pd.description_i18n))
   {
     GNUNET_break_op (0);
     GNUNET_JSON_parse_free (spec);