r22656 - gnucash/trunk/src - Replace now obsolete wrappers by the functions they called directly
Geert Janssens
gjanssens at code.gnucash.org
Sat Dec 15 14:15:15 EST 2012
Author: gjanssens
Date: 2012-12-15 14:15:14 -0500 (Sat, 15 Dec 2012)
New Revision: 22656
Trac: http://svn.gnucash.org/trac/changeset/22656
Modified:
gnucash/trunk/src/base-typemaps.i
gnucash/trunk/src/engine/engine-helpers.c
gnucash/trunk/src/engine/engine-helpers.h
gnucash/trunk/src/engine/kvp-scm.c
Log:
Replace now obsolete wrappers by the functions they called directly
Modified: gnucash/trunk/src/base-typemaps.i
===================================================================
--- gnucash/trunk/src/base-typemaps.i 2012-12-15 17:59:35 UTC (rev 22655)
+++ gnucash/trunk/src/base-typemaps.i 2012-12-15 19:15:14 UTC (rev 22656)
@@ -43,8 +43,8 @@
%typemap(in) gnc_numeric "$1 = gnc_scm_to_numeric($input);"
%typemap(out) gnc_numeric "$result = gnc_numeric_to_scm($1);"
-%typemap(in) gint64 " $1 = gnc_scm_to_gint64($input); "
-%typemap(out) gint64 " $result = gnc_gint64_to_scm($1); "
+%typemap(in) gint64 " $1 = scm_to_int64($input); "
+%typemap(out) gint64 " $result = scm_from_int64($1); "
%define GLIST_HELPER_INOUT(ListType, ElemSwigType)
%typemap(in) ListType * {
Modified: gnucash/trunk/src/engine/engine-helpers.c
===================================================================
--- gnucash/trunk/src/engine/engine-helpers.c 2012-12-15 17:59:35 UTC (rev 22655)
+++ gnucash/trunk/src/engine/engine-helpers.c 2012-12-15 19:15:14 UTC (rev 22656)
@@ -83,7 +83,7 @@
SCM secs;
SCM nsecs;
- secs = gnc_gint64_to_scm(t.tv_sec);
+ secs = scm_from_int64(t.tv_sec);
nsecs = scm_from_long (t.tv_nsec);
return(scm_cons(secs, nsecs));
}
@@ -94,7 +94,7 @@
Timespec result = {0, 0};
if (gnc_timepair_p (x))
{
- result.tv_sec = gnc_scm_to_gint64(SCM_CAR(x));
+ result.tv_sec = scm_to_int64(SCM_CAR(x));
result.tv_nsec = scm_to_long(SCM_CDR(x));
}
return(result);
@@ -455,8 +455,8 @@
static SCM
gnc_query_numeric2scm (gnc_numeric val)
{
- return scm_cons (gnc_gint64_to_scm (val.num),
- gnc_gint64_to_scm (val.denom));
+ return scm_cons (scm_from_int64 (val.num),
+ scm_from_int64 (val.denom));
}
static gboolean
@@ -474,8 +474,8 @@
num = SCM_CAR (pair);
denom = SCM_CDR (pair);
- return gnc_numeric_create (gnc_scm_to_gint64 (num),
- gnc_scm_to_gint64 (denom));
+ return gnc_numeric_create (scm_to_int64 (num),
+ scm_to_int64 (denom));
}
static SCM
@@ -562,7 +562,7 @@
switch (value_t)
{
case KVP_TYPE_GINT64:
- scm = gnc_gint64_to_scm (kvp_value_get_gint64 (value));
+ scm = scm_from_int64 (kvp_value_get_gint64 (value));
break;
case KVP_TYPE_DOUBLE:
@@ -677,7 +677,7 @@
switch (value_t)
{
case KVP_TYPE_GINT64:
- value = kvp_value_new_gint64 (gnc_scm_to_gint64 (val_scm));
+ value = kvp_value_new_gint64 (scm_to_int64 (val_scm));
break;
case KVP_TYPE_DOUBLE:
@@ -877,7 +877,7 @@
{
query_int64_t pdata = (query_int64_t) pd;
- qt_scm = scm_cons (gnc_gint64_to_scm (pdata->val), qt_scm);
+ qt_scm = scm_cons (scm_from_int64 (pdata->val), qt_scm);
}
else if (!g_strcmp0 (pd->type_name, QOF_TYPE_DOUBLE))
@@ -1063,7 +1063,7 @@
qt_scm = SCM_CDR (qt_scm);
if (scm_is_null (scm))
break;
- val = gnc_scm_to_gint64 (scm);
+ val = scm_to_int64 (scm);
pd = qof_query_int64_predicate (compare_how, val);
@@ -2226,18 +2226,6 @@
return q;
}
-SCM
-gnc_gint64_to_scm(const gint64 x)
-{
- return scm_from_int64(x);
-}
-
-gint64
-gnc_scm_to_gint64(SCM num)
-{
- return scm_to_int64(num);
-}
-
int
gnc_gh_gint64_p(SCM num)
{
@@ -2256,11 +2244,11 @@
tmp = 0x7FFFFFFF;
tmp <<= 32;
tmp |= 0xFFFFFFFF;
- maxval = gnc_gint64_to_scm(tmp);
+ maxval = scm_from_int64(tmp);
tmp = 0x80000000;
tmp <<= 32;
- minval = gnc_gint64_to_scm(tmp);
+ minval = scm_from_int64(tmp);
scm_gc_protect_object(maxval);
scm_gc_protect_object(minval);
@@ -2287,8 +2275,8 @@
get_denom = scm_c_eval_string("gnc:gnc-numeric-denom");
}
- return gnc_numeric_create(gnc_scm_to_gint64(scm_call_1(get_num, gncnum)),
- gnc_scm_to_gint64(scm_call_1(get_denom, gncnum)));
+ return gnc_numeric_create(scm_to_int64(scm_call_1(get_num, gncnum)),
+ scm_to_int64(scm_call_1(get_denom, gncnum)));
}
SCM
@@ -2301,8 +2289,8 @@
maker = scm_c_eval_string("gnc:make-gnc-numeric");
}
- return scm_call_2(maker, gnc_gint64_to_scm(gnc_numeric_num(arg)),
- gnc_gint64_to_scm(gnc_numeric_denom(arg)));
+ return scm_call_2(maker, scm_from_int64(gnc_numeric_num(arg)),
+ scm_from_int64(gnc_numeric_denom(arg)));
}
int
Modified: gnucash/trunk/src/engine/engine-helpers.h
===================================================================
--- gnucash/trunk/src/engine/engine-helpers.h 2012-12-15 17:59:35 UTC (rev 22655)
+++ gnucash/trunk/src/engine/engine-helpers.h 2012-12-15 19:15:14 UTC (rev 22656)
@@ -60,8 +60,7 @@
SCM gnc_query2scm (QofQuery * q);
QofQuery * gnc_scm2query (SCM query_scm);
-SCM gnc_gint64_to_scm(const gint64 x);
-gint64 gnc_scm_to_gint64(SCM num);
+gint64 scm_to_int64(SCM num);
int gnc_gh_gint64_p(SCM num);
SCM gnc_numeric_to_scm(gnc_numeric arg);
Modified: gnucash/trunk/src/engine/kvp-scm.c
===================================================================
--- gnucash/trunk/src/engine/kvp-scm.c 2012-12-15 17:59:35 UTC (rev 22655)
+++ gnucash/trunk/src/engine/kvp-scm.c 2012-12-15 19:15:14 UTC (rev 22656)
@@ -23,7 +23,7 @@
/* in guile 1.8 (exact? ) only works on numbers */
if (scm_is_exact (val) && gnc_gh_gint64_p(val))
{
- return kvp_value_new_gint64(gnc_scm_to_gint64(val));
+ return kvp_value_new_gint64(scm_to_int64(val));
}
else
{
@@ -75,7 +75,7 @@
switch (kvp_value_get_type(val))
{
case KVP_TYPE_GINT64:
- return gnc_gint64_to_scm(kvp_value_get_gint64(val));
+ return scm_from_int64(kvp_value_get_gint64(val));
break;
case KVP_TYPE_DOUBLE:
return scm_from_double (kvp_value_get_double(val));
More information about the gnucash-changes
mailing list