aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/taler_util_wallet.h1
-rw-r--r--src/mintdb/plugin_mintdb_postgres.c4
-rw-r--r--src/util/crypto.c6
-rw-r--r--src/util/json.c25
-rw-r--r--src/util/util.c6
5 files changed, 28 insertions, 14 deletions
diff --git a/src/include/taler_util_wallet.h b/src/include/taler_util_wallet.h
index de632f62c..275c9daf6 100644
--- a/src/include/taler_util_wallet.h
+++ b/src/include/taler_util_wallet.h
@@ -20,7 +20,6 @@
*/
#ifndef TALER_UTIL_H
#define TALER_UTIL_H
-
#include <gnunet/gnunet_util_taler_wallet_lib.h>
#include "taler_amount_lib.h"
#include "taler_crypto_lib.h"
diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c
index 5f4fa02d0..4a07bc872 100644
--- a/src/mintdb/plugin_mintdb_postgres.c
+++ b/src/mintdb/plugin_mintdb_postgres.c
@@ -165,7 +165,7 @@ postgres_create_tables (void *cls,
if (CONNECTION_OK != PQstatus (conn))
{
TALER_LOG_ERROR ("Database connection failed: %s\n",
- PQerrorMessage (conn));
+ PQerrorMessage (conn));
GNUNET_break (0);
PQfinish (conn);
return GNUNET_SYSERR;
@@ -1067,7 +1067,7 @@ postgres_reserves_in_insert (void *cls,
if (PGRES_COMMAND_OK != PQresultStatus(result))
{
const char *efield;
-
+
efield = PQresultErrorField (result,
PG_DIAG_SQLSTATE);
if ( (PGRES_FATAL_ERROR == PQresultStatus(result)) &&
diff --git a/src/util/crypto.c b/src/util/crypto.c
index 6e78259eb..590ed428b 100644
--- a/src/util/crypto.c
+++ b/src/util/crypto.c
@@ -23,7 +23,13 @@
*/
#include "platform.h"
#include "taler_util.h"
+
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
#include <gnunet/gnunet_util_lib.h>
+#endif
#include <gcrypt.h>
diff --git a/src/util/json.c b/src/util/json.c
index 34e41e0d7..606683598 100644
--- a/src/util/json.c
+++ b/src/util/json.c
@@ -19,7 +19,12 @@
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
*/
#include "platform.h"
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
#include <gnunet/gnunet_util_lib.h>
+#endif
#include "taler_util.h"
/**
@@ -155,7 +160,7 @@ TALER_json_from_rsa_public_key (struct GNUNET_CRYPTO_rsa_PublicKey *pk)
/**
* Convert JSON to RSA public key.
*
- * @param pk JSON encoding to convert
+ * @param pk JSON encoding to convert
* @return corresponding public key
*/
struct GNUNET_CRYPTO_rsa_PublicKey *
@@ -172,10 +177,10 @@ TALER_json_to_rsa_public_key (json_t *json)
len = strlen (enc);
buf_len = (len * 5) / 8;
buf = GNUNET_malloc (buf_len);
- EXITIF (GNUNET_OK !=
- GNUNET_STRINGS_string_to_data (enc,
- len,
- buf,
+ EXITIF (GNUNET_OK !=
+ GNUNET_STRINGS_string_to_data (enc,
+ len,
+ buf,
buf_len));
EXITIF (NULL == (pk = GNUNET_CRYPTO_rsa_public_key_decode (buf,
buf_len)));
@@ -190,7 +195,7 @@ TALER_json_to_rsa_public_key (json_t *json)
/**
* Convert JSON to RSA signature.
*
- * @param pk JSON encoding to convert
+ * @param pk JSON encoding to convert
* @return corresponding signature
*/
struct GNUNET_CRYPTO_rsa_Signature *
@@ -207,10 +212,10 @@ TALER_json_to_rsa_signature (json_t *json)
len = strlen (enc);
buf_len = (len * 5) / 8;
buf = GNUNET_malloc (buf_len);
- EXITIF (GNUNET_OK !=
- GNUNET_STRINGS_string_to_data (enc,
- len,
- buf,
+ EXITIF (GNUNET_OK !=
+ GNUNET_STRINGS_string_to_data (enc,
+ len,
+ buf,
buf_len));
EXITIF (NULL == (sig = GNUNET_CRYPTO_rsa_signature_decode (buf,
buf_len)));
diff --git a/src/util/util.c b/src/util/util.c
index 2973a11c2..6da2f3f78 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -24,8 +24,12 @@
#include "platform.h"
#include "taler_util.h"
-#include <gnunet/gnunet_common.h>
+#if HAVE_GNUNET_GNUNET_UTIL_TALER_WALLET_LIB_H
+#include <gnunet/gnunet_util_taler_wallet_lib.h>
+#endif
+#if HAVE_GNUNET_GNUNET_UTIL_LIB_H
#include <gnunet/gnunet_util_lib.h>
+#endif
#include <gcrypt.h>