From ea45b21a957ba2cb6eb9e0ba64c10ec0ac229a04 Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Sun, 24 Jun 2001 22:42:12 +0000 Subject: [PATCH] 2001-06-24 Dave Peticolas * src/engine/sql/kvp-sql.c: same as below * src/engine/sql/txn.c: same as below * src/engine/sql/price.c: same as below * src/engine/sql/checkpoint.c: use strtoll instead of atoll git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4778 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 10 ++++++++++ src/engine/sql/checkpoint.c | 9 +++++---- src/engine/sql/kvp-sql.c | 6 +++--- src/engine/sql/price.c | 5 +++-- src/engine/sql/txn.c | 5 +++-- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e23fb9489..b96ce588fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-06-24 Dave Peticolas + + * src/engine/sql/kvp-sql.c: same as below + + * src/engine/sql/txn.c: same as below + + * src/engine/sql/price.c: same as below + + * src/engine/sql/checkpoint.c: use strtoll instead of atoll + 2001-06-24 Kevin Finn * src/gnome/dialog-transfer.[ch]: reformatted my previous changes diff --git a/src/engine/sql/checkpoint.c b/src/engine/sql/checkpoint.c index 6d308c9cb0..044535d0b6 100644 --- a/src/engine/sql/checkpoint.c +++ b/src/engine/sql/checkpoint.c @@ -35,7 +35,8 @@ #define _GNU_SOURCE #include -#include +#include +#include #include #include @@ -309,9 +310,9 @@ static gpointer get_checkpoint_cb (PGBackend *be, PGresult *result, int j, gpointer data) { Checkpoint *chk = (Checkpoint *) data; - chk->balance = atoll(DB_GET_VAL("baln", j)); - chk->cleared_balance = atoll(DB_GET_VAL("cleared_baln", j)); - chk->reconciled_balance = atoll(DB_GET_VAL("reconed_baln", j)); + chk->balance = strtoll(DB_GET_VAL("baln", j), NULL, 0); + chk->cleared_balance = strtoll(DB_GET_VAL("cleared_baln", j), NULL, 0); + chk->reconciled_balance = strtoll(DB_GET_VAL("reconed_baln", j), NULL, 0); return data; } diff --git a/src/engine/sql/kvp-sql.c b/src/engine/sql/kvp-sql.c index a0a2428db8..c431e55a12 100644 --- a/src/engine/sql/kvp-sql.c +++ b/src/engine/sql/kvp-sql.c @@ -419,7 +419,7 @@ static gpointer int64_handler (PGBackend *be, PGresult *result, int j, gpointer data) { KVP_HANDLER_SETUP; - kv = kvp_value_new_gint64 (atoll (DB_GET_VAL ("data", j))); + kv = kvp_value_new_gint64 (strtoll (DB_GET_VAL ("data", j), NULL, 0)); KVP_HANDLER_TAKEDOWN; } @@ -436,8 +436,8 @@ numeric_handler (PGBackend *be, PGresult *result, int j, gpointer data) { gnc_numeric gn; KVP_HANDLER_SETUP; - gn.num = atoll (DB_GET_VAL ("num", j)); - gn.denom = atoll (DB_GET_VAL ("denom", j)); + gn.num = strtoll (DB_GET_VAL ("num", j), NULL, 0); + gn.denom = strtoll (DB_GET_VAL ("denom", j), NULL, 0); kv = kvp_value_new_gnc_numeric (gn); KVP_HANDLER_TAKEDOWN; } diff --git a/src/engine/sql/price.c b/src/engine/sql/price.c index 86952b58b2..a274e03e19 100644 --- a/src/engine/sql/price.c +++ b/src/engine/sql/price.c @@ -26,6 +26,7 @@ #include "config.h" #include +#include #include #include @@ -273,8 +274,8 @@ get_price_cb (PGBackend *be, PGresult *result, int j, gpointer data) gnc_price_set_source (pr, DB_GET_VAL("source",j)); gnc_price_set_type (pr, DB_GET_VAL("type",j)); - num = atoll (DB_GET_VAL("valueNum", j)); - denom = atoll (DB_GET_VAL("valueDenom", j)); + num = strtoll (DB_GET_VAL("valueNum", j), NULL, 0); + denom = strtoll (DB_GET_VAL("valueDenom", j), NULL, 0); value = gnc_numeric_create (num, denom); gnc_price_set_value (pr, value); diff --git a/src/engine/sql/txn.c b/src/engine/sql/txn.c index fd61477dda..63d78cfc3b 100644 --- a/src/engine/sql/txn.c +++ b/src/engine/sql/txn.c @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -547,7 +548,7 @@ pgendCopyTransactionToEngine (PGBackend *be, const GUID *trans_guid) (DB_GET_VAL("date_reconciled",j)); xaccSplitSetDateReconciledTS (s, &ts); - num = atoll (DB_GET_VAL("value", j)); + num = strtoll (DB_GET_VAL("value", j), NULL, 0); value = gnc_numeric_create (num, trans_frac); xaccSplitSetValue (s, value); @@ -572,7 +573,7 @@ pgendCopyTransactionToEngine (PGBackend *be, const GUID *trans_guid) { gnc_commodity *modity; gint64 acct_frac; - num = atoll (DB_GET_VAL("amount", j)); + num = strtoll (DB_GET_VAL("amount", j), NULL, 0); modity = xaccAccountGetCommodity (acc); acct_frac = gnc_commodity_get_fraction (modity); amount = gnc_numeric_create (num, acct_frac);