IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

rob used guile to convert doubles to strings;

Browse Source 
remove this dependency, use standard libc calls instead.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3391 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 2001-01-05 22:50:31 +00:00
parent b475e4b07d
commit e965ca1be7
2 changed files with 104 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/engine/io-gncxml-r.c
View File

@ -9,15 +9,17 @@
# include <time.h>
#endif
#include <glib.h>
#include <stdio.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <tree.h>
#include <parser.h>
#include <xmlmemory.h>
#include <parserInternals.h>
#include <glib.h>
#include <gnome-xml/tree.h>
#include <gnome-xml/parser.h>
#include <gnome-xml/xmlmemory.h>
#include <gnome-xml/parserInternals.h>
#include "Account.h"
#include "date.h"
@ -36,7 +38,10 @@
/* Hack to get going... */
#include "FileIOP.h"
#ifdef USE_GUILE_FOR_DOUBLE_CONVERSION
#include <guile/gh.h>
#endif /* USE_GUILE_FOR_DOUBLE_CONVERSION */
/* TODO
@ -880,35 +885,60 @@ concatenate_child_result_chars(GSList *data_from_children) {
/*********/
/* double
RLB writes:
We have to use guile because AFAICT, libc, and C in general isn't
smart enough to actually parse it's own output, especially not
portably (big surprise).
Linas writes:
I don't understand the claim; I'm just going to use
atof or strtod to accomplish this.
*/
static gboolean
string_to_double(const char *str, double *result) {
/* FIXME: NOT THREAD SAFE - USES STATIC DATA */
static SCM string_to_number;
static gboolean ready = FALSE;
SCM conversion_result;
string_to_double(const char *str, double *result)
{
g_return_val_if_fail(str, FALSE);
g_return_val_if_fail(result, FALSE);
if(!ready) {
string_to_number = gh_eval_str("string->number");
scm_protect_object(string_to_number);
ready = TRUE;
}
#ifdef USE_GUILE_FOR_DOUBLE_CONVERSION
{
/* FIXME: NOT THREAD SAFE - USES STATIC DATA */
static SCM string_to_number;
static gboolean ready = FALSE;
conversion_result = gh_call1(string_to_number, gh_str02scm(str));
if(!conversion_result == SCM_BOOL_F) {
return(FALSE);
}
SCM conversion_result;
if(!ready) {
string_to_number = gh_eval_str("string->number");
scm_protect_object(string_to_number);
ready = TRUE;
}
conversion_result = gh_call1(string_to_number, gh_str02scm(str));
if(!conversion_result == SCM_BOOL_F) {
return(FALSE);
}
*result = gh_scm2double(conversion_result);
}
#else /* don't USE_GUILE_FOR_DOUBLE_CONVERSION */
{
char *endptr = 0x0;
/* We're just going to use plain-old libc for the double conversion.
* There was some question as to whether libc is accurate enough
* in its printf function for doubles, but I don't understand
* how it couldn't be ...
*/
*result = strtod (str, &endptr);
if (endptr == str) return (FALSE);
}
#endif /* USE_GUILE_FOR_DOUBLE_CONVERSION */
*result = gh_scm2double(conversion_result);
return(TRUE);
}

59
src/engine/io-gncxml-w.c
View File

@ -6,12 +6,13 @@
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <tree.h>
#include <parser.h>
#include <xmlmemory.h>
#include <parserInternals.h>
#include <gnome-xml/tree.h>
#include <gnome-xml/parser.h>
#include <gnome-xml/xmlmemory.h>
#include <gnome-xml/parserInternals.h>
#include "Account.h"
#include "date.h"
@ -30,7 +31,11 @@
/* Hack to get going... */
#include "FileIOP.h"
#ifdef USE_GUILE_FOR_DOUBLE_CONVERSION
#include <guile/gh.h>
#endif /* USE_GUILE_FOR_DOUBLE_CONVERSION */
/* Pulled from the libxml-1.8.8 header */
@ -84,14 +89,32 @@ xml_add_gint64(xmlNodePtr p, const char *tag, const gint64 value) {
return(TRUE);
}
static gboolean
xml_add_double(xmlNodePtr p, const char *tag, const double value) {
/* FIXME: NOT THREAD SAFE - USES STATIC DATA */
/*********/
/* double
RLB writes:
We have to use guile because AFAICT, libc, and C in general isn't
smart enough to actually parse it's own output, especially not
portably (big surprise).
Linas writes:
I don't understand the claim; I'm just going to use
atof or strtod to accomplish this.
*/
static gboolean
xml_add_double(xmlNodePtr p, const char *tag, const double value)
{
g_return_val_if_fail(p, FALSE);
g_return_val_if_fail(tag, FALSE);
#ifdef USE_GUILE_FOR_DOUBLE_CONVERSION
{
/* FIXME: NOT THREAD SAFE - USES STATIC DATA */
static SCM number_to_string;
static gboolean ready = FALSE;
const char *numstr;
@ -114,7 +137,27 @@ xml_add_double(xmlNodePtr p, const char *tag, const double value) {
}
}
return(TRUE);
#else /* don't USE_GUILE_FOR_DOUBLE_CONVERSION */
{
int len;
char prtbuf[80];
xmlNodePtr child;
/* we're just going to use plain-old libc for the double conversion.
* There was some question as to whether libc is accurate enough
* in its printf function for doubles, but I don't understand
* how it couldn't be ...
*/
len = snprintf (prtbuf, 80, "%24.18g", value);
if (80 <=len) return (FALSE);
child = xmlNewTextChild(p, NULL, tag, prtbuf);
g_return_val_if_fail(child, FALSE);
}
#endif /* USE_GUILE_FOR_DOUBLE_CONVERSION */
return(TRUE);
}
static gboolean