merchant

commit 37cc93e1511c0072b6a801d3071932114364392d
parent 125c9ec8da551943965e7405b78675cb8013a31b
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Mon, 26 Oct 2015 21:06:44 +0100

fixing macro notation for using arguments as string constants

Diffstat:
M
src/backend/merchant.c
 | 
8
--------
M
src/backend/merchant.conf
 | 
2
+-
M
src/backend/taler-merchant-httpd.c
 | 
30
+++++++++---------------------
M
src/backend/taler-merchant-httpd_contract.c
 | 
1
+

4 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/src/backend/merchant.c b/src/backend/merchant.c
@@ -111,36 +111,28 @@ TALER_MERCHANT_parse_mints (const struct GNUNET_CONFIGURATION_Handle *cfg,
             GNUNET_CRYPTO_eddsa_public_key_from_string (mint_pubkey_enc,
                                                         strlen (mint_pubkey_enc),
                                                         &mint.pubkey));
-
     EXITIF (GNUNET_OK !=
             GNUNET_CONFIGURATION_get_value_string (cfg,
                                                    mint_section,
                                                    "COUNTRY",
                                                    &mint_country));
-
     EXITIF (GNUNET_OK !=
             GNUNET_CONFIGURATION_get_value_string (cfg,
                                                    mint_section,
                                                    "CITY",
                                                    &mint_city));
-
-
     if (GNUNET_OK ==
         GNUNET_CONFIGURATION_get_value_string (cfg,
                                                mint_section,
                                                "STATE",
                                                &mint_state))
       mint.state = mint_state;
-
-
     if (GNUNET_OK ==
         GNUNET_CONFIGURATION_get_value_string (cfg,
                                                mint_section,
                                                "REGION",
                                                &mint_region))
       mint.region = mint_region;
-    
-
     if (GNUNET_OK ==
         GNUNET_CONFIGURATION_get_value_string (cfg,
                                                mint_section,
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
@@ -17,7 +17,7 @@ STREET = Avenue du General Leclerc
 STREET_NUMBER = 21
 
 [merchant-db]
-CONFIG = postgres:///taler
+CONFIG = postgres:///talerdemo
 
 [wire-sepa]
 IBAN = DE67830654080004822650
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -292,8 +292,6 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     }
   if (keyfile != NULL)
     GNUNET_free (privkey);
-
-  
 }
 
 /**
@@ -304,16 +302,16 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 void
 dump_mint (struct MERCHANT_MintInfo *mint)
 {
-  char dump[];
+  char *dump;
   
   #define GET_MINT_VALUE_STRING(fieldname) \
   do { if (NULL != mint->fieldname) \
   { \
     dump = GNUNET_realloc (dump, strlen (dump) \
                                  + strlen (mint->fieldname) \
-                                 + strlen ("fieldname: ") \
+                                 + strlen (#fieldname ": ") \
 				 + 2); \
-    sprintf (dump[strlen (dump)], "fieldname: %s\n", mint->fieldname); \
+    sprintf (dump + strlen (dump), #fieldname ": %s\n", mint->fieldname); \
   } \
   } while (0);
 
@@ -322,9 +320,9 @@ dump_mint (struct MERCHANT_MintInfo *mint)
   { \
     dump = GNUNET_realloc (dump, strlen (dump) \
                                  + 5 \
-                                 + strlen ("fieldname: ") \
+                                 + strlen (#fieldname ": ") \
 				 + 2); \
-    sprintf (dump[strlen (dump)], "fieldname: %d\n", mint->fieldname); \
+    sprintf (dump + strlen (dump), #fieldname ": %d\n", mint->fieldname); \
   } \
   } while (0);
 
@@ -332,24 +330,14 @@ dump_mint (struct MERCHANT_MintInfo *mint)
 
   // TODO public key fetch
 
-  #define MAXUINT16 65536 
-  if (0 != mint->port && mint->port <= MAXUINT16)
-  {
-    dump = GNUNET_realloc (dump, strlen (dump)
-                                 + 5
-                                 + strlen ("port: ")
-                                 + 1);
-    
-    sprintf (dump[strlen (dump) + 1], "port: %d\n", mint->port);
-  }
-
-  GET_MINT_VALUE_STRING(state);
-  GET_MINT_VALUE_STRING(region);
+  GET_MINT_VALUE_STRING(city);
   GET_MINT_VALUE_STRING(province);
   GET_MINT_VALUE_UINT16(zip_code);
+  GET_MINT_VALUE_UINT16(port);
   GET_MINT_VALUE_STRING(street);
+  GET_MINT_VALUE_STRING(country);
   GET_MINT_VALUE_UINT16(street_no);
-  
+  printf ("country = %s\n", mint->country); 
   printf ("Dumping mint:\n%s", dump);
   GNUNET_free (dump);
 
diff --git a/src/backend/taler-merchant-httpd_contract.c b/src/backend/taler-merchant-httpd_contract.c
@@ -25,6 +25,7 @@
 #include <jansson.h>
 #include <gnunet/gnunet_util_lib.h>
 #include <curl/curl.h>
+#include <taler/taler_amount_lib.h>
 #include <taler/taler_json_lib.h>
 #include <taler/taler_mint_service.h>
 #include "taler-mint-httpd.h"