From 20f13f9cd2338f2817222ea305e41a0f8bf9606f Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Wed, 2 Jan 2002 06:31:49 +0000 Subject: [PATCH] uhh, never mind, revert the last patch git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6475 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/engine/SchedXaction.c | 2 +- src/engine/gnc-book.c | 2 +- src/engine/gnc-commodity.c | 14 ++------------ src/engine/gnc-commodity.h | 6 ++---- src/engine/gw-engine-spec.scm | 3 +-- src/engine/iso-currencies-to-c | 2 +- src/engine/test-core/test-engine-stuff.c | 2 +- src/engine/test/test-commodities.c | 6 +++--- 8 files changed, 12 insertions(+), 25 deletions(-) diff --git a/src/engine/SchedXaction.c b/src/engine/SchedXaction.c index ce270b7bcd..6f7f66a626 100644 --- a/src/engine/SchedXaction.c +++ b/src/engine/SchedXaction.c @@ -80,7 +80,7 @@ xaccSchedXactionInit( SchedXaction *sx, GNCBook *book) xaccAccountSetCommodity (sx->template_acct, gnc_commodity_new( "template", "template", - "template", "template", 1, book ) ); + "template", "template", 1 ) ); g_free( name ); xaccAccountSetType( sx->template_acct, BANK ); ag = gnc_book_get_template_group( book ); diff --git a/src/engine/gnc-book.c b/src/engine/gnc-book.c index 25c6868791..e8ee8b2d2b 100644 --- a/src/engine/gnc-book.c +++ b/src/engine/gnc-book.c @@ -86,7 +86,7 @@ gnc_book_init (GNCBook *book) if(book->commodity_table) { - if(!gnc_commodity_table_add_default_data(book->commodity_table, book)) + if(!gnc_commodity_table_add_default_data(book->commodity_table)) PWARN("unable to initialize book's commodity_table"); } diff --git a/src/engine/gnc-commodity.c b/src/engine/gnc-commodity.c index 45054fa40c..b802e38ec5 100644 --- a/src/engine/gnc-commodity.c +++ b/src/engine/gnc-commodity.c @@ -43,7 +43,6 @@ static short module = MOD_ENGINE; * in a 'unitname' unit. */ struct gnc_commodity_s { - GNCBook * book; char * fullname; char * namespace; char * mnemonic; @@ -90,11 +89,10 @@ gnc_commodity * gnc_commodity_new(const char * fullname, const char * namespace, const char * mnemonic, const char * exchange_code, - int fraction, GNCBook *book) + int fraction) { gnc_commodity * retval = g_new0(gnc_commodity, 1); - retval->book = book; retval->fullname = g_strdup(fullname); retval->namespace = g_strdup(namespace); retval->mnemonic = g_strdup(mnemonic); @@ -234,13 +232,6 @@ gnc_commodity_get_mark(const gnc_commodity * cm) return cm->mark; } -GNCBook * -gnc_commodity_get_book(const gnc_commodity * cm) -{ - if(!cm) return NULL; - return cm->book; -} - /******************************************************************** * gnc_commodity_set_mnemonic ********************************************************************/ @@ -876,8 +867,7 @@ gnc_commodity_table_equal(gnc_commodity_table *t_1, ********************************************************************/ gboolean -gnc_commodity_table_add_default_data(gnc_commodity_table *table, - GNCBook *book) +gnc_commodity_table_add_default_data(gnc_commodity_table *table) { #include "./iso-4217-currencies.c" diff --git a/src/engine/gnc-commodity.h b/src/engine/gnc-commodity.h index 2109846679..aaece14646 100644 --- a/src/engine/gnc-commodity.h +++ b/src/engine/gnc-commodity.h @@ -41,8 +41,7 @@ gnc_commodity * gnc_commodity_new(const char * fullname, const char * namespace, const char * mnemonic, const char * exchange_code, - int fraction, - GNCBook *); + int fraction); void gnc_commodity_destroy(gnc_commodity * cm); @@ -54,7 +53,6 @@ const char * gnc_commodity_get_exchange_code(const gnc_commodity * cm); const char * gnc_commodity_get_unique_name(const gnc_commodity * cm); int gnc_commodity_get_fraction(const gnc_commodity * cm); gint16 gnc_commodity_get_mark(const gnc_commodity * cm); -GNCBook * gnc_commodity_get_book(const gnc_commodity * cm); void gnc_commodity_set_mnemonic(gnc_commodity * cm, const char * mnemonic); void gnc_commodity_set_namespace(gnc_commodity * cm, const char * namespace); @@ -117,6 +115,6 @@ gboolean gnc_commodity_table_foreach_commodity(gnc_commodity_table * table, gpointer user_data), gpointer user_data); -gboolean gnc_commodity_table_add_default_data(gnc_commodity_table *table, GNCBook*); +gboolean gnc_commodity_table_add_default_data(gnc_commodity_table *table); #endif diff --git a/src/engine/gw-engine-spec.scm b/src/engine/gw-engine-spec.scm index 6a461587c9..f2346d8ab9 100644 --- a/src/engine/gw-engine-spec.scm +++ b/src/engine/gw-engine-spec.scm @@ -2143,8 +2143,7 @@ of having a parent transaction with which one is working...") (( gw:const) namespace) (( gw:const) mnemonic) (( gw:const) exchange-code) - ( smallest-fraction) - ( book)) + ( smallest-fraction) ) "Create a new gnc_commodity object.") (gw:wrap-function diff --git a/src/engine/iso-currencies-to-c b/src/engine/iso-currencies-to-c index e99abe7551..a7adc99ea4 100755 --- a/src/engine/iso-currencies-to-c +++ b/src/engine/iso-currencies-to-c @@ -37,7 +37,7 @@ exec guile -s $0 "$@" ~S, ~S, ~S, - ~S, book);\n + ~S);\n if(!c) { PWARN(\"failed to create commodity for currency %s\", fullname); } else { diff --git a/src/engine/test-core/test-engine-stuff.c b/src/engine/test-core/test-engine-stuff.c index 35e4afedbd..35678907b8 100644 --- a/src/engine/test-core/test-engine-stuff.c +++ b/src/engine/test-core/test-engine-stuff.c @@ -1128,7 +1128,7 @@ get_random_commodity (GNCBook *book) xcode = get_random_string(); ran_int = get_random_int_in_range(1, 100000); - ret = gnc_commodity_new (name, space, mn, xcode, ran_int, book); + ret = gnc_commodity_new (name, space, mn, xcode, ran_int); g_free(mn); g_free(name); diff --git a/src/engine/test/test-commodities.c b/src/engine/test/test-commodities.c index f7f5cb0e2f..65c2926ab4 100644 --- a/src/engine/test/test-commodities.c +++ b/src/engine/test/test-commodities.c @@ -16,7 +16,7 @@ test_commodity(void) gnc_commodity *com; { - com = gnc_commodity_new(NULL, NULL, NULL, NULL, 0, NULL); + com = gnc_commodity_new(NULL, NULL, NULL, NULL, 0); gnc_commodity_destroy(com); @@ -38,7 +38,7 @@ test_commodity(void) fraction = get_random_int_in_range(0, 10000); com = gnc_commodity_new(fullname, namespace, mnemonic, - exchange_code, fraction, NULL); + exchange_code, fraction); do_test( com != NULL, "commodity with data new and destroy"); @@ -94,7 +94,7 @@ test_commodity(void) "reset fraction code equal test"); com2 = gnc_commodity_new(fullname, namespace, mnemonic, - exchange_code, fraction, NULL); + exchange_code, fraction); do_test( gnc_commodity_equiv(com, com2), "commodity equiv");