summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-01-28 20:53:21 +0100
committerChristian Grothoff <christian@grothoff.org>2015-01-28 20:53:21 +0100
commit9c3c6295a85a03fdad9a77799e85289ce65a109b (patch)
tree4325f5a0d8f26f32effd9b2bf4c900a83a038d8a /src/util
parentc4b63c13029b9d731b826ffab4a9d59005b0c6a5 (diff)
downloadexchange-9c3c6295a85a03fdad9a77799e85289ce65a109b.tar.gz
exchange-9c3c6295a85a03fdad9a77799e85289ce65a109b.tar.bz2
exchange-9c3c6295a85a03fdad9a77799e85289ce65a109b.zip
even cleaner separation of PostGres-specific logic, and nicer libtalerutil headers
Diffstat (limited to 'src/util')
-rw-r--r--src/util/amount.c5
-rw-r--r--src/util/crypto.c3
-rw-r--r--src/util/json.c4
3 files changed, 5 insertions, 7 deletions
diff --git a/src/util/amount.c b/src/util/amount.c
index 8bd899bf5..bb5bf0d5b 100644
--- a/src/util/amount.c
+++ b/src/util/amount.c
@@ -13,9 +13,8 @@
You should have received a copy of the GNU General Public License along with
TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/>
*/
-
/**
- * @file amount.c
+ * @file util/amount.c
* @brief Common utility functions to deal with units of currency
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Florian Dold
@@ -23,8 +22,6 @@
*/
#include "platform.h"
#include "taler_util.h"
-#include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_util_lib.h>
#include <gcrypt.h>
#define AMOUNT_FRAC_BASE 1000000
diff --git a/src/util/crypto.c b/src/util/crypto.c
index 8ce3ade2c..12f452085 100644
--- a/src/util/crypto.c
+++ b/src/util/crypto.c
@@ -14,11 +14,12 @@
TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file crypto.c
+ * @file util/crypto.c
* @brief Cryptographic utility functions
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Florian Dold
* @author Benedikt Mueller
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "taler_util.h"
diff --git a/src/util/json.c b/src/util/json.c
index 252def394..f686d84a1 100644
--- a/src/util/json.c
+++ b/src/util/json.c
@@ -13,13 +13,11 @@
You should have received a copy of the GNU General Public License along with
TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/>
*/
-
/**
* @file util/json.c
* @brief helper functions for JSON processing using libjansson
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
*/
-
#include "platform.h"
#include <gnunet/gnunet_util_lib.h>
#include "taler_util.h"
@@ -49,6 +47,7 @@
if (cond) { WARN_JSON(error); goto EXITIF_exit; } \
} while (0)
+
/**
* Convert a TALER amount to a JSON
* object.
@@ -60,6 +59,7 @@ json_t *
TALER_JSON_from_amount (struct TALER_Amount amount)
{
json_t *j;
+
j = json_pack ("{s: s, s:I, s:I}",
"currency", amount.currency,
"value", (json_int_t) amount.value,