gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Mon May 23 16:25:36 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/8b04fab2 (commit)
via https://github.com/Gnucash/gnucash/commit/915a2930 (commit)
via https://github.com/Gnucash/gnucash/commit/34e34334 (commit)
via https://github.com/Gnucash/gnucash/commit/a2863ab3 (commit)
via https://github.com/Gnucash/gnucash/commit/dc02bd5e (commit)
via https://github.com/Gnucash/gnucash/commit/a7a0dbcc (commit)
via https://github.com/Gnucash/gnucash/commit/a2ded744 (commit)
via https://github.com/Gnucash/gnucash/commit/efbe26bc (commit)
via https://github.com/Gnucash/gnucash/commit/5ef9b812 (commit)
via https://github.com/Gnucash/gnucash/commit/fa22986c (commit)
from https://github.com/Gnucash/gnucash/commit/94ca7802 (commit)
commit 8b04fab25c4ae30aa36527ef31afb97ab5004fd0
Author: John Ralls <jralls at ceridwen.us>
Date: Mon May 23 13:25:08 2016 -0700
Fix misspellt BOOST_LDFLAGS.
diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am
index 4650b5a..ae2f057 100644
--- a/src/backend/dbi/test/Makefile.am
+++ b/src/backend/dbi/test/Makefile.am
@@ -68,7 +68,7 @@ test_backend_dbi_CPPFLAGS = \
${AM_CPPFLAGS}
test_backend_dbi_LDADD = \
- ${BOOST_LDADD} -lboost_regex \
+ ${BOOST_LDFLAGS} -lboost_regex \
${LIBDBI_LIBS} \
${LDADD}
commit 915a2930f3a722ff64ec852c4916eb6e1c697f0b
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Feb 16 17:11:55 2016 -0800
Remove close hook list; not used.
diff --git a/src/backend/dbi/gnc-backend-dbi.cpp b/src/backend/dbi/gnc-backend-dbi.cpp
index e0c1914..beec3ca 100644
--- a/src/backend/dbi/gnc-backend-dbi.cpp
+++ b/src/backend/dbi/gnc-backend-dbi.cpp
@@ -83,6 +83,7 @@ extern "C"
#include <boost/regex.hpp>
#include <string>
+#include <gnc-backend-prov.hpp>
#include "gnc-backend-dbi.h"
#include "gnc-backend-dbi-priv.h"
@@ -93,6 +94,46 @@ extern "C"
#endif
#endif
+struct QofSQLITEBackendProvider : public QofBackendProvider
+{
+ QofSQLITEBackendProvider (const char* name, const char* type) :
+ QofBackendProvider {name, type} {}
+ QofSQLITEBackendProvider(QofSQLITEBackendProvider&) = delete;
+ QofSQLITEBackendProvider operator=(QofSQLITEBackendProvider&) = delete;
+ QofSQLITEBackendProvider(QofSQLITEBackendProvider&&) = delete;
+ QofSQLITEBackendProvider operator=(QofSQLITEBackendProvider&&) = delete;
+ ~QofSQLITEBackendProvider () = default;
+ QofBackend* create_backend(void);
+ bool type_check(const char* type);
+};
+
+struct QofMYSQLBackendProvider : public QofBackendProvider
+{
+ QofMYSQLBackendProvider (const char* name, const char* type) :
+ QofBackendProvider {name, type} {}
+ QofMYSQLBackendProvider(QofMYSQLBackendProvider&) = delete;
+ QofMYSQLBackendProvider operator=(QofMYSQLBackendProvider&) = delete;
+ QofMYSQLBackendProvider(QofMYSQLBackendProvider&&) = delete;
+ QofMYSQLBackendProvider operator=(QofMYSQLBackendProvider&&) = delete;
+ ~QofMYSQLBackendProvider () = default;
+ QofBackend* create_backend(void);
+ bool type_check(const char* type) { return true; }
+};
+
+struct QofPGSQLBackendProvider : public QofBackendProvider
+{
+ QofPGSQLBackendProvider (const char* name, const char* type) :
+ QofBackendProvider {name, type} {}
+ QofPGSQLBackendProvider(QofPGSQLBackendProvider&) = delete;
+ QofPGSQLBackendProvider operator=(QofPGSQLBackendProvider&) = delete;
+ QofPGSQLBackendProvider(QofPGSQLBackendProvider&&) = delete;
+ QofPGSQLBackendProvider operator=(QofPGSQLBackendProvider&&) = delete;
+ ~QofPGSQLBackendProvider () = default;
+ QofBackend* create_backend(void);
+ bool type_check(const char* type) { return true; }
+
+};
+
#if LIBDBI_VERSION >= 900
#define HAVE_LIBDBI_R 1
static dbi_inst dbi_instance = NULL;
@@ -297,7 +338,7 @@ gnc_dbi_sqlite3_session_begin (QofBackend* qbe, QofSession* session,
/* Remove uri type if present */
filepath = gnc_uri_get_path (book_id);
GFileTest ftest = static_cast<decltype (ftest)> (
- G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS) ;
+ G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS) ;
file_exists = g_file_test (filepath, ftest);
if (!create && !file_exists)
{
@@ -915,7 +956,7 @@ gnc_dbi_mysql_session_begin (QofBackend* qbe, QofSession* session,
/* Split the book-id
* Format is protocol://username:password@hostname:port/dbname
- where username, password and port are optional) */
+ where username, password and port are optional) */
gnc_uri_get_components (book_id, &protocol, &host, &portnum,
&username, &password, &dbname);
@@ -1270,7 +1311,7 @@ gnc_dbi_postgres_session_begin (QofBackend* qbe, QofSession* session,
/* Split the book-id
* Format is protocol://username:password@hostname:port/dbname
- where username, password and port are optional) */
+ where username, password and port are optional) */
gnc_uri_get_components (book_id, &protocol, &host, &portnum,
&username, &password, &dbname);
if (portnum == 0)
@@ -1595,7 +1636,7 @@ gnc_dbi_load (QofBackend* qbe, QofBook* book, QofBackendLoadType loadType)
qof_backend_set_error (qbe, ERR_SQL_DB_TOO_OLD);
}
else if (GNUCASH_RESAVE_VERSION < gnc_sql_get_table_version (&be->sql_be,
- "Gnucash-Resave"))
+ "Gnucash-Resave"))
{
/* Worse, the database was created with a newer version. We
* can't safely write to this database, so the user will have
@@ -1912,38 +1953,31 @@ new_backend (void (*session_begin) (QofBackend*, QofSession*, const gchar*,
return be;
}
-static QofBackend*
-gnc_dbi_backend_sqlite3_new (void)
+QofBackend*
+QofSQLITEBackendProvider::create_backend()
{
return new_backend (gnc_dbi_sqlite3_session_begin);
}
-static QofBackend*
-gnc_dbi_backend_mysql_new (void)
+QofBackend*
+QofMYSQLBackendProvider::create_backend()
{
return new_backend (gnc_dbi_mysql_session_begin);
}
-static QofBackend*
-gnc_dbi_backend_postgres_new (void)
+QofBackend*
+QofPGSQLBackendProvider::create_backend()
{
return new_backend (gnc_dbi_postgres_session_begin);
}
-static void
-gnc_dbi_provider_free (QofBackendProvider* prov)
-{
- g_return_if_fail (prov != NULL);
-
- g_free (prov);
-}
/*
* Checks to see whether the file is an sqlite file or not
*
*/
-static gboolean
-gnc_dbi_check_sqlite3_file (const gchar* uri)
+bool
+QofSQLITEBackendProvider::type_check(const char *uri)
{
FILE* f;
gchar buf[50];
@@ -1986,7 +2020,6 @@ gnc_dbi_check_sqlite3_file (const gchar* uri)
void
gnc_module_init_backend_dbi (void)
{
- QofBackendProvider* prov;
const gchar* driver_dir;
int num_drivers;
gboolean have_sqlite3_driver = FALSE;
@@ -2062,51 +2095,25 @@ gnc_module_init_backend_dbi (void)
if (have_sqlite3_driver)
{
- prov = g_new0 (QofBackendProvider, 1);
- g_assert (prov != NULL);
-
- prov->provider_name = "GnuCash Libdbi (SQLITE3) Backend";
- prov->access_method = FILE_URI_TYPE;
- prov->backend_new = gnc_dbi_backend_sqlite3_new;
- prov->provider_free = gnc_dbi_provider_free;
- prov->check_data_type = gnc_dbi_check_sqlite3_file;
- qof_backend_register_provider (prov);
-
- prov = g_new0 (QofBackendProvider, 1);
- g_assert (prov != NULL);
-
- prov->provider_name = "GnuCash Libdbi (SQLITE3) Backend";
- prov->access_method = SQLITE3_URI_TYPE;
- prov->backend_new = gnc_dbi_backend_sqlite3_new;
- prov->provider_free = gnc_dbi_provider_free;
- prov->check_data_type = gnc_dbi_check_sqlite3_file;
- qof_backend_register_provider (prov);
+ const char* name = "GnuCash Libdbi (SQLITE3) Backend";
+ auto prov = QofBackendProvider_ptr(new QofSQLITEBackendProvider{name, FILE_URI_TYPE});
+ qof_backend_register_provider(std::move(prov));
+ prov = QofBackendProvider_ptr(new QofSQLITEBackendProvider{name, SQLITE3_URI_TYPE});
+ qof_backend_register_provider(std::move(prov));
}
if (have_mysql_driver)
{
- prov = g_new0 (QofBackendProvider, 1);
- g_assert (prov != NULL);
-
- prov->provider_name = "GnuCash Libdbi (MYSQL) Backend";
- prov->access_method = "mysql";
- prov->backend_new = gnc_dbi_backend_mysql_new;
- prov->provider_free = gnc_dbi_provider_free;
- prov->check_data_type = NULL;
- qof_backend_register_provider (prov);
+ const char *name = "GnuCash Libdbi (MYSQL) Backend";
+ auto prov = QofBackendProvider_ptr(new QofMYSQLBackendProvider{name, "mysql"});
+ qof_backend_register_provider(std::move(prov));
}
if (have_pgsql_driver)
{
- prov = g_new0 (QofBackendProvider, 1);
- g_assert (prov != NULL);
-
- prov->provider_name = "GnuCash Libdbi (POSTGRESQL) Backend";
- prov->access_method = "postgres";
- prov->backend_new = gnc_dbi_backend_postgres_new;
- prov->provider_free = gnc_dbi_provider_free;
- prov->check_data_type = NULL;
- qof_backend_register_provider (prov);
+ const char* name = "GnuCash Libdbi (POSTGRESQL) Backend";
+ auto prov = QofBackendProvider_ptr(new QofPGSQLBackendProvider{name, "postgres"});
+ qof_backend_register_provider(std::move(prov));
}
/* If needed, set log level to DEBUG so that SQl statements will be put into
diff --git a/src/backend/sql/test/utest-gnc-backend-sql.cpp b/src/backend/sql/test/utest-gnc-backend-sql.cpp
index 566d3d6..9e474b5 100644
--- a/src/backend/sql/test/utest-gnc-backend-sql.cpp
+++ b/src/backend/sql/test/utest-gnc-backend-sql.cpp
@@ -593,7 +593,7 @@ test_gnc_sql_convert_timespec_to_string ()
GncSqlBackend be = {{
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
- nullptr, nullptr, ERR_BACKEND_NO_ERR, nullptr, 0, nullptr, nullptr
+ nullptr, ERR_BACKEND_NO_ERR, nullptr, 0, nullptr, nullptr
},
nullptr, nullptr, FALSE, FALSE, FALSE, 0, 0, nullptr,
"%4d-%02d-%02d %02d:%02d:%02d"
diff --git a/src/backend/xml/gnc-backend-xml.cpp b/src/backend/xml/gnc-backend-xml.cpp
index 259e1e3..91bc094 100644
--- a/src/backend/xml/gnc-backend-xml.cpp
+++ b/src/backend/xml/gnc-backend-xml.cpp
@@ -78,7 +78,6 @@ extern "C"
#include "gnc-uri-utils.h"
#include "io-gncxml-v2.h"
-#include "gnc-backend-xml.h"
#include "gnc-prefs.h"
#ifndef HAVE_STRPTIME
@@ -86,6 +85,9 @@ extern "C"
#endif
}
+#include <gnc-backend-prov.hpp>
+#include "gnc-backend-xml.h"
+#include <qofbackend-p.h>
#include "gnc-xml-helper.h"
#include "io-gncxml.h"
@@ -105,6 +107,20 @@ static QofLogModule log_module = GNC_MOD_BACKEND;
static gboolean save_may_clobber_data (QofBackend* bend);
+struct QofXmlBackendProvider : public QofBackendProvider
+{
+ QofXmlBackendProvider (const char* name, const char* type) :
+ QofBackendProvider {name, type} {}
+ QofXmlBackendProvider(QofXmlBackendProvider&) = delete;
+ QofXmlBackendProvider operator=(QofXmlBackendProvider&) = delete;
+ QofXmlBackendProvider(QofXmlBackendProvider&&) = delete;
+ QofXmlBackendProvider operator=(QofXmlBackendProvider&&) = delete;
+ ~QofXmlBackendProvider () = default;
+ QofBackend* create_backend(void);
+ bool type_check(const char* type);
+
+};
+
/* ================================================================= */
static gboolean
@@ -598,8 +614,8 @@ gnc_xml_be_determine_file_type (const char* path)
return GNC_BOOK_NOT_OURS;
}
-static gboolean
-gnc_determine_file_type (const char* uri)
+bool
+QofXmlBackendProvider::type_check (const char *uri)
{
struct stat sbuf;
int rc;
@@ -1206,8 +1222,8 @@ gnc_xml_be_write_accounts_to_file (QofBackend* be, QofBook* book)
/* ================================================================= */
-static QofBackend*
-gnc_backend_new (void)
+QofBackend*
+QofXmlBackendProvider::create_backend(void)
{
FileBackend* gnc_be;
QofBackend* be;
@@ -1268,14 +1284,6 @@ business_core_xml_init (void)
gnc_vendor_xml_initialize ();
}
-static void
-gnc_provider_free (QofBackendProvider* prov)
-{
- prov->provider_name = NULL;
- prov->access_method = NULL;
- g_free (prov);
-}
-
#ifndef GNC_NO_LOADABLE_MODULES
G_MODULE_EXPORT void
qof_backend_module_init (void)
@@ -1287,22 +1295,12 @@ qof_backend_module_init (void)
void
gnc_module_init_backend_xml (void)
{
- QofBackendProvider* prov;
- prov = g_new0 (QofBackendProvider, 1);
- prov->provider_name = "GnuCash File Backend Version 2";
- prov->access_method = "file";
- prov->backend_new = gnc_backend_new;
- prov->provider_free = gnc_provider_free;
- prov->check_data_type = gnc_determine_file_type;
- qof_backend_register_provider (prov);
-
- prov = g_new0 (QofBackendProvider, 1);
- prov->provider_name = "GnuCash File Backend Version 2";
- prov->access_method = "xml";
- prov->backend_new = gnc_backend_new;
- prov->provider_free = gnc_provider_free;
- prov->check_data_type = gnc_determine_file_type;
- qof_backend_register_provider (prov);
+ const char* name {"GnuCash File Backend Version 2"};
+ auto prov = QofBackendProvider_ptr(new QofXmlBackendProvider{name, "xml"});
+
+ qof_backend_register_provider(std::move(prov));
+ prov = QofBackendProvider_ptr(new QofXmlBackendProvider{name, "file"});
+ qof_backend_register_provider(std::move(prov));
/* And the business objects */
business_core_xml_init ();
diff --git a/src/backend/xml/gnc-backend-xml.h b/src/backend/xml/gnc-backend-xml.h
index 7271e83..2f021cf 100644
--- a/src/backend/xml/gnc-backend-xml.h
+++ b/src/backend/xml/gnc-backend-xml.h
@@ -34,10 +34,9 @@
extern "C"
{
#endif
-#include "qof.h"
+#include <qof.h>
#include <gmodule.h>
-#include "qofbackend-p.h"
-
+#include <qofbackend-p.h>
typedef enum
{
diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c
index 35923a2..deb43f9 100644
--- a/src/engine/Transaction.c
+++ b/src/engine/Transaction.c
@@ -64,8 +64,8 @@ struct timeval
#include "gnc-event.h"
#include <gnc-gdate-utils.h>
#include "SchedXaction.h"
-#include "qofbackend-p.h"
#include "gncBusiness.h"
+#include <qofinstance-p.h>
/* Notes about xaccTransBeginEdit(), xaccTransCommitEdit(), and
* xaccTransRollback():
@@ -1139,10 +1139,10 @@ xaccTransIsBalanced (const Transaction *trans)
if (xaccTransUseTradingAccounts(trans))
{
- /* Transaction is imbalanced if the value is imbalanced in either
+ /* Transaction is imbalanced if the value is imbalanced in either
trading or non-trading splits. One can't be used to balance
the other. */
- FOR_EACH_SPLIT(trans,
+ FOR_EACH_SPLIT(trans,
{
Account *acc = xaccSplitGetAccount(s);
if (!acc || xaccAccountGetType(acc) != ACCT_TYPE_TRADING)
@@ -1155,12 +1155,12 @@ xaccTransIsBalanced (const Transaction *trans)
imbal_trading = gnc_numeric_add(imbal_trading, xaccSplitGetValue(s),
GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT);
}
- }
+ }
);
}
else
imbal = xaccTransGetImbalanceValue(trans);
-
+
if (! gnc_numeric_zero_p(imbal) || ! gnc_numeric_zero_p(imbal_trading))
return FALSE;
@@ -1815,7 +1815,7 @@ xaccTransRollbackEdit (Transaction *trans)
be = qof_book_get_backend(qof_instance_get_book(trans));
/** \todo Fix transrollbackedit in QOF so that rollback
is exposed via the API. */
- if (be && be->rollback)
+ if (qof_backend_can_rollback (be))
{
QofBackendError errcode;
@@ -1826,7 +1826,7 @@ xaccTransRollbackEdit (Transaction *trans)
}
while (ERR_BACKEND_NO_ERR != errcode);
- (be->rollback) (be, &(trans->inst));
+ qof_backend_rollback_instance (be, &(trans->inst));
errcode = qof_backend_get_error (be);
if (ERR_BACKEND_MOD_DESTROY == errcode)
diff --git a/src/engine/gnc-pricedb.c b/src/engine/gnc-pricedb.c
index cab5712..45adba3 100644
--- a/src/engine/gnc-pricedb.c
+++ b/src/engine/gnc-pricedb.c
@@ -27,7 +27,7 @@
#include <glib.h>
#include <string.h>
#include "gnc-pricedb-p.h"
-#include "qofbackend-p.h"
+#include <qofinstance-p.h>
/* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_PRICE;
@@ -1457,7 +1457,7 @@ pricedb_price_list_merge (PriceList *a, PriceList *b)
PriceList *merged_list = NULL;
GList *next_a = a;
GList *next_b = b;
-
+
while (next_a || next_b)
{
if (next_a == NULL)
@@ -1577,15 +1577,15 @@ typedef struct
} UsesCommodity;
/* price_list_scan_any_currency is the helper function used with
- * pricedb_pricelist_traversal by the "any_currency" price lookup functions. It
- * builds a list of prices that are either to or from the commodity "com".
- * The resulting list will include the last price newer than "t" and the first
- * price older than "t". All other prices will be ignored. Since in the most
- * common cases we will be looking for recent prices which are at the front of
- * the various price lists, this is considerably faster than concatenating all
- * the relevant price lists and sorting the result.
+ * pricedb_pricelist_traversal by the "any_currency" price lookup functions. It
+ * builds a list of prices that are either to or from the commodity "com".
+ * The resulting list will include the last price newer than "t" and the first
+ * price older than "t". All other prices will be ignored. Since in the most
+ * common cases we will be looking for recent prices which are at the front of
+ * the various price lists, this is considerably faster than concatenating all
+ * the relevant price lists and sorting the result.
*/
-
+
static gboolean
price_list_scan_any_currency(GList *price_list, gpointer data)
{
@@ -1593,18 +1593,18 @@ price_list_scan_any_currency(GList *price_list, gpointer data)
GList *node = price_list;
gnc_commodity *com;
gnc_commodity *cur;
-
+
if (!price_list)
return TRUE;
com = gnc_price_get_commodity(node->data);
cur = gnc_price_get_currency(node->data);
-
+
/* if this price list isn't for the commodity we are interested in,
ignore it. */
if (com != helper->com && cur != helper->com)
return TRUE;
-
+
/* The price list is sorted in decreasing order of time. Find the first
price on it that is older than the requested time and add it and the
previous price to the result list. */
@@ -1900,7 +1900,7 @@ price_count_helper(gpointer key, gpointer value, gpointer data)
{
int *result = data;
GList *price_list = value;
-
+
*result += g_list_length(price_list);
}
@@ -1910,7 +1910,7 @@ gnc_pricedb_num_prices(GNCPriceDB *db,
{
int result = 0;
GHashTable *currency_hash;
-
+
if (!db || !c) return 0;
ENTER ("db=%p commodity=%p", db, c);
@@ -1919,7 +1919,7 @@ gnc_pricedb_num_prices(GNCPriceDB *db,
{
g_hash_table_foreach(currency_hash, price_count_helper, (gpointer)&result);
}
-
+
LEAVE ("count=%d", result);
return result;
}
@@ -1933,10 +1933,10 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
{
GNCPrice *result = NULL;
GHashTable *currency_hash;
-
+
if (!db || !c || n < 0) return NULL;
ENTER ("db=%p commodity=%p index=%d", db, c, n);
-
+
currency_hash = g_hash_table_lookup(db->commodity_hash, c);
if (currency_hash)
{
@@ -1963,7 +1963,7 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
int i, j;
GHashTableIter iter;
gpointer key, value;
-
+
/* Build an array of all the currencies this commodity has prices for */
for (i = 0, g_hash_table_iter_init(&iter, currency_hash);
g_hash_table_iter_next(&iter, &key, &value) && i < num_currencies;
@@ -1971,7 +1971,7 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
{
price_array[i] = value;
}
-
+
/* Iterate n times to get the nth price, each time finding the currency
with the latest price */
for (i = 0; i <= n; i++)
@@ -2010,7 +2010,7 @@ gnc_pricedb_nth_price (GNCPriceDB *db,
LEAVE ("price=%p", result);
return result;
}
-
+
GNCPrice *
gnc_pricedb_lookup_day(GNCPriceDB *db,
const gnc_commodity *c,
diff --git a/src/gnc/Session.hpp b/src/gnc/Session.hpp
index 3b2ae98..6010eb4 100644
--- a/src/gnc/Session.hpp
+++ b/src/gnc/Session.hpp
@@ -99,14 +99,6 @@ public:
{
qof_session_save(gobj(), percentage_func);
}
-
-
- void call_close_hooks ()
- {
- qof_session_call_close_hooks (gobj());
- }
-
-
};
std::pair<QString, QString> errorToStringPair(QofBackendError err);
diff --git a/src/gnc/mainwindow-file.cpp b/src/gnc/mainwindow-file.cpp
index a05268a..432f0c6 100644
--- a/src/gnc/mainwindow-file.cpp
+++ b/src/gnc/mainwindow-file.cpp
@@ -375,7 +375,6 @@ void MainWindow::loadFile(const QString &fileName)
/* -------------- BEGIN CORE SESSION CODE ------------- */
/* -- this code is almost identical in FileOpen and FileSaveAs -- */
- m_session.call_close_hooks();
gnc_hook_run(HOOK_BOOK_CLOSED, m_session.gobj());
qof_session_destroy(m_session.gobj());
m_session.reset();
diff --git a/src/gnc/mainwindow.cpp b/src/gnc/mainwindow.cpp
index edffca6..d68749c 100644
--- a/src/gnc/mainwindow.cpp
+++ b/src/gnc/mainwindow.cpp
@@ -577,7 +577,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
* transactions during shutdown would cause massive redraws */
qof_event_suspend ();
- qof_session_call_close_hooks(m_session.gobj());
gnc_hook_run(HOOK_BOOK_CLOSED, m_session.gobj());
qof_session_destroy(m_session.gobj());
@@ -602,7 +601,6 @@ void MainWindow::newFile()
* disable events so we don't gobj spammed by redraws. */
qof_event_suspend ();
- m_session.call_close_hooks();
gnc_hook_run(HOOK_BOOK_CLOSED, m_session.gobj());
qof_session_destroy(m_session.gobj());
diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c
index 95521fa..ddb301e 100644
--- a/src/gnome-utils/gnc-file.c
+++ b/src/gnome-utils/gnc-file.c
@@ -527,7 +527,6 @@ gnc_file_new (void)
* disable events so we don't get spammed by redraws. */
qof_event_suspend ();
- qof_session_call_close_hooks(session);
gnc_hook_run(HOOK_BOOK_CLOSED, session);
gnc_close_gui_component_by_session (session);
@@ -706,7 +705,6 @@ RESTART:
if (gnc_current_session_exist())
{
current_session = gnc_get_current_session();
- qof_session_call_close_hooks(current_session);
gnc_hook_run(HOOK_BOOK_CLOSED, current_session);
gnc_close_gui_component_by_session (current_session);
gnc_state_save (current_session);
@@ -1605,7 +1603,6 @@ gnc_file_quit (void)
* transactions during shutdown would cause massive redraws */
qof_event_suspend ();
- qof_session_call_close_hooks(session);
gnc_hook_run(HOOK_BOOK_CLOSED, session);
gnc_close_gui_component_by_session (session);
gnc_state_save (session);
diff --git a/src/libqof/CMakeLists.txt b/src/libqof/CMakeLists.txt
index 75831b3..e1c9744 100644
--- a/src/libqof/CMakeLists.txt
+++ b/src/libqof/CMakeLists.txt
@@ -35,6 +35,7 @@ SET (gnc_qof_HEADERS
qof/qof-string-cache.h
)
SET (gnc_qof_noinst_HEADERS
+ qof/gnc-backend-prov.hpp
qof/qofbook-p.h
qof/qofclass-p.h
qof/gnc-date-p.h
diff --git a/src/libqof/qof/Makefile.am b/src/libqof/qof/Makefile.am
index 17f62d0..1077642 100644
--- a/src/libqof/qof/Makefile.am
+++ b/src/libqof/qof/Makefile.am
@@ -82,6 +82,7 @@ qofinclude_HEADERS = \
qof-gobject.h
noinst_HEADERS = \
+ gnc-backend-prov.hpp \
qofbook-p.h \
qofclass-p.h \
qofevent-p.h \
diff --git a/src/libqof/qof/gnc-backend-prov.hpp b/src/libqof/qof/gnc-backend-prov.hpp
new file mode 100644
index 0000000..1c55015
--- /dev/null
+++ b/src/libqof/qof/gnc-backend-prov.hpp
@@ -0,0 +1,81 @@
+/********************************************************************\
+ * qofbackend-prov.hpp -- Manage creation of a QofBackend subclass. *
+ * *
+ * Copyright 2016 John Ralls <jralls at ceridwen.us> *
+ * *
+ * This program is free software; you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation; either version 2 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact: *
+ * *
+ * Free Software Foundation Voice: +1-617-542-5942 *
+ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
+ * Boston, MA 02110-1301, USA gnu at gnu.org *
+ * *
+\********************************************************************/
+
+#ifndef __GNC_BACKEND_PROV_HPP__
+#define __GNC_BACKEND_PROV_HPP__
+
+#include <memory>
+
+struct QofBackendProvider
+{
+ QofBackendProvider(const char* name, const char* type) :
+ provider_name {name}, access_method {type} {}
+ QofBackendProvider(QofBackendProvider&) = delete;
+ QofBackendProvider(QofBackendProvider&&) = delete;
+ virtual ~QofBackendProvider() {}
+
+ /** Return a new, fully initialized backend.
+ *
+ * If the backend supports configuration, all configuration options
+ * should be initialised to usable values here.
+ * */
+ virtual QofBackend * create_backend(void) = 0;
+
+ /** \brief Distinguish two providers with same access method.
+
+ More than 1 backend can be registered under the same access_method,
+ so each one is passed the path to the data (e.g. a file) and
+ should return TRUE only:
+ -# if the backend recognises the type as one that it can load and write or
+ -# if the path contains no data but can be used (e.g. a new session).
+
+ \note If the backend can cope with more than one type, the backend
+ should not try to store or cache the sub-type for this data.
+ It is sufficient only to return TRUE if any ONE of the supported
+ types match the incoming data. The backend should not assume that
+ returning TRUE will mean that the data will naturally follow.
+ */
+ /*@ null @*/
+ virtual bool type_check(const char*) = 0;
+ /** Some arbitrary name given for this particular backend provider */
+ const char * provider_name;
+
+ /** The access method that this provider provides, for example,
+ * file:// http:// postgres:// or sqlite://, but without the :// at the end
+ */
+ const char * access_method;
+};
+
+using QofBackendProvider_ptr = std::unique_ptr<QofBackendProvider>;
+
+/** Let the sytem know about a new provider of backends. This function
+ * is typically called by the provider library at library load time.
+ * This function allows the backend library to tell the QOF infrastructure
+ * that it can handle URL's of a certain type. Note that a single
+ * backend library may register more than one provider, if it is
+ * capable of handling more than one URL access method.
+ */
+void qof_backend_register_provider (QofBackendProvider_ptr&&);
+
+#endif // __GNC_BACKEND_PROV_HPP__
diff --git a/src/libqof/qof/qofbackend-p.h b/src/libqof/qof/qofbackend-p.h
index b2ed3bf..d8f0a68 100644
--- a/src/libqof/qof/qofbackend-p.h
+++ b/src/libqof/qof/qofbackend-p.h
@@ -235,45 +235,6 @@
* This should be done in the function called from backend_new.
*/
-struct QofBackendProvider_s
-{
- /** Some arbitrary name given for this particular backend provider */
- /*@ observer @*/
- const char * provider_name;
-
- /** The access method that this provider provides, for example,
- * file:// http:// postgres:// or sqlite://, but without the :// at the end
- */
- /*@ observer @*/
- const char * access_method;
-
- /** Return a new, fully initialized backend.
- *
- * If the backend supports configuration, all configuration options
- * should be initialised to usable values here.
- * */
- QofBackend * (*backend_new) (void);
-
- /** \brief Distinguish two providers with same access method.
-
- More than 1 backend can be registered under the same access_method,
- so each one is passed the path to the data (e.g. a file) and
- should return TRUE only:
- -# if the backend recognises the type as one that it can load and write or
- -# if the path contains no data but can be used (e.g. a new session).
-
- \note If the backend can cope with more than one type, the backend
- should not try to store or cache the sub-type for this data.
- It is sufficient only to return TRUE if any ONE of the supported
- types match the incoming data. The backend should not assume that
- returning TRUE will mean that the data will naturally follow.
- */
- /*@ null @*/
- gboolean (*check_data_type) (const char*);
-
- /** Free this structure, unregister this backend handler. */
- void (*provider_free) (/*@ only @*/ QofBackendProvider *);
-};
typedef enum
{
@@ -310,8 +271,6 @@ struct QofBackend_s
QofBePercentageFunc percentage;
- QofBackendProvider *provider;
-
QofBackendError last_err;
char * error_msg;
@@ -345,15 +304,6 @@ extern "C"
{
#endif
-/** Let the sytem know about a new provider of backends. This function
- * is typically called by the provider library at library load time.
- * This function allows the backend library to tell the QOF infrastructure
- * that it can handle URL's of a certain type. Note that a single
- * backend library may register more than one provider, if it is
- * capable of handling more than one URL access method.
- */
-void qof_backend_register_provider (/*@ only @*/ QofBackendProvider *);
-
/** The qof_backend_set_message() assigns a string to the backend error message.
*/
void qof_backend_set_message(QofBackend *be, const char *format, ...);
diff --git a/src/libqof/qof/qofbackend.cpp b/src/libqof/qof/qofbackend.cpp
index 1a38181..a805808 100644
--- a/src/libqof/qof/qofbackend.cpp
+++ b/src/libqof/qof/qofbackend.cpp
@@ -79,6 +79,20 @@ qof_backend_check_error (QofBackend *be)
return be->last_err != ERR_BACKEND_NO_ERR;
}
+gboolean
+qof_backend_can_rollback (QofBackend* be)
+{
+ if (be == nullptr) return FALSE;
+ return be->rollback != nullptr;
+}
+
+void
+qof_backend_rollback_instance (QofBackend* be, QofInstance* inst)
+{
+ if (be == nullptr || be->rollback == nullptr) return;
+ (be->rollback)(be, inst);
+}
+
void
qof_backend_set_message (QofBackend *be, const char *format, ...)
{
diff --git a/src/libqof/qof/qofbackend.h b/src/libqof/qof/qofbackend.h
index 52c70b2..1fa87c9 100644
--- a/src/libqof/qof/qofbackend.h
+++ b/src/libqof/qof/qofbackend.h
@@ -127,15 +127,6 @@ typedef enum
ERR_RPC_FAILED, /**< Operation failed */
ERR_RPC_NOT_ADDED, /**< object not added */
} QofBackendError;
-
-/**
- * A structure that declares backend services that can be gotten.
- * The Provider specifies a URL access method, and specifies the
- * function to create a backend that can handle that URL access
- * function.
- */
-typedef struct QofBackendProvider_s QofBackendProvider;
-
/** \brief Pseudo-object providing an interface between the
* engine and a persistant data store (e.g. a server, a database,
* or a file).
@@ -144,11 +135,45 @@ typedef struct QofBackendProvider_s QofBackendProvider;
* engine. The backend can, however, report errors to the GUI & other
* front-end users.
*/
-typedef struct QofBackend_s QofBackend;
+ typedef struct QofBackend_s QofBackend;
+
+ /* The following functions are used in C files. */
+/** Get the last backend error. */
+ QofBackendError qof_backend_get_error (QofBackend*);
+/** Set the error on the specified QofBackend. */
+ void qof_backend_set_error (QofBackend*, QofBackendError);
+
+/* Temporary wrapper so that we don't have to expose qofbackend-p.h to Transaction.c */
+ gboolean qof_backend_can_rollback (QofBackend*);
+ void qof_backend_rollback_instance (QofBackend*, QofInstance*);
+
+/** \brief Load a QOF-compatible backend shared library.
+
+ \param directory Can be NULL if filename is a complete path.
+ \param module_name Name of the .la file that describes the
+ shared library. This provides platform independence,
+ courtesy of libtool.
+
+ \return FALSE in case or error, otherwise TRUE.
+*/
+ gboolean
+ qof_load_backend_library(const gchar *directory, const gchar* module_name);
+
+/** \brief Finalize all loaded backend sharable libraries. */
+ void qof_finalize_backend_libraries(void);
+
+/** \brief Retrieve the backend used by this book */
+ QofBackend* qof_book_get_backend (const QofBook *book);
+
+ void qof_book_set_backend (QofBook *book, QofBackend *);
+
/** \brief DOCUMENT ME! */
typedef void (*QofBePercentageFunc) (/*@ null @*/ const char *message, double percent);
+#ifdef __cplusplus
+}
+
/** @name Allow access to the begin routine for this backend. */
//@{
@@ -161,15 +186,6 @@ void qof_backend_run_commit(QofBackend *be, QofInstance *inst);
gboolean qof_backend_commit_exists(const QofBackend *be);
//@}
-/** The qof_backend_set_error() routine pushes an error code onto the error
- * stack. (FIXME: the stack is 1 deep in current implementation).
- */
-void qof_backend_set_error (QofBackend *be, QofBackendError err);
-
-/** The qof_backend_get_error() routine pops an error code off the error stack.
- */
-QofBackendError qof_backend_get_error (QofBackend *be);
-
/** Report if the backend is in an error state.
* Since get_error resets the error state, its use for branching as the backend
* bubbles back up to the session would make the session think that there was
@@ -179,28 +195,6 @@ QofBackendError qof_backend_get_error (QofBackend *be);
*/
gboolean qof_backend_check_error (QofBackend *be);
-/** \brief Load a QOF-compatible backend shared library.
-
-\param directory Can be NULL if filename is a complete path.
-\param module_name Name of the .la file that describes the
- shared library. This provides platform independence,
- courtesy of libtool.
-
-\return FALSE in case or error, otherwise TRUE.
-*/
-gboolean
-qof_load_backend_library(const gchar *directory, const gchar* module_name);
-
-/** \brief Finalize all loaded backend sharable libraries. */
-void qof_finalize_backend_libraries(void);
-
-/** \brief Retrieve the backend used by this book */
-QofBackend* qof_book_get_backend (const QofBook *book);
-
-void qof_book_set_backend (QofBook *book, QofBackend *);
-
-#ifdef __cplusplus
-}
#endif
#endif /* QOF_BACKEND_H */
diff --git a/src/libqof/qof/qofsession.cpp b/src/libqof/qof/qofsession.cpp
index 609c58d..acf2c28 100644
--- a/src/libqof/qof/qofsession.cpp
+++ b/src/libqof/qof/qofsession.cpp
@@ -31,6 +31,9 @@
@author Copyright (c) 2005 Neil Williams <linux at codehelp.co.uk>
*/
+extern "C"
+{
+
#include "config.h"
#include <platform.h>
@@ -52,128 +55,71 @@
#include <glib.h>
#include "qof.h"
-#include "qofbackend-p.h"
#include "qofbook-p.h"
-#include "qofsession-p.h"
#include "qofobject-p.h"
-static GHookList * session_closed_hooks = NULL;
static QofLogModule log_module = QOF_MOD_SESSION;
-static GSList *provider_list = NULL;
-static gboolean qof_providers_initialized = FALSE;
+} //extern 'C'
+
+#include "qofbackend-p.h"
+#include "qofsession-p.h"
+#include "gnc-backend-prov.hpp"
+#include <vector>
+#include <algorithm>
+#include <string>
+#include <sstream>
+
+using ProviderVec = std::vector<QofBackendProvider_ptr>;
+static ProviderVec s_providers;
/*
* These getters are used in tests to reach static vars from outside
* They should be removed when no longer needed
*/
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-GHookList* get_session_closed_hooks (void );
-GSList* get_provider_list (void );
-gboolean get_qof_providers_initialized (void );
+ProviderVec& get_providers (void );
+bool get_providers_initialized (void );
void unregister_all_providers (void );
-#ifdef __cplusplus
-}
-#endif
-
-GHookList*
-get_session_closed_hooks (void)
+ProviderVec&
+get_providers (void)
{
- return session_closed_hooks;
+ return s_providers;
}
-GSList*
-get_provider_list (void)
+bool
+get_providers_initialized (void)
{
- return provider_list;
-}
-
-gboolean
-get_qof_providers_initialized (void)
-{
- return qof_providers_initialized;
+ return !s_providers.empty();
}
void
unregister_all_providers (void)
{
- if (provider_list)
- {
- g_slist_foreach (provider_list, (GFunc) g_free, NULL);
- g_slist_free (provider_list);
- provider_list = NULL;
- }
+ s_providers.clear();
}
/* ====================================================================== */
void
-qof_backend_register_provider (QofBackendProvider *prov)
+qof_backend_register_provider (QofBackendProvider_ptr&& prov)
{
- provider_list = g_slist_append (provider_list, prov);
+ s_providers.emplace_back(std::move(prov));
}
+/* Called from C so we have to keep the GList for now. */
GList*
qof_backend_get_registered_access_method_list(void)
{
GList* list = NULL;
- GSList* node;
-
- for ( node = provider_list; node != NULL; node = node->next )
- {
- QofBackendProvider *prov = static_cast<QofBackendProvider*>(node->data);
- list = g_list_append( list, (gchar*)prov->access_method );
- }
-
+ std::for_each(s_providers.begin(), s_providers.end(),
+ [&list](QofBackendProvider_ptr& provider) {
+ gpointer method = reinterpret_cast<gpointer>(const_cast<char*>(provider->access_method));
+ list = g_list_prepend(list, method);
+ });
return list;
}
-/* ====================================================================== */
-
-/* hook routines */
-
-void
-qof_session_add_close_hook (GFunc fn, gpointer data)
-{
- GHook *hook;
-
- if (session_closed_hooks == NULL)
- {
- session_closed_hooks = static_cast<GHookList*>(malloc(sizeof(GHookList))); /* LEAKED */
- g_hook_list_init (session_closed_hooks, sizeof(GHook));
- }
-
- hook = g_hook_alloc(session_closed_hooks);
- if (!hook)
- return;
-
- hook->func = reinterpret_cast<void*>(fn);
- hook->data = data;
- g_hook_append(session_closed_hooks, hook);
-}
-
-void
-qof_session_call_close_hooks (QofSession *session)
-{
- GHook *hook;
- GFunc fn;
-
- if (session_closed_hooks == NULL)
- return;
-
- hook = g_hook_first_valid (session_closed_hooks, FALSE);
- while (hook)
- {
- fn = (GFunc)hook->func;
- fn(session, hook->data);
- hook = g_hook_next_valid (session_closed_hooks, hook, FALSE);
- }
-}
/* ====================================================================== */
/* error handling routines */
@@ -337,70 +283,38 @@ qof_session_ensure_all_data_loaded (QofSession *session)
/* ====================================================================== */
-/** Programs that use their own backends also need to call
-the default QOF ones. The backends specified here are
-loaded only by applications that do not have their own. */
-struct backend_providers
-{
- const char *libdir;
- const char *filename;
-};
-
static void
qof_session_load_backend(QofSession * session, const char * access_method)
{
- GSList *p;
- QofBackendProvider *prov;
- char *msg;
- gboolean prov_type;
- gboolean (*type_check) (const char*);
- ENTER (" list=%d, initted=%s", g_slist_length(provider_list),
- qof_providers_initialized ? "true" : "false");
- prov_type = FALSE;
- if (!qof_providers_initialized)
- {
- qof_providers_initialized = TRUE;
- }
- p = provider_list;
- while (p != NULL)
+ ENTER (" list=%lu", s_providers.size());
+ for (QofBackendProvider_ptr& prov : s_providers)
{
- prov = static_cast<QofBackendProvider*>(p->data);
/* Does this provider handle the desired access method? */
- if (0 == g_ascii_strcasecmp (access_method, prov->access_method))
+ if (0 != g_ascii_strcasecmp (access_method, prov->access_method))
+ continue;
+
+ /* More than one backend could provide this
+ access method, check file type compatibility. */
+
+ if (!prov->type_check(session->book_id))
{
- /* More than one backend could provide this
- access method, check file type compatibility. */
- type_check = (gboolean (*)(const char*)) prov->check_data_type;
- if (type_check)
- {
- prov_type = (type_check)(session->book_id);
- if (!prov_type)
- {
- PINFO(" %s not usable", prov->provider_name);
- p = p->next;
- continue;
- }
- }
- PINFO (" selected %s", prov->provider_name);
- if (NULL == prov->backend_new)
- {
- p = p->next;
- continue;
- }
- /* Use the providers creation callback */
- session->backend = (*(prov->backend_new))();
- session->backend->provider = prov;
- /* Tell the book about the backend that they'll be using. */
- qof_book_set_backend (session->book, session->backend);
- LEAVE (" ");
- return;
+ PINFO(" %s not usable", prov->provider_name);
+ continue;
}
- p = p->next;
+ PINFO (" selected %s", prov->provider_name);
+ /* Use the providers creation callback */
+ session->backend = prov->create_backend();
+ /* Tell the book about the backend that they'll be using. */
+ qof_book_set_backend (session->book, session->backend);
+ LEAVE (" ");
+ return;
}
- msg = g_strdup_printf("failed to load '%s' using access_method", access_method);
- qof_session_push_error (session, ERR_BACKEND_NO_HANDLER, msg);
- g_free(msg);
+
+ std::ostringstream msgstrm;
+ msgstrm << "Failed to load '" << access_method << "' using access_method";
+ qof_session_push_error (session, ERR_BACKEND_NO_HANDLER,
+ msgstrm.str().c_str());
LEAVE (" ");
}
@@ -866,21 +780,12 @@ qof_session_export (QofSession *tmp_session,
/* ================= Static function access for testing ================= */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
void init_static_qofsession_pointers (void);
void (*p_qof_session_load_backend) (QofSession * session, const char * access_method);
void (*p_qof_session_clear_error) (QofSession *session);
void (*p_qof_session_destroy_backend) (QofSession *session);
-#ifdef __cplusplus
-}
-#endif
-
void
init_static_qofsession_pointers (void)
{
diff --git a/src/libqof/qof/qofsession.h b/src/libqof/qof/qofsession.h
index cdef4bb..afc6515 100644
--- a/src/libqof/qof/qofsession.h
+++ b/src/libqof/qof/qofsession.h
@@ -289,20 +289,6 @@ gboolean qof_session_events_pending (const QofSession *session);
gboolean qof_session_process_events (QofSession *session);
/** @} */
-/** Register a function to be called just before a session is closed.
- *
- * @param fn The function to be called. The function definition must
- * be func(gpointer session, gpointer user_data);
- *
- * @param data The data to be passed to the function. */
-void qof_session_add_close_hook (GFunc fn, gpointer data);
-
-/** Call all registered session close hooks, informing them that the
- * specified session is about to be closed.
- *
- * @param session A pointer to the session being closed. */
-void qof_session_call_close_hooks (QofSession *session);
-
gboolean qof_session_export (QofSession *tmp_session,
QofSession *real_session,
QofPercentageFunc percentage_func);
diff --git a/src/libqof/qof/test/CMakeLists.txt b/src/libqof/qof/test/CMakeLists.txt
index 2524241..a16a4bb 100644
--- a/src/libqof/qof/test/CMakeLists.txt
+++ b/src/libqof/qof/test/CMakeLists.txt
@@ -1,4 +1,3 @@
-
SET(TEST_QOF_INCLUDE_DIRS
${CMAKE_BINARY_DIR}/src # for config.h
${CMAKE_SOURCE_DIR}/src/test-core # for unittest-support.h
@@ -17,7 +16,7 @@ SET(test_qof_SOURCES
test-qofinstance.cpp
# test-kvp-frame.cpp This now use Google Test
test-qofobject.c
- test-qofsession.c
+ test-qofsession.cpp
test-qof-string-cache.c
test-gnc-guid.cpp
${CMAKE_SOURCE_DIR}/src/test-core/unittest-support.c
diff --git a/src/libqof/qof/test/Makefile.am b/src/libqof/qof/test/Makefile.am
index 1d1b19e..1ad5693 100644
--- a/src/libqof/qof/test/Makefile.am
+++ b/src/libqof/qof/test/Makefile.am
@@ -14,7 +14,7 @@ test_qof_SOURCES = \
test-qofbook.c \
test-qofinstance.cpp \
test-qofobject.c \
- test-qofsession.c \
+ test-qofsession.cpp \
test-qof-string-cache.c \
test-gnc-guid.cpp \
${top_srcdir}/src/test-core/unittest-support.c
diff --git a/src/libqof/qof/test/test-qofsession.c b/src/libqof/qof/test/test-qofsession.cpp
similarity index 84%
rename from src/libqof/qof/test/test-qofsession.c
rename to src/libqof/qof/test/test-qofsession.cpp
index 9f4ee52..ea5e4f9 100644
--- a/src/libqof/qof/test/test-qofsession.c
+++ b/src/libqof/qof/test/test-qofsession.cpp
@@ -20,46 +20,33 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
-#ifdef __cplusplus
extern "C"
{
-#endif
-
#include "config.h"
#include <glib.h>
#include <unittest-support.h>
-
-#ifdef __cplusplus
}
-#endif
#include "../qof.h"
#include "../qofbackend-p.h"
#include "../qofsession-p.h"
#include "../qofclass-p.h"
+#include "../gnc-backend-prov.hpp"
+#include <vector>
static const gchar *suitename = "/qof/qofsession";
-void test_suite_qofsession ( void );
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern GHookList* get_session_closed_hooks (void);
-extern GSList* get_provider_list (void);
-extern gboolean get_qof_providers_initialized (void);
-extern void unregister_all_providers (void);
+extern "C" void test_suite_qofsession ( void );
extern void (*p_qof_session_load_backend) (QofSession * session, const char * access_method);
extern void (*p_qof_session_clear_error) (QofSession * session);
extern void (*p_qof_session_destroy_backend) (QofSession * session);
-extern void init_static_qofsession_pointers (void);
+void init_static_qofsession_pointers (void);
-#ifdef __cplusplus
-}
-#endif
+using ProviderVec = std::vector<QofBackendProvider_ptr>;
+extern ProviderVec& get_providers (void);
+extern bool get_providers_initialized (void);
+extern void unregister_all_providers (void);
typedef struct
{
@@ -136,22 +123,30 @@ test_session_safe_save( Fixture *fixture, gconstpointer pData )
static struct
{
QofBackend *be;
- gboolean data_compatible;
- gboolean check_data_type_called;
- gboolean backend_new_called;
+ bool data_compatible;
+ bool check_data_type_called;
+ bool backend_new_called;
} load_backend_struct;
-static gboolean
-mock_check_data_type (const char* book_id)
+struct QofMockLoadBackendProvider : public QofBackendProvider
+{
+ QofMockLoadBackendProvider(const char *name, const char* type) :
+ QofBackendProvider{name, type} {}
+ QofBackend* create_backend(void);
+ bool type_check(const char* type);
+};
+
+bool
+QofMockLoadBackendProvider::type_check (const char* book_id)
{
g_assert (book_id);
- g_assert_cmpstr (book_id, == , "my book");
- load_backend_struct.check_data_type_called = TRUE;
+ g_assert_cmpstr (book_id, ==, "my book");
+ load_backend_struct.check_data_type_called = true;
return load_backend_struct.data_compatible;
}
-static QofBackend*
-mock_backend_new (void)
+QofBackend*
+QofMockLoadBackendProvider::create_backend (void)
{
QofBackend *be = NULL;
@@ -165,55 +160,44 @@ mock_backend_new (void)
static void
test_qof_session_load_backend (Fixture *fixture, gconstpointer pData)
{
- QofBackendProvider *prov = NULL;
QofBook *book = NULL;
/* init */
- prov = g_new0 (QofBackendProvider, 1);
g_test_message ("Test when no provider is registered");
- g_assert (!get_qof_providers_initialized ());
- g_assert (get_provider_list () == NULL);
+ g_assert (!get_providers_initialized ());
+ g_assert (get_providers ().empty());
p_qof_session_load_backend (fixture->session, "file");
- g_assert (get_qof_providers_initialized ());
+ g_assert (!get_providers_initialized ());
g_assert_cmpint (qof_session_get_error (fixture->session), == , ERR_BACKEND_NO_HANDLER);
- g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "failed to load 'file' using access_method");
+ g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "Failed to load 'file' using access_method");
p_qof_session_clear_error (fixture->session);
g_test_message ("Test with provider registered but access method not supported");
- prov->access_method = "unsupported";
- qof_backend_register_provider (prov);
- g_assert (get_provider_list ());
- g_assert_cmpint (g_slist_length (get_provider_list ()), == , 1);
+ auto prov = QofBackendProvider_ptr(new QofMockLoadBackendProvider("Mock Backend", "unsupported"));
+ qof_backend_register_provider (std::move(prov));
+ g_assert (!get_providers().empty());
+ g_assert_cmpint (get_providers().size(), == , 1);
p_qof_session_load_backend (fixture->session, "file");
g_assert_cmpint (qof_session_get_error (fixture->session), == , ERR_BACKEND_NO_HANDLER);
- g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "failed to load 'file' using access_method");
+ g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "Failed to load 'file' using access_method");
p_qof_session_clear_error (fixture->session);
g_test_message ("Test with access method supported but type incompatible");
- prov->access_method = "file";
- prov->check_data_type = mock_check_data_type;
+ prov = QofBackendProvider_ptr(new QofMockLoadBackendProvider("Mock Backend",
+ "file"));
+ qof_backend_register_provider (std::move(prov));
load_backend_struct.data_compatible = FALSE;
load_backend_struct.check_data_type_called = FALSE;
fixture->session->book_id = g_strdup ("my book");
p_qof_session_load_backend (fixture->session, "file");
g_assert (load_backend_struct.check_data_type_called);
g_assert_cmpint (qof_session_get_error (fixture->session), == , ERR_BACKEND_NO_HANDLER);
- g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "failed to load 'file' using access_method");
+ g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "Failed to load 'file' using access_method");
p_qof_session_clear_error (fixture->session);
- g_test_message ("Test with type compatible but backend_new not set");
- prov->backend_new = NULL;
- load_backend_struct.data_compatible = TRUE;
- load_backend_struct.check_data_type_called = FALSE;
- p_qof_session_load_backend (fixture->session, "file");
- g_assert (load_backend_struct.check_data_type_called);
- g_assert_cmpint (qof_session_get_error (fixture->session), == , ERR_BACKEND_NO_HANDLER);
- g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "failed to load 'file' using access_method");
- p_qof_session_clear_error (fixture->session);
g_test_message ("Test with type compatible backend_new set");
- prov->backend_new = mock_backend_new;
load_backend_struct.be = NULL;
load_backend_struct.data_compatible = TRUE;
load_backend_struct.check_data_type_called = FALSE;
@@ -227,12 +211,11 @@ test_qof_session_load_backend (Fixture *fixture, gconstpointer pData)
g_assert (load_backend_struct.backend_new_called);
g_assert (load_backend_struct.be);
g_assert (load_backend_struct.be == fixture->session->backend);
- g_assert (prov == fixture->session->backend->provider);
g_assert (qof_book_get_backend (book) == load_backend_struct.be);
g_assert_cmpint (qof_session_get_error (fixture->session), == , ERR_BACKEND_NO_ERR);
unregister_all_providers ();
- g_assert_cmpint (g_slist_length (get_provider_list ()), == , 0);
+ g_assert_cmpint (get_providers().size(), == , 0);
}
static struct
@@ -329,9 +312,23 @@ mock_session_begin (QofBackend *be, QofSession *session, const char *book_id,
}
session_begin_struct.session_begin_called = TRUE;
}
+struct QofMockSessBackendProvider : public QofBackendProvider
+{
+ QofMockSessBackendProvider(const char *name, const char* type) :
+ QofBackendProvider{name, type} {}
+ QofBackend* create_backend(void);
+ bool type_check(const char* type);
+};
+
+bool
+QofMockSessBackendProvider::type_check (const char* book_id)
+{
+ g_assert (book_id);
+ return true;
+}
-static QofBackend*
-mock_backend_new_for_begin (void)
+QofBackend*
+QofMockSessBackendProvider::create_backend (void)
{
QofBackend *be = NULL;
@@ -348,7 +345,6 @@ test_qof_session_begin (Fixture *fixture, gconstpointer pData)
{
gboolean ignore_lock, create, force;
QofBackend *be = NULL;
- QofBackendProvider *prov = NULL;
/* setup */
ignore_lock = TRUE;
@@ -357,9 +353,7 @@ test_qof_session_begin (Fixture *fixture, gconstpointer pData)
be = g_new0 (QofBackend, 1);
g_assert (be);
- g_assert_cmpint (g_slist_length (get_provider_list ()), == , 0);
- prov = g_new0 (QofBackendProvider, 1);
- prov->backend_new = mock_backend_new_for_begin;
+ g_assert_cmpint (get_providers().size(), == , 0);
/* run tests */
g_test_message ("Test when book_id is set backend is not changed");
@@ -383,14 +377,14 @@ test_qof_session_begin (Fixture *fixture, gconstpointer pData)
g_assert (fixture->session->backend == NULL);
g_assert (fixture->session->book_id == NULL);
g_assert_cmpint (qof_session_get_error (fixture->session), == , ERR_BACKEND_NO_HANDLER);
- g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "failed to load 'file' using access_method");
+ g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "Failed to load 'file' using access_method");
g_test_message ("Test access_method parsing");
qof_session_begin (fixture->session, "postgres://localhost:8080", ignore_lock, create, force);
g_assert (fixture->session->backend == NULL);
g_assert (fixture->session->book_id == NULL);
g_assert_cmpint (qof_session_get_error (fixture->session), == , ERR_BACKEND_NO_HANDLER);
- g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "failed to load 'postgres' using access_method");
+ g_assert_cmpstr (qof_session_get_error_message (fixture->session), == , "Failed to load 'postgres' using access_method");
g_test_message ("Test with valid backend returned and session begin set; error is produced");
session_begin_struct.session = fixture->session;
@@ -398,8 +392,10 @@ test_qof_session_begin (Fixture *fixture, gconstpointer pData)
session_begin_struct.backend_new_called = FALSE;
session_begin_struct.session_begin_called = FALSE;
session_begin_struct.produce_error = TRUE;
- prov->access_method = "postgres";
- qof_backend_register_provider (prov);
+ auto prov = QofBackendProvider_ptr(new QofMockSessBackendProvider("Mock Backend",
+ "postgres"));
+ qof_backend_register_provider (std::move(prov));
+
qof_session_begin (fixture->session, "postgres://localhost:8080", ignore_lock, create, force);
g_assert (fixture->session->backend);
g_assert (session_begin_struct.be == fixture->session->backend);
@@ -769,37 +765,6 @@ test_qof_session_data_loaded (Fixture *fixture, gconstpointer pData)
}
static void
-test_qof_backend_get_access_method_list (Fixture *fixture, gconstpointer pData)
-{
- GList *list = NULL;
- const char *access_methods[4] = { "file", "http", "postgres", "sqlite" };
- int i;
-
- for (i = 0; i < 4; i++)
- {
- QofBackendProvider *prov = g_new0 (QofBackendProvider, 1);
- g_assert (prov);
- prov->access_method = access_methods[ i ];
- qof_backend_register_provider (prov);
- g_assert_cmpint (g_slist_length (get_provider_list ()), == , (i + 1));
- }
- g_assert_cmpint (g_slist_length (get_provider_list ()), == , 4);
-
- g_test_message ("Test list of access methods is returned");
- list = qof_backend_get_registered_access_method_list ();
- g_assert (list);
- g_assert_cmpint (g_list_length (list), == , 4);
- g_assert_cmpstr (g_list_nth_data (list, 0), == , "file");
- g_assert_cmpstr (g_list_nth_data (list, 1), == , "http");
- g_assert_cmpstr (g_list_nth_data (list, 2), == , "postgres");
- g_assert_cmpstr (g_list_nth_data (list, 3), == , "sqlite");
-
- g_list_free (list);
- unregister_all_providers ();
-}
-
-
-static void
test_qof_session_get_book (Fixture *fixture, gconstpointer pData)
{
QofBook *book = NULL;
@@ -890,37 +855,6 @@ mock_hook_fn (gpointer data, gpointer user_data)
hooks_struct.call_count++;
}
-static void
-test_qof_session_close_hooks (Fixture *fixture, gconstpointer pData)
-{
- gint data1, data2, data3;
-
- g_test_message ("Test hooks list is initialized and hooks are added");
- g_assert (!get_session_closed_hooks ());
- qof_session_add_close_hook (mock_hook_fn, (gpointer) &data1);
- g_assert (get_session_closed_hooks ());
- g_assert (g_hook_find_func_data (get_session_closed_hooks (), FALSE, mock_hook_fn, (gpointer) &data1));
- qof_session_add_close_hook (mock_hook_fn, (gpointer) &data2);
- g_assert (g_hook_find_func_data (get_session_closed_hooks (), FALSE, mock_hook_fn, (gpointer) &data2));
- qof_session_add_close_hook (mock_hook_fn, (gpointer) &data3);
- g_assert (g_hook_find_func_data (get_session_closed_hooks (), FALSE, mock_hook_fn, (gpointer) &data3));
-
- g_test_message ("Test all close hooks are called");
- hooks_struct.session = fixture->session;
- hooks_struct.data1 = (gpointer) &data1;
- hooks_struct.data2 = (gpointer) &data2;
- hooks_struct.data3 = (gpointer) &data3;
- hooks_struct.call_count = 0;
- qof_session_call_close_hooks (fixture->session);
- g_assert_cmpuint (hooks_struct.call_count, == , 3);
-
- /* currently qofsession does not provide a way to clear hooks list
- * g_hook_list_clear is used to destroy list and all of it's elements
- * though i' not sure if it frees all the memory allocated
- */
- g_hook_list_clear (get_session_closed_hooks ());
-}
-
void
test_suite_qofsession ( void )
{
@@ -936,9 +870,7 @@ test_suite_qofsession ( void )
GNC_TEST_ADD (suitename, "qof session swap data", Fixture, NULL, setup, test_qof_session_swap_data, teardown);
GNC_TEST_ADD (suitename, "qof session events", Fixture, NULL, setup, test_qof_session_events, teardown);
GNC_TEST_ADD (suitename, "qof session data loaded", Fixture, NULL, setup, test_qof_session_data_loaded, teardown);
- GNC_TEST_ADD (suitename, "qof backend access method list", Fixture, NULL, setup, test_qof_backend_get_access_method_list, teardown);
GNC_TEST_ADD (suitename, "qof session get book", Fixture, NULL, setup, test_qof_session_get_book, teardown);
GNC_TEST_ADD (suitename, "qof session get error", Fixture, NULL, setup, test_qof_session_get_error, teardown);
GNC_TEST_ADD (suitename, "qof session clear error", Fixture, NULL, setup, test_qof_session_clear_error, teardown);
- GNC_TEST_ADD (suitename, "qof session close hooks", Fixture, NULL, setup, test_qof_session_close_hooks, teardown);
}
commit 34e34334c78b7ef8af741bdad770ed82ef29973c
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 12 14:04:40 2016 -0800
Backends: astyle -xd -k1 -m0 -M60 -xL -xC79 -OHpUcZns4 --brackets=break
More extensive than usual, but these files had a lot of format issues.
diff --git a/src/backend/dbi/gnc-backend-dbi-priv.h b/src/backend/dbi/gnc-backend-dbi-priv.h
index 3aefd55..acf8cc9 100644
--- a/src/backend/dbi/gnc-backend-dbi-priv.h
+++ b/src/backend/dbi/gnc-backend-dbi-priv.h
@@ -62,13 +62,13 @@ typedef enum
GNC_DBI_FAIL_TEST
} GncDbiTestResult;
-typedef gchar* (*CREATE_TABLE_DDL_FN) ( GncSqlConnection* conn,
- const gchar* table_name,
- const GList* col_info_list );
-typedef GSList* (*GET_TABLE_LIST_FN) ( dbi_conn conn, const gchar* dbname );
-typedef void (*APPEND_COLUMN_DEF_FN) ( GString* ddl, GncSqlColumnInfo* info );
-typedef GSList* (*GET_INDEX_LIST_FN) ( dbi_conn conn );
-typedef void (*DROP_INDEX_FN) ( dbi_conn conn, const gchar* index );
+typedef gchar* (*CREATE_TABLE_DDL_FN) (GncSqlConnection* conn,
+ const gchar* table_name,
+ const GList* col_info_list);
+typedef GSList* (*GET_TABLE_LIST_FN) (dbi_conn conn, const gchar* dbname);
+typedef void (*APPEND_COLUMN_DEF_FN) (GString* ddl, GncSqlColumnInfo* info);
+typedef GSList* (*GET_INDEX_LIST_FN) (dbi_conn conn);
+typedef void (*DROP_INDEX_FN) (dbi_conn conn, const gchar* index);
typedef struct
{
CREATE_TABLE_DDL_FN create_table_ddl;
@@ -85,16 +85,16 @@ struct GncDbiBackend_struct
dbi_conn conn;
- QofBook *primary_book; /* The primary, main open book */
- gboolean loading; /* We are performing an initial load */
+ QofBook* primary_book; /* The primary, main open book */
+ gboolean loading; /* We are performing an initial load */
gboolean in_query;
gboolean supports_transactions;
- gboolean is_pristine_db; // Are we saving to a new pristine db?
+ gboolean is_pristine_db; // Are we saving to a new pristine db?
gboolean exists; // Does the database exist?
- gint obj_total; // Total # of objects (for percentage calculation)
- gint operations_done; // Number of operations (save/load) done
-// GHashTable* versions; // Version number for each table
+ gint obj_total; // Total # of objects (for percentage calculation)
+ gint operations_done; // Number of operations (save/load) done
+// GHashTable* versions; // Version number for each table
};
typedef struct GncDbiBackend_struct GncDbiBackend;
diff --git a/src/backend/dbi/gnc-backend-dbi.cpp b/src/backend/dbi/gnc-backend-dbi.cpp
index a3b56da..e0c1914 100644
--- a/src/backend/dbi/gnc-backend-dbi.cpp
+++ b/src/backend/dbi/gnc-backend-dbi.cpp
@@ -77,7 +77,7 @@ extern "C"
#define GETPID() getpid()
#endif
-/* For direct access to dbi data structs, sadly needed for datetime */
+ /* For direct access to dbi data structs, sadly needed for datetime */
#include <dbi/dbi-dev.h>
}
#include <boost/regex.hpp>
@@ -113,14 +113,15 @@ static gchar lock_table[] = "gnclock";
#define SQLITE3_URI_PREFIX (SQLITE3_URI_TYPE "://")
#define PGSQL_DEFAULT_PORT 5432
-static gchar* conn_create_table_ddl_sqlite3( GncSqlConnection* conn,
- const gchar* table_name,
- const GList* col_info_list );
-static GSList* conn_get_table_list( dbi_conn conn, const gchar* dbname );
-static GSList* conn_get_table_list_sqlite3( dbi_conn conn, const gchar* dbname );
-static void append_sqlite3_col_def( GString* ddl, GncSqlColumnInfo* info );
-static GSList *conn_get_index_list_sqlite3( dbi_conn conn );
-static void conn_drop_index_sqlite3 (dbi_conn conn, const gchar *index );
+static gchar* conn_create_table_ddl_sqlite3 (GncSqlConnection* conn,
+ const gchar* table_name,
+ const GList* col_info_list);
+static GSList* conn_get_table_list (dbi_conn conn, const gchar* dbname);
+static GSList* conn_get_table_list_sqlite3 (dbi_conn conn,
+ const gchar* dbname);
+static void append_sqlite3_col_def (GString* ddl, GncSqlColumnInfo* info);
+static GSList* conn_get_index_list_sqlite3 (dbi_conn conn);
+static void conn_drop_index_sqlite3 (dbi_conn conn, const gchar* index);
static provider_functions_t provider_sqlite3 =
{
conn_create_table_ddl_sqlite3,
@@ -131,12 +132,12 @@ static provider_functions_t provider_sqlite3 =
};
#define SQLITE3_TIMESPEC_STR_FORMAT "%04d%02d%02d%02d%02d%02d"
-static gchar* conn_create_table_ddl_mysql( GncSqlConnection* conn,
- const gchar* table_name,
- const GList* col_info_list );
-static void append_mysql_col_def( GString* ddl, GncSqlColumnInfo* info );
-static GSList *conn_get_index_list_mysql( dbi_conn conn );
-static void conn_drop_index_mysql (dbi_conn conn, const gchar *index );
+static gchar* conn_create_table_ddl_mysql (GncSqlConnection* conn,
+ const gchar* table_name,
+ const GList* col_info_list);
+static void append_mysql_col_def (GString* ddl, GncSqlColumnInfo* info);
+static GSList* conn_get_index_list_mysql (dbi_conn conn);
+static void conn_drop_index_mysql (dbi_conn conn, const gchar* index);
static provider_functions_t provider_mysql =
{
conn_create_table_ddl_mysql,
@@ -147,13 +148,13 @@ static provider_functions_t provider_mysql =
};
#define MYSQL_TIMESPEC_STR_FORMAT "%04d%02d%02d%02d%02d%02d"
-static gchar* conn_create_table_ddl_pgsql( GncSqlConnection* conn,
- const gchar* table_name,
- const GList* col_info_list );
-static GSList* conn_get_table_list_pgsql( dbi_conn conn, const gchar* dbname );
-static void append_pgsql_col_def( GString* ddl, GncSqlColumnInfo* info );
-static GSList *conn_get_index_list_pgsql( dbi_conn conn );
-static void conn_drop_index_pgsql (dbi_conn conn, const gchar *index );
+static gchar* conn_create_table_ddl_pgsql (GncSqlConnection* conn,
+ const gchar* table_name,
+ const GList* col_info_list);
+static GSList* conn_get_table_list_pgsql (dbi_conn conn, const gchar* dbname);
+static void append_pgsql_col_def (GString* ddl, GncSqlColumnInfo* info);
+static GSList* conn_get_index_list_pgsql (dbi_conn conn);
+static void conn_drop_index_pgsql (dbi_conn conn, const gchar* index);
static provider_functions_t provider_pgsql =
{
@@ -165,19 +166,20 @@ static provider_functions_t provider_pgsql =
};
#define PGSQL_TIMESPEC_STR_FORMAT "%04d%02d%02d %02d%02d%02d"
-static gboolean gnc_dbi_lock_database( QofBackend *qbe, gboolean ignore_lock );
-static void gnc_dbi_unlock( QofBackend *qbe );
-static gboolean save_may_clobber_data( QofBackend* qbe );
-
-static gchar* create_index_ddl( GncSqlConnection* conn,
- const gchar* index_name,
- const gchar* table_name,
- const GncSqlColumnTableEntry* col_table );
-static gchar* add_columns_ddl( GncSqlConnection* conn,
- const gchar* table_name,
- GList* col_info_list );
-static GncSqlConnection* create_dbi_connection( provider_functions_t* provider, QofBackend* qbe, dbi_conn conn );
-static GncDbiTestResult conn_test_dbi_library( dbi_conn conn );
+static gboolean gnc_dbi_lock_database (QofBackend* qbe, gboolean ignore_lock);
+static void gnc_dbi_unlock (QofBackend* qbe);
+static gboolean save_may_clobber_data (QofBackend* qbe);
+
+static gchar* create_index_ddl (GncSqlConnection* conn,
+ const gchar* index_name,
+ const gchar* table_name,
+ const GncSqlColumnTableEntry* col_table);
+static gchar* add_columns_ddl (GncSqlConnection* conn,
+ const gchar* table_name,
+ GList* col_info_list);
+static GncSqlConnection* create_dbi_connection (provider_functions_t* provider,
+ QofBackend* qbe, dbi_conn conn);
+static GncDbiTestResult conn_test_dbi_library (dbi_conn conn);
#define GNC_DBI_PROVIDER_SQLITE (&provider_sqlite3)
#define GNC_DBI_PROVIDER_MYSQL (&provider_mysql)
#define GNC_DBI_PROVIDER_PGSQL (&provider_pgsql)
@@ -190,24 +192,24 @@ static GncDbiTestResult conn_test_dbi_library( dbi_conn conn );
/* Free the contents of a GSList, then free the list. Don't use this
* if the elements of the list weren't created with g_new! */
static void
-gnc_table_slist_free( GSList *table_list )
+gnc_table_slist_free (GSList* table_list)
{
- GSList *list;
- for ( list = table_list; list != NULL; list = g_slist_next( list ))
+ GSList* list;
+ for (list = table_list; list != NULL; list = g_slist_next (list))
{
- g_free( list->data );
+ g_free (list->data);
}
- g_slist_free( table_list );
+ g_slist_free (table_list);
}
static void
-gnc_dbi_set_error( GncDbiSqlConnection* dbi_conn, gint last_error,
- gint error_repeat, gboolean retry )
+gnc_dbi_set_error (GncDbiSqlConnection* dbi_conn, gint last_error,
+ gint error_repeat, gboolean retry)
{
- g_return_if_fail( dbi_conn != NULL );
+ g_return_if_fail (dbi_conn != NULL);
dbi_conn->last_error = last_error;
- if ( error_repeat > 0 )
+ if (error_repeat > 0)
dbi_conn->error_repeat = dbi_conn->error_repeat + error_repeat;
else
dbi_conn->error_repeat = 0;
@@ -215,18 +217,18 @@ gnc_dbi_set_error( GncDbiSqlConnection* dbi_conn, gint last_error,
}
static void
-gnc_dbi_init_error( GncDbiSqlConnection* dbi_conn )
+gnc_dbi_init_error (GncDbiSqlConnection* dbi_conn)
{
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_NO_ERR, 0, FALSE );
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_NO_ERR, 0, FALSE);
}
/* Check if the dbi connection is valid. If not attempt to re-establish it
* Returns TRUE is there is a valid connection in the end or FALSE otherwise
*/
static gboolean
-gnc_dbi_verify_conn( GncDbiSqlConnection* dbi_conn )
+gnc_dbi_verify_conn (GncDbiSqlConnection* dbi_conn)
{
- if ( dbi_conn->conn_ok )
+ if (dbi_conn->conn_ok)
return TRUE;
/* We attempt to connect only once here. The error function will automatically
@@ -234,9 +236,9 @@ gnc_dbi_verify_conn( GncDbiSqlConnection* dbi_conn )
* After all these attempts, conn_ok will indicate if there is a valid connection
* or not.
*/
- gnc_dbi_init_error( dbi_conn );
+ gnc_dbi_init_error (dbi_conn);
dbi_conn->conn_ok = TRUE;
- (void)dbi_conn_connect( dbi_conn->conn );
+ (void)dbi_conn_connect (dbi_conn->conn);
return dbi_conn->conn_ok;
}
@@ -244,22 +246,22 @@ gnc_dbi_verify_conn( GncDbiSqlConnection* dbi_conn )
/* ================================================================= */
static void
-create_tables_cb( const gchar* type, gpointer data_p, gpointer be_p )
+create_tables_cb (const gchar* type, gpointer data_p, gpointer be_p)
{
- GncSqlObjectBackend* pData = static_cast<decltype(pData)>(data_p);
- GncDbiBackend* be = static_cast<decltype(be)>(be_p);
+ GncSqlObjectBackend* pData = static_cast<decltype (pData)> (data_p);
+ GncDbiBackend* be = static_cast<decltype (be)> (be_p);
- g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
- g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
+ g_return_if_fail (type != NULL && data_p != NULL && be_p != NULL);
+ g_return_if_fail (pData->version == GNC_SQL_BACKEND_VERSION);
- if ( pData->create_tables != NULL )
+ if (pData->create_tables != NULL)
{
- (pData->create_tables)( &be->sql_be );
+ (pData->create_tables) (&be->sql_be);
}
}
static void
-sqlite3_error_fn(dbi_conn conn, void* user_data)
+sqlite3_error_fn (dbi_conn conn, void* user_data)
{
const gchar* msg;
GncDbiBackend *be = static_cast<decltype(be)>(user_data);
@@ -273,39 +275,39 @@ sqlite3_error_fn(dbi_conn conn, void* user_data)
}
static void
-gnc_dbi_sqlite3_session_begin( QofBackend *qbe, QofSession *session,
- const gchar *book_id, gboolean ignore_lock,
- gboolean create, gboolean force )
+gnc_dbi_sqlite3_session_begin (QofBackend* qbe, QofSession* session,
+ const gchar* book_id, gboolean ignore_lock,
+ gboolean create, gboolean force)
{
- GncDbiBackend *be = (GncDbiBackend*)qbe;
+ GncDbiBackend* be = (GncDbiBackend*)qbe;
gint result;
gchar* dirname = NULL;
gchar* basename = NULL;
- gchar *filepath = NULL;
- const char *msg = nullptr;
+ gchar* filepath = NULL;
+ const char* msg = nullptr;
gboolean file_exists;
GncDbiTestResult dbi_test_result = GNC_DBI_PASS;
- g_return_if_fail( qbe != NULL );
- g_return_if_fail( session != NULL );
- g_return_if_fail( book_id != NULL );
+ g_return_if_fail (qbe != NULL);
+ g_return_if_fail (session != NULL);
+ g_return_if_fail (book_id != NULL);
ENTER (" ");
/* Remove uri type if present */
- filepath = gnc_uri_get_path ( book_id );
- GFileTest ftest = static_cast<decltype(ftest)>(
- G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS) ;
- file_exists = g_file_test( filepath, ftest);
- if ( !create && !file_exists )
- {
- qof_backend_set_error( qbe, ERR_FILEIO_FILE_NOT_FOUND );
- qof_backend_set_message(qbe, "Sqlite3 file %s not found", filepath);
+ filepath = gnc_uri_get_path (book_id);
+ GFileTest ftest = static_cast<decltype (ftest)> (
+ G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS) ;
+ file_exists = g_file_test (filepath, ftest);
+ if (!create && !file_exists)
+ {
+ qof_backend_set_error (qbe, ERR_FILEIO_FILE_NOT_FOUND);
+ qof_backend_set_message (qbe, "Sqlite3 file %s not found", filepath);
PWARN ("Sqlite3 file %s not found", filepath);
goto exit;
}
- if ( create && !force && file_exists )
+ if (create && !force && file_exists)
{
qof_backend_set_error (qbe, ERR_BACKEND_STORE_EXISTS);
msg = "Might clobber, no force";
@@ -314,103 +316,104 @@ gnc_dbi_sqlite3_session_begin( QofBackend *qbe, QofSession *session,
}
- if ( be->conn != NULL )
+ if (be->conn != NULL)
{
- dbi_conn_close( be->conn );
+ dbi_conn_close (be->conn);
}
- #if HAVE_LIBDBI_R
+#if HAVE_LIBDBI_R
if (dbi_instance)
- be->conn = dbi_conn_new_r( "sqlite3", dbi_instance );
+ be->conn = dbi_conn_new_r ("sqlite3", dbi_instance);
else
PERR ("Attempt to connect with an uninitialized dbi_instance");
- #else
- be->conn = dbi_conn_new( "sqlite3" );
- #endif
+#else
+ be->conn = dbi_conn_new ("sqlite3");
+#endif
- if ( be->conn == NULL )
+ if (be->conn == NULL)
{
- PERR( "Unable to create sqlite3 dbi connection\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_BAD_URL );
+ PERR ("Unable to create sqlite3 dbi connection\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_BAD_URL);
goto exit;
}
- dirname = g_path_get_dirname( filepath );
- basename = g_path_get_basename( filepath );
- dbi_conn_error_handler( be->conn, sqlite3_error_fn, be );
+ dirname = g_path_get_dirname (filepath);
+ basename = g_path_get_basename (filepath);
+ dbi_conn_error_handler (be->conn, sqlite3_error_fn, be);
/* dbi-sqlite3 documentation says that sqlite3 doesn't take a "host" option */
- result = dbi_conn_set_option( be->conn, "host", "localhost" );
- if ( result < 0 )
+ result = dbi_conn_set_option (be->conn, "host", "localhost");
+ if (result < 0)
{
- PERR( "Error setting 'host' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'host' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- result = dbi_conn_set_option( be->conn, "dbname", basename );
- if ( result < 0 )
+ result = dbi_conn_set_option (be->conn, "dbname", basename);
+ if (result < 0)
{
- PERR( "Error setting 'dbname' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'dbname' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- result = dbi_conn_set_option( be->conn, "sqlite3_dbdir", dirname );
- if ( result < 0 )
+ result = dbi_conn_set_option (be->conn, "sqlite3_dbdir", dirname);
+ if (result < 0)
{
- PERR( "Error setting 'sqlite3_dbdir' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'sqlite3_dbdir' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- result = dbi_conn_connect( be->conn );
+ result = dbi_conn_connect (be->conn);
- if ( result < 0 )
+ if (result < 0)
{
- PERR( "Unable to connect to %s: %d\n", book_id, result );
- qof_backend_set_error( qbe, ERR_BACKEND_BAD_URL );
+ PERR ("Unable to connect to %s: %d\n", book_id, result);
+ qof_backend_set_error (qbe, ERR_BACKEND_BAD_URL);
goto exit;
}
- dbi_test_result = conn_test_dbi_library( be->conn );
- switch ( dbi_test_result )
+ dbi_test_result = conn_test_dbi_library (be->conn);
+ switch (dbi_test_result)
{
case GNC_DBI_PASS:
break;
case GNC_DBI_FAIL_SETUP:
- qof_backend_set_error( qbe, ERR_SQL_DBI_UNTESTABLE );
- qof_backend_set_message( qbe,
- "SQLite3: Failed to setup for large number test" );
+ qof_backend_set_error (qbe, ERR_SQL_DBI_UNTESTABLE);
+ qof_backend_set_message (qbe,
+ "SQLite3: Failed to setup for large number test");
break;
case GNC_DBI_FAIL_TEST:
- qof_backend_set_error( qbe, ERR_SQL_BAD_DBI );
- qof_backend_set_message( qbe,
- "SQLite3 DBI library fails large number test" );
+ qof_backend_set_error (qbe, ERR_SQL_BAD_DBI);
+ qof_backend_set_message (qbe,
+ "SQLite3 DBI library fails large number test");
break;
}
- if ( dbi_test_result != GNC_DBI_PASS )
+ if (dbi_test_result != GNC_DBI_PASS)
{
- if ( create && !file_exists ) /* File didn't exist before, but it */
+ if (create && !file_exists) /* File didn't exist before, but it */
{
/* does now, and we don't want to */
- dbi_conn_close( be->conn );/* leave it lying around. */
+ dbi_conn_close (be->conn); /* leave it lying around. */
be->conn = NULL;
- g_unlink( filepath );
+ g_unlink (filepath);
}
msg = "Bad DBI Library";
goto exit;
}
- if ( !gnc_dbi_lock_database( qbe, ignore_lock ) )
+ if (!gnc_dbi_lock_database (qbe, ignore_lock))
{
- qof_backend_set_error( qbe, ERR_BACKEND_LOCKED );
+ qof_backend_set_error (qbe, ERR_BACKEND_LOCKED);
msg = "Locked";
goto exit;
}
- if ( be->sql_be.conn != NULL )
+ if (be->sql_be.conn != NULL)
{
- gnc_sql_connection_dispose( be->sql_be.conn );
+ gnc_sql_connection_dispose (be->sql_be.conn);
}
- be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_SQLITE, qbe, be->conn );
+ be->sql_be.conn = create_dbi_connection (GNC_DBI_PROVIDER_SQLITE, qbe,
+ be->conn);
be->sql_be.timespec_format = SQLITE3_TIMESPEC_STR_FORMAT;
/* We should now have a proper session set up.
@@ -419,47 +422,48 @@ gnc_dbi_sqlite3_session_begin( QofBackend *qbe, QofSession *session,
PINFO ("logpath=%s", filepath ? filepath : "(null)");
exit:
- if ( filepath != NULL ) g_free ( filepath );
- if ( basename != NULL ) g_free( basename );
- if ( dirname != NULL ) g_free( dirname );
- LEAVE ( "%s", msg );
+ if (filepath != NULL) g_free (filepath);
+ if (basename != NULL) g_free (basename);
+ if (dirname != NULL) g_free (dirname);
+ LEAVE ("%s", msg);
}
static GSList*
-conn_get_index_list_sqlite3( dbi_conn conn )
+conn_get_index_list_sqlite3 (dbi_conn conn)
{
- GSList *list = NULL;
- const gchar *errmsg;
- dbi_result result = dbi_conn_query( conn, "SELECT name FROM sqlite_master WHERE type = 'index' AND name NOT LIKE 'sqlite_autoindex%'" );
- if ( dbi_conn_error( conn, &errmsg ) != DBI_ERROR_NONE )
+ GSList* list = NULL;
+ const gchar* errmsg;
+ dbi_result result = dbi_conn_query (conn,
+ "SELECT name FROM sqlite_master WHERE type = 'index' AND name NOT LIKE 'sqlite_autoindex%'");
+ if (dbi_conn_error (conn, &errmsg) != DBI_ERROR_NONE)
{
- g_print( "Index Table Retrieval Error: %s\n", errmsg );
+ g_print ("Index Table Retrieval Error: %s\n", errmsg);
return NULL;
}
- while ( dbi_result_next_row( result ) != 0 )
+ while (dbi_result_next_row (result) != 0)
{
const gchar* index_name;
- index_name = dbi_result_get_string_idx( result, 1 );
- list = g_slist_prepend( list, strdup( index_name ) );
+ index_name = dbi_result_get_string_idx (result, 1);
+ list = g_slist_prepend (list, strdup (index_name));
}
- dbi_result_free( result );
+ dbi_result_free (result);
return list;
}
static void
-conn_drop_index_sqlite3 (dbi_conn conn, const gchar *index )
+conn_drop_index_sqlite3 (dbi_conn conn, const gchar* index)
{
dbi_result result = dbi_conn_queryf (conn, "DROP INDEX %s", index);
- if ( result )
- dbi_result_free( result );
+ if (result)
+ dbi_result_free (result);
}
static void
-mysql_error_fn( dbi_conn conn, void* user_data )
+mysql_error_fn (dbi_conn conn, void* user_data)
{
- GncDbiBackend *be = (GncDbiBackend*)user_data;
- GncDbiSqlConnection *dbi_conn = (GncDbiSqlConnection*)be->sql_be.conn;
+ GncDbiBackend* be = (GncDbiBackend*)user_data;
+ GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)be->sql_be.conn;
const gchar* msg;
gint err_num;
#ifdef G_OS_WIN32
@@ -468,7 +472,7 @@ mysql_error_fn( dbi_conn conn, void* user_data )
const guint backoff_usecs = 1000;
#endif
- err_num = dbi_conn_error( conn, &msg );
+ err_num = dbi_conn_error (conn, &msg);
/* Note: the sql connection may not have been initialized yet
* so let's be careful with using it
@@ -477,9 +481,9 @@ mysql_error_fn( dbi_conn conn, void* user_data )
/* Database doesn't exist. When this error is triggered the
* GncDbiSqlConnection may not exist yet either, so don't use it here
*/
- if ( err_num == 1049 ) // Database doesn't exist
+ if (err_num == 1049) // Database doesn't exist
{
- PINFO( "DBI error: %s\n", msg );
+ PINFO ("DBI error: %s\n", msg);
be->exists = FALSE;
return;
}
@@ -490,48 +494,49 @@ mysql_error_fn( dbi_conn conn, void* user_data )
*/
if (!dbi_conn)
{
- PINFO( "DBI error: %s\n", msg );
- PINFO( "Note: GbcDbiSqlConnection not yet initialized. Skipping further error processing." );
+ PINFO ("DBI error: %s\n", msg);
+ PINFO ("Note: GbcDbiSqlConnection not yet initialized. Skipping further error processing.");
return;
}
/* Test for other errors */
- if ( err_num == 2006 ) // Server has gone away
+ if (err_num == 2006) // Server has gone away
{
- PINFO( "DBI error: %s - Reconnecting...\n", msg );
+ PINFO ("DBI error: %s - Reconnecting...\n", msg);
if (dbi_conn)
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_CONN_LOST, 1, TRUE );
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_CONN_LOST, 1, TRUE);
dbi_conn->conn_ok = TRUE;
- (void)dbi_conn_connect( conn );
+ (void)dbi_conn_connect (conn);
}
- else if ( err_num == 2003 ) // Unable to connect
+ else if (err_num == 2003) // Unable to connect
{
- if (dbi_conn->error_repeat >= DBI_MAX_CONN_ATTEMPTS )
+ if (dbi_conn->error_repeat >= DBI_MAX_CONN_ATTEMPTS)
{
- PERR( "DBI error: %s - Giving up after %d consecutive attempts.\n", msg, DBI_MAX_CONN_ATTEMPTS );
+ PERR ("DBI error: %s - Giving up after %d consecutive attempts.\n", msg,
+ DBI_MAX_CONN_ATTEMPTS);
if (dbi_conn)
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_CANT_CONNECT, 0, FALSE );
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_CANT_CONNECT, 0, FALSE);
dbi_conn->conn_ok = FALSE;
}
else
{
#ifdef G_OS_WIN32
- Sleep (backoff_msecs * 2 << dbi_conn->error_repeat);
+ Sleep (backoff_msecs * 2 << dbi_conn->error_repeat);
#else
- usleep (backoff_usecs * 2 << dbi_conn->error_repeat);
+ usleep (backoff_usecs * 2 << dbi_conn->error_repeat);
#endif
- PINFO( "DBI error: %s - Reconnecting...\n", msg );
+ PINFO ("DBI error: %s - Reconnecting...\n", msg);
if (dbi_conn)
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_CANT_CONNECT, 1, TRUE );
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_CANT_CONNECT, 1, TRUE);
dbi_conn->conn_ok = TRUE;
- (void)dbi_conn_connect( conn );
+ (void)dbi_conn_connect (conn);
}
}
else // Any other error
{
- PERR( "DBI error: %s\n", msg );
+ PERR ("DBI error: %s\n", msg);
if (dbi_conn)
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_MISC, 0, FALSE );
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_MISC, 0, FALSE);
}
}
@@ -548,52 +553,53 @@ mysql_error_fn( dbi_conn conn, void* user_data )
* @return TRUE if successful, FALSE if error
*/
static gboolean
-set_standard_connection_options( QofBackend* qbe, dbi_conn conn, const gchar* host, int port,
- const gchar* dbname, const gchar* username, const gchar* password )
+set_standard_connection_options (QofBackend* qbe, dbi_conn conn,
+ const gchar* host, int port,
+ const gchar* dbname, const gchar* username, const gchar* password)
{
gint result;
- result = dbi_conn_set_option( conn, "host", host );
- if ( result < 0 )
+ result = dbi_conn_set_option (conn, "host", host);
+ if (result < 0)
{
- PERR( "Error setting 'host' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'host' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
return FALSE;
}
- result = dbi_conn_set_option_numeric( conn, "port", port );
- if ( result < 0 )
+ result = dbi_conn_set_option_numeric (conn, "port", port);
+ if (result < 0)
{
- PERR( "Error setting 'port' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'port' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
return FALSE;
}
- result = dbi_conn_set_option( conn, "dbname", dbname );
- if ( result < 0 )
+ result = dbi_conn_set_option (conn, "dbname", dbname);
+ if (result < 0)
{
- PERR( "Error setting 'dbname' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'dbname' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
return FALSE;
}
- result = dbi_conn_set_option( conn, "username", username );
- if ( result < 0 )
+ result = dbi_conn_set_option (conn, "username", username);
+ if (result < 0)
{
- PERR( "Error setting 'username' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'username' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
return FALSE;
}
- result = dbi_conn_set_option( conn, "password", password );
- if ( result < 0 )
+ result = dbi_conn_set_option (conn, "password", password);
+ if (result < 0)
{
- PERR( "Error setting 'password' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'password' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
return FALSE;
}
- result = dbi_conn_set_option( conn, "encoding", "UTF-8" );
- if ( result < 0 )
+ result = dbi_conn_set_option (conn, "encoding", "UTF-8");
+ if (result < 0)
{
- PERR( "Error setting 'encoding' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'encoding' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
return FALSE;
}
@@ -602,217 +608,221 @@ set_standard_connection_options( QofBackend* qbe, dbi_conn conn, const gchar* ho
static gboolean
-gnc_dbi_lock_database ( QofBackend* qbe, gboolean ignore_lock )
+gnc_dbi_lock_database (QofBackend* qbe, gboolean ignore_lock)
{
- GncDbiBackend *qe = (GncDbiBackend*)qbe;
+ GncDbiBackend* qe = (GncDbiBackend*)qbe;
dbi_conn dcon = qe->conn;
dbi_result result;
- const gchar *dbname = dbi_conn_get_option( dcon, "dbname" );
+ const gchar* dbname = dbi_conn_get_option (dcon, "dbname");
/* Create the table if it doesn't exist */
- result = dbi_conn_get_table_list( dcon, dbname, lock_table);
- if (!( result && dbi_result_get_numrows( result ) ))
+ result = dbi_conn_get_table_list (dcon, dbname, lock_table);
+ if (! (result && dbi_result_get_numrows (result)))
{
- if ( result )
+ if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
- result = dbi_conn_queryf( dcon, "CREATE TABLE %s ( Hostname varchar(%d), PID int )", lock_table, GNC_HOST_NAME_MAX );
- if ( dbi_conn_error( dcon, NULL ) )
+ result = dbi_conn_queryf (dcon,
+ "CREATE TABLE %s ( Hostname varchar(%d), PID int )", lock_table,
+ GNC_HOST_NAME_MAX);
+ if (dbi_conn_error (dcon, NULL))
{
- const gchar *errstr;
- dbi_conn_error( dcon, &errstr );
- PERR( "Error %s creating lock table", errstr );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
- if ( result )
+ const gchar* errstr;
+ dbi_conn_error (dcon, &errstr);
+ PERR ("Error %s creating lock table", errstr);
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
+ if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
return FALSE;
}
- if ( result )
+ if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
}
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
/* Protect everything with a single transaction to prevent races */
- if ( (result = dbi_conn_query( dcon, "BEGIN" )) )
+ if ((result = dbi_conn_query (dcon, "BEGIN")))
{
/* Check for an existing entry; delete it if ignore_lock is true, otherwise fail */
gchar hostname[ GNC_HOST_NAME_MAX + 1 ];
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
- result = dbi_conn_queryf( dcon, "SELECT * FROM %s", lock_table );
- if ( result && dbi_result_get_numrows( result ) )
+ result = dbi_conn_queryf (dcon, "SELECT * FROM %s", lock_table);
+ if (result && dbi_result_get_numrows (result))
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
- if ( !ignore_lock )
+ if (!ignore_lock)
{
- qof_backend_set_error( qbe, ERR_BACKEND_LOCKED );
+ qof_backend_set_error (qbe, ERR_BACKEND_LOCKED);
/* FIXME: After enhancing the qof_backend_error mechanism, report in the dialog what is the hostname of the machine holding the lock. */
- dbi_conn_query( dcon, "ROLLBACK" );
+ dbi_conn_query (dcon, "ROLLBACK");
return FALSE;
}
- result = dbi_conn_queryf( dcon, "DELETE FROM %s", lock_table );
- if ( !result)
+ result = dbi_conn_queryf (dcon, "DELETE FROM %s", lock_table);
+ if (!result)
{
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
- qof_backend_set_message( qbe, "Failed to delete lock record" );
- result = dbi_conn_query( dcon, "ROLLBACK" );
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
+ qof_backend_set_message (qbe, "Failed to delete lock record");
+ result = dbi_conn_query (dcon, "ROLLBACK");
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
return FALSE;
}
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
}
/* Add an entry and commit the transaction */
- memset( hostname, 0, sizeof(hostname) );
- gethostname( hostname, GNC_HOST_NAME_MAX );
- result = dbi_conn_queryf( dcon,
+ memset (hostname, 0, sizeof (hostname));
+ gethostname (hostname, GNC_HOST_NAME_MAX);
+ result = dbi_conn_queryf (dcon,
"INSERT INTO %s VALUES ('%s', '%d')",
- lock_table, hostname, (int)GETPID() );
- if ( !result)
+ lock_table, hostname, (int)GETPID ());
+ if (!result)
{
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
- qof_backend_set_message( qbe, "Failed to create lock record" );
- result = dbi_conn_query( dcon, "ROLLBACK" );
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
+ qof_backend_set_message (qbe, "Failed to create lock record");
+ result = dbi_conn_query (dcon, "ROLLBACK");
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
return FALSE;
}
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
- result = dbi_conn_query( dcon, "COMMIT" );
+ result = dbi_conn_query (dcon, "COMMIT");
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
return TRUE;
}
/* Couldn't get a transaction (probably couldn't get a lock), so fail */
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
- qof_backend_set_message( qbe, "SQL Backend failed to obtain a transaction" );
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
+ qof_backend_set_message (qbe, "SQL Backend failed to obtain a transaction");
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
return FALSE;
}
static void
-gnc_dbi_unlock( QofBackend *qbe )
+gnc_dbi_unlock (QofBackend* qbe)
{
- GncDbiBackend *qe = (GncDbiBackend*)qbe;
+ GncDbiBackend* qe = (GncDbiBackend*)qbe;
dbi_conn dcon = qe->conn;
dbi_result result;
- const gchar *dbname = NULL;
+ const gchar* dbname = NULL;
- g_return_if_fail( dcon != NULL );
- g_return_if_fail( dbi_conn_error( dcon, NULL ) == 0 );
+ g_return_if_fail (dcon != NULL);
+ g_return_if_fail (dbi_conn_error (dcon, NULL) == 0);
- dbname = dbi_conn_get_option( dcon, "dbname" );
+ dbname = dbi_conn_get_option (dcon, "dbname");
/* Check if the lock table exists */
- g_return_if_fail( dbname != NULL );
- result = dbi_conn_get_table_list( dcon, dbname, lock_table);
- if (!( result && dbi_result_get_numrows( result ) ))
+ g_return_if_fail (dbname != NULL);
+ result = dbi_conn_get_table_list (dcon, dbname, lock_table);
+ if (! (result && dbi_result_get_numrows (result)))
{
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
- PWARN("No lock table in database, so not unlocking it.");
+ PWARN ("No lock table in database, so not unlocking it.");
return;
}
- dbi_result_free( result );
+ dbi_result_free (result);
- result = dbi_conn_query( dcon, "BEGIN" );
- if ( result )
+ result = dbi_conn_query (dcon, "BEGIN");
+ if (result)
{
/* Delete the entry if it's our hostname and PID */
gchar hostname[ GNC_HOST_NAME_MAX + 1 ];
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
- memset( hostname, 0, sizeof(hostname) );
- gethostname( hostname, GNC_HOST_NAME_MAX );
- result = dbi_conn_queryf( dcon, "SELECT * FROM %s WHERE Hostname = '%s' AND PID = '%d'", lock_table, hostname, (int)GETPID() );
- if ( result && dbi_result_get_numrows( result ) )
+ memset (hostname, 0, sizeof (hostname));
+ gethostname (hostname, GNC_HOST_NAME_MAX);
+ result = dbi_conn_queryf (dcon,
+ "SELECT * FROM %s WHERE Hostname = '%s' AND PID = '%d'", lock_table, hostname,
+ (int)GETPID ());
+ if (result && dbi_result_get_numrows (result))
{
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
- result = dbi_conn_queryf( dcon, "DELETE FROM %s", lock_table );
- if ( !result)
+ result = dbi_conn_queryf (dcon, "DELETE FROM %s", lock_table);
+ if (!result)
{
- PERR("Failed to delete the lock entry");
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
- result = dbi_conn_query( dcon, "ROLLBACK" );
+ PERR ("Failed to delete the lock entry");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
+ result = dbi_conn_query (dcon, "ROLLBACK");
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
return;
}
else
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
- result = dbi_conn_query( dcon, "COMMIT" );
+ result = dbi_conn_query (dcon, "COMMIT");
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
return;
}
- result = dbi_conn_query( dcon, "ROLLBACK" );
+ result = dbi_conn_query (dcon, "ROLLBACK");
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
- PWARN("There was no lock entry in the Lock table");
+ PWARN ("There was no lock entry in the Lock table");
return;
}
if (result)
{
- dbi_result_free( result );
+ dbi_result_free (result);
result = NULL;
}
- PWARN("Unable to get a lock on LOCK, so failed to clear the lock entry.");
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PWARN ("Unable to get a lock on LOCK, so failed to clear the lock entry.");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
}
#define SQL_OPTION_TO_REMOVE "NO_ZERO_DATE"
@@ -880,11 +890,11 @@ adjust_sql_options (dbi_conn connection)
}
static void
-gnc_dbi_mysql_session_begin( QofBackend* qbe, QofSession *session,
- const gchar *book_id, gboolean ignore_lock,
- gboolean create, gboolean force )
+gnc_dbi_mysql_session_begin (QofBackend* qbe, QofSession* session,
+ const gchar* book_id, gboolean ignore_lock,
+ gboolean create, gboolean force)
{
- GncDbiBackend *be = (GncDbiBackend*)qbe;
+ GncDbiBackend* be = (GncDbiBackend*)qbe;
gchar* protocol = NULL;
gchar* host = NULL;
gchar* dbname = NULL;
@@ -897,253 +907,258 @@ gnc_dbi_mysql_session_begin( QofBackend* qbe, QofSession *session,
gboolean success = FALSE;
GncDbiTestResult dbi_test_result = GNC_DBI_PASS;
- g_return_if_fail( qbe != NULL );
- g_return_if_fail( session != NULL );
- g_return_if_fail( book_id != NULL );
+ g_return_if_fail (qbe != NULL);
+ g_return_if_fail (session != NULL);
+ g_return_if_fail (book_id != NULL);
ENTER (" ");
/* Split the book-id
* Format is protocol://username:password@hostname:port/dbname
where username, password and port are optional) */
- gnc_uri_get_components ( book_id, &protocol, &host, &portnum,
- &username, &password, &dbname );
+ gnc_uri_get_components (book_id, &protocol, &host, &portnum,
+ &username, &password, &dbname);
// Try to connect to the db. If it doesn't exist and the create
// flag is TRUE, we'll need to connect to the 'mysql' db and execute the
// CREATE DATABASE ddl statement there.
- if ( be->conn != NULL )
+ if (be->conn != NULL)
{
- dbi_conn_close( be->conn );
+ dbi_conn_close (be->conn);
}
#if HAVE_LIBDBI_R
if (dbi_instance)
- be->conn = dbi_conn_new_r( "mysql", dbi_instance );
+ be->conn = dbi_conn_new_r ("mysql", dbi_instance);
else
PERR ("Attempt to connect with an uninitialized dbi_instance");
#else
- be->conn = dbi_conn_new( "mysql" );
+ be->conn = dbi_conn_new ("mysql");
#endif
- if ( be->conn == NULL )
+ if (be->conn == NULL)
{
- PERR( "Unable to create mysql dbi connection\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_BAD_URL );
+ PERR ("Unable to create mysql dbi connection\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_BAD_URL);
goto exit;
}
- dbi_conn_error_handler( be->conn, mysql_error_fn, be );
- if ( !set_standard_connection_options( qbe, be->conn, host, portnum, dbname, username, password ) )
+ dbi_conn_error_handler (be->conn, mysql_error_fn, be);
+ if (!set_standard_connection_options (qbe, be->conn, host, portnum, dbname,
+ username, password))
{
goto exit;
}
be->exists = TRUE;
- result = dbi_conn_connect( be->conn );
- if ( result == 0 )
+ result = dbi_conn_connect (be->conn);
+ if (result == 0)
{
- adjust_sql_options( be->conn );
- dbi_test_result = conn_test_dbi_library( be->conn );
- switch ( dbi_test_result )
+ adjust_sql_options (be->conn);
+ dbi_test_result = conn_test_dbi_library (be->conn);
+ switch (dbi_test_result)
{
case GNC_DBI_PASS:
break;
case GNC_DBI_FAIL_SETUP:
- qof_backend_set_error( qbe, ERR_SQL_DBI_UNTESTABLE );
- qof_backend_set_message( qbe,
- "DBI library large number test incomplete" );
+ qof_backend_set_error (qbe, ERR_SQL_DBI_UNTESTABLE);
+ qof_backend_set_message (qbe,
+ "DBI library large number test incomplete");
break;
case GNC_DBI_FAIL_TEST:
- qof_backend_set_error( qbe, ERR_SQL_BAD_DBI );
- qof_backend_set_message( qbe,
- "DBI library fails large number test" );
+ qof_backend_set_error (qbe, ERR_SQL_BAD_DBI);
+ qof_backend_set_message (qbe,
+ "DBI library fails large number test");
break;
}
- if ( GNC_DBI_PASS != dbi_test_result )
+ if (GNC_DBI_PASS != dbi_test_result)
{
goto exit;
}
- if (create && !force && save_may_clobber_data( qbe ) )
+ if (create && !force && save_may_clobber_data (qbe))
{
- qof_backend_set_error ( qbe, ERR_BACKEND_STORE_EXISTS );
- PWARN("Databse already exists, Might clobber it.");
+ qof_backend_set_error (qbe, ERR_BACKEND_STORE_EXISTS);
+ PWARN ("Databse already exists, Might clobber it.");
goto exit;
}
- success = gnc_dbi_lock_database ( qbe, ignore_lock );
+ success = gnc_dbi_lock_database (qbe, ignore_lock);
}
else
{
- if ( be->exists )
+ if (be->exists)
{
- PERR( "Unable to connect to database '%s'\n", dbname );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Unable to connect to database '%s'\n", dbname);
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
// The db does not already exist. Connect to the 'mysql' db and try to create it.
- if ( create )
+ if (create)
{
dbi_result dresult;
- result = dbi_conn_set_option( be->conn, "dbname", "mysql" );
- if ( result < 0 )
+ result = dbi_conn_set_option (be->conn, "dbname", "mysql");
+ if (result < 0)
{
- PERR( "Error setting 'dbname' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'dbname' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- result = dbi_conn_connect( be->conn );
- if ( result < 0 )
+ result = dbi_conn_connect (be->conn);
+ if (result < 0)
{
- PERR( "Unable to connect to 'mysql' database\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Unable to connect to 'mysql' database\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- adjust_sql_options( be->conn );
- dresult = dbi_conn_queryf( be->conn, "CREATE DATABASE %s CHARACTER SET utf8", dbname );
- if ( dresult == NULL )
+ adjust_sql_options (be->conn);
+ dresult = dbi_conn_queryf (be->conn, "CREATE DATABASE %s CHARACTER SET utf8",
+ dbname);
+ if (dresult == NULL)
{
- PERR( "Unable to create database '%s'\n", dbname );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Unable to create database '%s'\n", dbname);
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- dbi_conn_close( be->conn );
+ dbi_conn_close (be->conn);
// Try again to connect to the db
- #if HAVE_LIBDBI_R
- if (dbi_instance)
- be->conn = dbi_conn_new_r( "mysql", dbi_instance );
- else
- PERR ("Attempt to connect with an uninitialized dbi_instance");
- #else
- be->conn = dbi_conn_new( "mysql" );
- #endif
-
- if ( be->conn == NULL )
+#if HAVE_LIBDBI_R
+ if (dbi_instance)
+ be->conn = dbi_conn_new_r ("mysql", dbi_instance);
+ else
+ PERR ("Attempt to connect with an uninitialized dbi_instance");
+#else
+ be->conn = dbi_conn_new ("mysql");
+#endif
+
+ if (be->conn == NULL)
{
- PERR( "Unable to create mysql dbi connection\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_BAD_URL );
+ PERR ("Unable to create mysql dbi connection\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_BAD_URL);
goto exit;
}
- dbi_conn_error_handler( be->conn, mysql_error_fn, be );
- if ( !set_standard_connection_options( qbe, be->conn, host, 0, dbname, username, password ) )
+ dbi_conn_error_handler (be->conn, mysql_error_fn, be);
+ if (!set_standard_connection_options (qbe, be->conn, host, 0, dbname, username,
+ password))
{
goto exit;
}
- result = dbi_conn_connect( be->conn );
- if ( result < 0 )
+ result = dbi_conn_connect (be->conn);
+ if (result < 0)
{
- PERR( "Unable to create database '%s'\n", dbname );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Unable to create database '%s'\n", dbname);
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- adjust_sql_options( be->conn );
- dbi_test_result = conn_test_dbi_library( be->conn );
- switch ( dbi_test_result )
+ adjust_sql_options (be->conn);
+ dbi_test_result = conn_test_dbi_library (be->conn);
+ switch (dbi_test_result)
{
case GNC_DBI_PASS:
break;
case GNC_DBI_FAIL_SETUP:
- qof_backend_set_error( qbe, ERR_SQL_DBI_UNTESTABLE );
- qof_backend_set_message( qbe,
- "MySql: Failed to setup for large number test" );
+ qof_backend_set_error (qbe, ERR_SQL_DBI_UNTESTABLE);
+ qof_backend_set_message (qbe,
+ "MySql: Failed to setup for large number test");
break;
case GNC_DBI_FAIL_TEST:
- qof_backend_set_error( qbe, ERR_SQL_BAD_DBI );
- qof_backend_set_message( qbe,
- "MySql DBI library fails large number test" );
+ qof_backend_set_error (qbe, ERR_SQL_BAD_DBI);
+ qof_backend_set_message (qbe,
+ "MySql DBI library fails large number test");
break;
}
- if ( dbi_test_result != GNC_DBI_PASS )
+ if (dbi_test_result != GNC_DBI_PASS)
{
- dbi_conn_queryf( be->conn, "DROP DATABASE %s", dbname );
+ dbi_conn_queryf (be->conn, "DROP DATABASE %s", dbname);
goto exit;
}
- success = gnc_dbi_lock_database ( qbe, ignore_lock );
+ success = gnc_dbi_lock_database (qbe, ignore_lock);
}
else
{
- qof_backend_set_error( qbe, ERR_BACKEND_NO_SUCH_DB );
- qof_backend_set_message( qbe, "Database %s not found", dbname );
+ qof_backend_set_error (qbe, ERR_BACKEND_NO_SUCH_DB);
+ qof_backend_set_message (qbe, "Database %s not found", dbname);
}
}
- if ( success )
+ if (success)
{
dbi_result dresult;
- if ( be->sql_be.conn != NULL )
+ if (be->sql_be.conn != NULL)
{
- gnc_sql_connection_dispose( be->sql_be.conn );
+ gnc_sql_connection_dispose (be->sql_be.conn);
}
- be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_MYSQL, qbe, be->conn );
+ be->sql_be.conn = create_dbi_connection (GNC_DBI_PROVIDER_MYSQL, qbe,
+ be->conn);
}
be->sql_be.timespec_format = MYSQL_TIMESPEC_STR_FORMAT;
/* We should now have a proper session set up.
* Let's start logging */
- basename = g_strjoin("_", protocol, host, username, dbname, NULL);
+ basename = g_strjoin ("_", protocol, host, username, dbname, NULL);
translog_path = gnc_build_translog_path (basename);
xaccLogSetBaseName (translog_path);
PINFO ("logpath=%s", translog_path ? translog_path : "(null)");
exit:
- g_free( protocol );
- g_free( host );
- g_free( username );
- g_free( password );
- g_free( basename );
- g_free( translog_path );
- g_free( dbname );
+ g_free (protocol);
+ g_free (host);
+ g_free (username);
+ g_free (password);
+ g_free (basename);
+ g_free (translog_path);
+ g_free (dbname);
LEAVE (" ");
}
static GSList*
-conn_get_index_list_mysql( dbi_conn conn )
+conn_get_index_list_mysql (dbi_conn conn)
{
- GSList *index_list = NULL;
+ GSList* index_list = NULL;
dbi_result table_list;
- const char *errmsg;
- const gchar *dbname = dbi_conn_get_option( conn, "dbname" );
- g_return_val_if_fail( conn != NULL, NULL );
- table_list = dbi_conn_get_table_list( conn, dbname, NULL );
- if ( dbi_conn_error( conn, &errmsg ) != DBI_ERROR_NONE )
+ const char* errmsg;
+ const gchar* dbname = dbi_conn_get_option (conn, "dbname");
+ g_return_val_if_fail (conn != NULL, NULL);
+ table_list = dbi_conn_get_table_list (conn, dbname, NULL);
+ if (dbi_conn_error (conn, &errmsg) != DBI_ERROR_NONE)
{
- g_print( "Table Retrieval Error: %s\n", errmsg );
+ g_print ("Table Retrieval Error: %s\n", errmsg);
return NULL;
}
- while ( dbi_result_next_row( table_list ) != 0 )
+ while (dbi_result_next_row (table_list) != 0)
{
dbi_result result;
- const gchar *table_name = dbi_result_get_string_idx( table_list, 1 );
- result = dbi_conn_queryf( conn,
+ const gchar* table_name = dbi_result_get_string_idx (table_list, 1);
+ result = dbi_conn_queryf (conn,
"SHOW INDEXES IN %s WHERE Key_name != 'PRIMARY'",
- table_name );
- if ( dbi_conn_error( conn, &errmsg ) != DBI_ERROR_NONE )
+ table_name);
+ if (dbi_conn_error (conn, &errmsg) != DBI_ERROR_NONE)
{
- g_print( "Index Table Retrieval Error: %s\n", errmsg );
+ g_print ("Index Table Retrieval Error: %s\n", errmsg);
continue;
}
- while ( dbi_result_next_row( result ) != 0 )
+ while (dbi_result_next_row (result) != 0)
{
- const gchar* index_name = dbi_result_get_string_idx( result, 3 );
- index_list = g_slist_prepend( index_list, g_strjoin( " ", index_name, table_name, NULL ) );
+ const gchar* index_name = dbi_result_get_string_idx (result, 3);
+ index_list = g_slist_prepend (index_list, g_strjoin (" ", index_name,
+ table_name, NULL));
}
- dbi_result_free( result );
+ dbi_result_free (result);
}
return index_list;
}
static void
-conn_drop_index_mysql (dbi_conn conn, const gchar *index )
+conn_drop_index_mysql (dbi_conn conn, const gchar* index)
{
dbi_result result;
- gchar **index_table_split = g_strsplit (index, " ", 2);
+ gchar** index_table_split = g_strsplit (index, " ", 2);
int splitlen = -1;
/* Check if the index split can be valid */
@@ -1152,23 +1167,24 @@ conn_drop_index_mysql (dbi_conn conn, const gchar *index )
if (splitlen != 2)
{
- g_print ("Drop index error: invalid MySQL index format (<index> <table>): %s", index);
+ g_print ("Drop index error: invalid MySQL index format (<index> <table>): %s",
+ index);
return;
}
result = dbi_conn_queryf (conn, "DROP INDEX %s ON %s",
index_table_split[0], index_table_split[1]);
- if ( result )
- dbi_result_free( result );
+ if (result)
+ dbi_result_free (result);
g_strfreev (index_table_split);
}
static void
-pgsql_error_fn( dbi_conn conn, void* user_data )
+pgsql_error_fn (dbi_conn conn, void* user_data)
{
- GncDbiBackend *be = (GncDbiBackend*)user_data;
- GncDbiSqlConnection *dbi_conn = (GncDbiSqlConnection*)be->sql_be.conn;
+ GncDbiBackend* be = (GncDbiBackend*)user_data;
+ GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)be->sql_be.conn;
const gchar* msg;
#ifdef G_OS_WIN32
const guint backoff_msecs = 1;
@@ -1176,66 +1192,68 @@ pgsql_error_fn( dbi_conn conn, void* user_data )
const guint backoff_usecs = 1000;
#endif
- (void)dbi_conn_error( conn, &msg );
- if ( g_str_has_prefix( msg, "FATAL: database" ) &&
- g_str_has_suffix( msg, "does not exist\n" ) )
+ (void)dbi_conn_error (conn, &msg);
+ if (g_str_has_prefix (msg, "FATAL: database") &&
+ g_str_has_suffix (msg, "does not exist\n"))
{
- PINFO( "DBI error: %s\n", msg );
+ PINFO ("DBI error: %s\n", msg);
be->exists = FALSE;
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_NO_SUCH_DB, 0, FALSE );
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_NO_SUCH_DB, 0, FALSE);
}
- else if ( g_strrstr( msg, "server closed the connection unexpectedly" ) ) // Connection lost
+ else if (g_strrstr (msg,
+ "server closed the connection unexpectedly")) // Connection lost
{
- if ( dbi_conn == NULL )
+ if (dbi_conn == NULL)
{
- PWARN( "DBI Error: Connection lost, connection pointer invalid");
+ PWARN ("DBI Error: Connection lost, connection pointer invalid");
return;
}
- PINFO( "DBI error: %s - Reconnecting...\n", msg );
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_CONN_LOST, 1, TRUE );
+ PINFO ("DBI error: %s - Reconnecting...\n", msg);
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_CONN_LOST, 1, TRUE);
dbi_conn->conn_ok = TRUE;
- (void)dbi_conn_connect( conn );
+ (void)dbi_conn_connect (conn);
}
- else if ( dbi_conn &&
- ( g_str_has_prefix( msg, "connection pointer is NULL" ) ||
- g_str_has_prefix(msg, "could not connect to server" ) ) ) // No connection
+ else if (dbi_conn &&
+ (g_str_has_prefix (msg, "connection pointer is NULL") ||
+ g_str_has_prefix (msg, "could not connect to server"))) // No connection
{
- if (dbi_conn->error_repeat >= DBI_MAX_CONN_ATTEMPTS )
+ if (dbi_conn->error_repeat >= DBI_MAX_CONN_ATTEMPTS)
{
- PERR( "DBI error: %s - Giving up after %d consecutive attempts.\n", msg, DBI_MAX_CONN_ATTEMPTS );
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_CANT_CONNECT, 0, FALSE );
+ PERR ("DBI error: %s - Giving up after %d consecutive attempts.\n", msg,
+ DBI_MAX_CONN_ATTEMPTS);
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_CANT_CONNECT, 0, FALSE);
dbi_conn->conn_ok = FALSE;
}
else
{
#ifdef G_OS_WIN32
- Sleep (backoff_msecs * 2 << dbi_conn->error_repeat);
+ Sleep (backoff_msecs * 2 << dbi_conn->error_repeat);
#else
- usleep (backoff_usecs * 2 << dbi_conn->error_repeat);
+ usleep (backoff_usecs * 2 << dbi_conn->error_repeat);
#endif
- PINFO( "DBI error: %s - Reconnecting...\n", msg );
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_CANT_CONNECT, 1, TRUE );
+ PINFO ("DBI error: %s - Reconnecting...\n", msg);
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_CANT_CONNECT, 1, TRUE);
dbi_conn->conn_ok = TRUE;
- (void)dbi_conn_connect( conn );
+ (void)dbi_conn_connect (conn);
}
}
else
{
- PERR( "DBI error: %s\n", msg );
- gnc_dbi_set_error( dbi_conn, ERR_BACKEND_MISC, 0, FALSE );
+ PERR ("DBI error: %s\n", msg);
+ gnc_dbi_set_error (dbi_conn, ERR_BACKEND_MISC, 0, FALSE);
}
}
static void
-gnc_dbi_postgres_session_begin( QofBackend *qbe, QofSession *session,
- const gchar *book_id, gboolean ignore_lock,
- gboolean create, gboolean force )
+gnc_dbi_postgres_session_begin (QofBackend* qbe, QofSession* session,
+ const gchar* book_id, gboolean ignore_lock,
+ gboolean create, gboolean force)
{
- GncDbiBackend *be = (GncDbiBackend*)qbe;
+ GncDbiBackend* be = (GncDbiBackend*)qbe;
gint result = 0;
gchar* protocol = NULL;
gchar* host = NULL;
- gchar *dbname = NULL, *dbnamelc = NULL;
+ gchar* dbname = NULL, *dbnamelc = NULL;
gchar* username = NULL;
gchar* password = NULL;
gchar* basename = NULL;
@@ -1244,287 +1262,293 @@ gnc_dbi_postgres_session_begin( QofBackend *qbe, QofSession *session,
gint portnum = 0;
GncDbiTestResult dbi_test_result = GNC_DBI_PASS;
- g_return_if_fail( qbe != NULL );
- g_return_if_fail( session != NULL );
- g_return_if_fail( book_id != NULL );
+ g_return_if_fail (qbe != NULL);
+ g_return_if_fail (session != NULL);
+ g_return_if_fail (book_id != NULL);
ENTER (" ");
/* Split the book-id
* Format is protocol://username:password@hostname:port/dbname
where username, password and port are optional) */
- gnc_uri_get_components ( book_id, &protocol, &host, &portnum,
- &username, &password, &dbname );
- if ( portnum == 0 )
+ gnc_uri_get_components (book_id, &protocol, &host, &portnum,
+ &username, &password, &dbname);
+ if (portnum == 0)
portnum = PGSQL_DEFAULT_PORT;
/* Postgres's SQL interface coerces identifiers to lower case, but the
* C interface is case-sensitive. This results in a mixed-case dbname
* being created (with a lower case name) but then dbi can't conect to
* it. To work around this, coerce the name to lowercase first. */
- dbnamelc = g_utf8_strdown( dbname, -1 );
+ dbnamelc = g_utf8_strdown (dbname, -1);
// Try to connect to the db. If it doesn't exist and the create
// flag is TRUE, we'll need to connect to the 'postgres' db and execute the
// CREATE DATABASE ddl statement there.
- if ( be->conn != NULL )
+ if (be->conn != NULL)
{
- dbi_conn_close( be->conn );
+ dbi_conn_close (be->conn);
}
- #if HAVE_LIBDBI_R
+#if HAVE_LIBDBI_R
if (dbi_instance)
- be->conn = dbi_conn_new_r( "pgsql", dbi_instance );
+ be->conn = dbi_conn_new_r ("pgsql", dbi_instance);
else
PERR ("Attempt to connect with an uninitialized dbi_instance");
- #else
- be->conn = dbi_conn_new( "pgsql" );
- #endif
+#else
+ be->conn = dbi_conn_new ("pgsql");
+#endif
- if ( be->conn == NULL )
+ if (be->conn == NULL)
{
- PERR( "Unable to create pgsql dbi connection\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_BAD_URL );
+ PERR ("Unable to create pgsql dbi connection\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_BAD_URL);
goto exit;
}
- dbi_conn_error_handler( be->conn, pgsql_error_fn, be );
- if ( !set_standard_connection_options( qbe, be->conn, host, portnum, dbnamelc, username, password ) )
+ dbi_conn_error_handler (be->conn, pgsql_error_fn, be);
+ if (!set_standard_connection_options (qbe, be->conn, host, portnum, dbnamelc,
+ username, password))
{
goto exit;
}
be->exists = TRUE;
- result = dbi_conn_connect( be->conn );
- if ( result == 0 )
+ result = dbi_conn_connect (be->conn);
+ if (result == 0)
{
- dbi_test_result = conn_test_dbi_library( be->conn );
- switch ( dbi_test_result )
+ dbi_test_result = conn_test_dbi_library (be->conn);
+ switch (dbi_test_result)
{
case GNC_DBI_PASS:
break;
case GNC_DBI_FAIL_SETUP:
- qof_backend_set_error( qbe, ERR_SQL_DBI_UNTESTABLE );
- qof_backend_set_message( qbe,
- "Postgresql: Failed to setup for large number test" );
+ qof_backend_set_error (qbe, ERR_SQL_DBI_UNTESTABLE);
+ qof_backend_set_message (qbe,
+ "Postgresql: Failed to setup for large number test");
break;
case GNC_DBI_FAIL_TEST:
- qof_backend_set_error( qbe, ERR_SQL_BAD_DBI );
- qof_backend_set_message( qbe,
- "Postgresql DBI library fails large number test" );
+ qof_backend_set_error (qbe, ERR_SQL_BAD_DBI);
+ qof_backend_set_message (qbe,
+ "Postgresql DBI library fails large number test");
break;
}
- if ( dbi_test_result != GNC_DBI_PASS )
+ if (dbi_test_result != GNC_DBI_PASS)
{
goto exit;
}
- if (create && !force && save_may_clobber_data( qbe ) )
+ if (create && !force && save_may_clobber_data (qbe))
{
- qof_backend_set_error ( qbe, ERR_BACKEND_STORE_EXISTS );
- PWARN("Databse already exists, Might clobber it.");
+ qof_backend_set_error (qbe, ERR_BACKEND_STORE_EXISTS);
+ PWARN ("Databse already exists, Might clobber it.");
goto exit;
}
- success = gnc_dbi_lock_database ( qbe, ignore_lock );
+ success = gnc_dbi_lock_database (qbe, ignore_lock);
}
else
{
- if ( be->exists )
+ if (be->exists)
{
- PERR( "Unable to connect to database '%s'\n", dbname );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Unable to connect to database '%s'\n", dbname);
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
// The db does not already exist. Connect to the 'postgres' db and try to create it.
- if ( create )
+ if (create)
{
dbi_result dresult;
- result = dbi_conn_set_option( be->conn, "dbname", "postgres" );
- if ( result < 0 )
+ result = dbi_conn_set_option (be->conn, "dbname", "postgres");
+ if (result < 0)
{
- PERR( "Error setting 'dbname' option\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error setting 'dbname' option\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- result = dbi_conn_connect( be->conn );
- if ( result < 0 )
+ result = dbi_conn_connect (be->conn);
+ if (result < 0)
{
- PERR( "Unable to connect to 'postgres' database\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Unable to connect to 'postgres' database\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- dresult = dbi_conn_queryf( be->conn, "CREATE DATABASE %s WITH TEMPLATE template0 ENCODING 'UTF8'", dbnamelc );
- if ( dresult == NULL )
+ dresult = dbi_conn_queryf (be->conn,
+ "CREATE DATABASE %s WITH TEMPLATE template0 ENCODING 'UTF8'", dbnamelc);
+ if (dresult == NULL)
{
- PERR( "Unable to create database '%s'\n", dbname );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Unable to create database '%s'\n", dbname);
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- dbi_conn_queryf( be->conn, "ALTER DATABASE %s SET standard_conforming_strings TO on", dbnamelc );
- dbi_conn_close( be->conn );
+ dbi_conn_queryf (be->conn,
+ "ALTER DATABASE %s SET standard_conforming_strings TO on", dbnamelc);
+ dbi_conn_close (be->conn);
// Try again to connect to the db
- #if HAVE_LIBDBI_R
+#if HAVE_LIBDBI_R
if (dbi_instance)
- be->conn = dbi_conn_new_r( "pgsql", dbi_instance );
+ be->conn = dbi_conn_new_r ("pgsql", dbi_instance);
else
- PERR ("Attempt to connect with an uninitialized dbi_instance");
- #else
- be->conn = dbi_conn_new( "pgsql" );
- #endif
+ PERR ("Attempt to connect with an uninitialized dbi_instance");
+#else
+ be->conn = dbi_conn_new ("pgsql");
+#endif
- if ( be->conn == NULL )
+ if (be->conn == NULL)
{
- PERR( "Unable to create pgsql dbi connection\n" );
- qof_backend_set_error( qbe, ERR_BACKEND_BAD_URL );
+ PERR ("Unable to create pgsql dbi connection\n");
+ qof_backend_set_error (qbe, ERR_BACKEND_BAD_URL);
goto exit;
}
- dbi_conn_error_handler( be->conn, pgsql_error_fn, be );
- if ( !set_standard_connection_options( qbe, be->conn, host, PGSQL_DEFAULT_PORT, dbnamelc, username, password ) )
+ dbi_conn_error_handler (be->conn, pgsql_error_fn, be);
+ if (!set_standard_connection_options (qbe, be->conn, host, PGSQL_DEFAULT_PORT,
+ dbnamelc, username, password))
{
goto exit;
}
- result = dbi_conn_connect( be->conn );
- if ( result < 0 )
+ result = dbi_conn_connect (be->conn);
+ if (result < 0)
{
- PERR( "Unable to create database '%s'\n", dbname );
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Unable to create database '%s'\n", dbname);
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
goto exit;
}
- dbi_test_result = conn_test_dbi_library( be->conn );
- switch ( dbi_test_result )
+ dbi_test_result = conn_test_dbi_library (be->conn);
+ switch (dbi_test_result)
{
case GNC_DBI_PASS:
break;
case GNC_DBI_FAIL_SETUP:
- qof_backend_set_error( qbe, ERR_SQL_DBI_UNTESTABLE );
- qof_backend_set_message( qbe,
- "DBI library large number test incomplete" );
+ qof_backend_set_error (qbe, ERR_SQL_DBI_UNTESTABLE);
+ qof_backend_set_message (qbe,
+ "DBI library large number test incomplete");
break;
case GNC_DBI_FAIL_TEST:
- qof_backend_set_error( qbe, ERR_SQL_BAD_DBI );
- qof_backend_set_message( qbe,
- "DBI library fails large number test" );
+ qof_backend_set_error (qbe, ERR_SQL_BAD_DBI);
+ qof_backend_set_message (qbe,
+ "DBI library fails large number test");
break;
}
- if ( GNC_DBI_PASS != dbi_test_result )
+ if (GNC_DBI_PASS != dbi_test_result)
{
- dbi_conn_select_db( be->conn, "template1" );
- dbi_conn_queryf( be->conn, "DROP DATABASE %s", dbnamelc );
+ dbi_conn_select_db (be->conn, "template1");
+ dbi_conn_queryf (be->conn, "DROP DATABASE %s", dbnamelc);
goto exit;
}
- success = gnc_dbi_lock_database ( qbe, ignore_lock );
+ success = gnc_dbi_lock_database (qbe, ignore_lock);
}
else
{
- qof_backend_set_error( qbe, ERR_BACKEND_NO_SUCH_DB );
- qof_backend_set_message( qbe, "Database %s not found", dbname );
+ qof_backend_set_error (qbe, ERR_BACKEND_NO_SUCH_DB);
+ qof_backend_set_message (qbe, "Database %s not found", dbname);
}
}
- if ( success )
+ if (success)
{
- if ( be->sql_be.conn != NULL )
+ if (be->sql_be.conn != NULL)
{
- gnc_sql_connection_dispose( be->sql_be.conn );
+ gnc_sql_connection_dispose (be->sql_be.conn);
}
- be->sql_be.conn = create_dbi_connection( GNC_DBI_PROVIDER_PGSQL, qbe, be->conn );
+ be->sql_be.conn = create_dbi_connection (GNC_DBI_PROVIDER_PGSQL, qbe,
+ be->conn);
}
be->sql_be.timespec_format = PGSQL_TIMESPEC_STR_FORMAT;
/* We should now have a proper session set up.
* Let's start logging */
- basename = g_strjoin("_", protocol, host, username, dbname, NULL);
+ basename = g_strjoin ("_", protocol, host, username, dbname, NULL);
translog_path = gnc_build_translog_path (basename);
xaccLogSetBaseName (translog_path);
PINFO ("logpath=%s", translog_path ? translog_path : "(null)");
exit:
- g_free( protocol );
- g_free( host );
- g_free( username );
- g_free( password );
- g_free( basename );
- g_free( translog_path );
- g_free( dbname );
- g_free( dbnamelc );
+ g_free (protocol);
+ g_free (host);
+ g_free (username);
+ g_free (password);
+ g_free (basename);
+ g_free (translog_path);
+ g_free (dbname);
+ g_free (dbnamelc);
LEAVE (" ");
}
static GSList*
-conn_get_index_list_pgsql( dbi_conn conn )
+conn_get_index_list_pgsql (dbi_conn conn)
{
- GSList *list = NULL;
- const gchar *errmsg;
+ GSList* list = NULL;
+ const gchar* errmsg;
dbi_result result;
- PINFO ( "Retrieving postgres index list\n");
- result = dbi_conn_query( conn, "SELECT relname FROM pg_class AS a INNER JOIN pg_index AS b ON (b.indexrelid = a.oid) INNER JOIN pg_namespace AS c ON (a.relnamespace = c.oid) WHERE reltype = '0' AND indisprimary = 'f' AND nspname = 'public'" );
- if ( dbi_conn_error( conn, &errmsg ) != DBI_ERROR_NONE )
+ PINFO ("Retrieving postgres index list\n");
+ result = dbi_conn_query (conn,
+ "SELECT relname FROM pg_class AS a INNER JOIN pg_index AS b ON (b.indexrelid = a.oid) INNER JOIN pg_namespace AS c ON (a.relnamespace = c.oid) WHERE reltype = '0' AND indisprimary = 'f' AND nspname = 'public'");
+ if (dbi_conn_error (conn, &errmsg) != DBI_ERROR_NONE)
{
- g_print( "Index Table Retrieval Error: %s\n", errmsg );
+ g_print ("Index Table Retrieval Error: %s\n", errmsg);
return NULL;
}
- while ( dbi_result_next_row( result ) != 0 )
+ while (dbi_result_next_row (result) != 0)
{
const gchar* index_name;
- index_name = dbi_result_get_string_idx( result, 1 );
- list = g_slist_prepend( list, strdup( index_name ) );
+ index_name = dbi_result_get_string_idx (result, 1);
+ list = g_slist_prepend (list, strdup (index_name));
}
- dbi_result_free( result );
+ dbi_result_free (result);
return list;
}
static void
-conn_drop_index_pgsql (dbi_conn conn, const gchar *index )
+conn_drop_index_pgsql (dbi_conn conn, const gchar* index)
{
dbi_result result = dbi_conn_queryf (conn, "DROP INDEX %s", index);
- if ( result )
- dbi_result_free( result );
+ if (result)
+ dbi_result_free (result);
}
/* ================================================================= */
static void
-gnc_dbi_session_end( QofBackend *be_start )
+gnc_dbi_session_end (QofBackend* be_start)
{
- GncDbiBackend *be = (GncDbiBackend*)be_start;
+ GncDbiBackend* be = (GncDbiBackend*)be_start;
- g_return_if_fail( be_start != NULL );
+ g_return_if_fail (be_start != NULL);
ENTER (" ");
- if ( be->conn != NULL )
+ if (be->conn != NULL)
{
- gnc_dbi_unlock( be_start );
- dbi_conn_close( be->conn );
+ gnc_dbi_unlock (be_start);
+ dbi_conn_close (be->conn);
be->conn = NULL;
}
- if ( be->sql_be.conn != NULL )
+ if (be->sql_be.conn != NULL)
{
- gnc_sql_connection_dispose( be->sql_be.conn );
+ gnc_sql_connection_dispose (be->sql_be.conn);
be->sql_be.conn = NULL;
}
- gnc_sql_finalize_version_info( &be->sql_be );
+ gnc_sql_finalize_version_info (&be->sql_be);
LEAVE (" ");
}
static void
-gnc_dbi_destroy_backend( QofBackend *be )
+gnc_dbi_destroy_backend (QofBackend* be)
{
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
/* Stop transaction logging */
xaccLogSetBaseName (NULL);
- qof_backend_destroy( be );
+ qof_backend_destroy (be);
- g_free( be );
+ g_free (be);
}
/* ================================================================= */
@@ -1539,54 +1563,55 @@ gnc_dbi_destroy_backend( QofBackend *be )
* both values to match this version of Gnucash.
*/
static void
-gnc_dbi_load( QofBackend* qbe, QofBook *book, QofBackendLoadType loadType )
+gnc_dbi_load (QofBackend* qbe, QofBook* book, QofBackendLoadType loadType)
{
- GncDbiBackend *be = (GncDbiBackend*)qbe;
+ GncDbiBackend* be = (GncDbiBackend*)qbe;
- g_return_if_fail( qbe != NULL );
- g_return_if_fail( book != NULL );
+ g_return_if_fail (qbe != NULL);
+ g_return_if_fail (book != NULL);
- ENTER( "be=%p, book=%p", be, book );
+ ENTER ("be=%p, book=%p", be, book);
- if ( loadType == LOAD_TYPE_INITIAL_LOAD )
+ if (loadType == LOAD_TYPE_INITIAL_LOAD)
{
- g_assert( be->primary_book == NULL );
+ g_assert (be->primary_book == NULL);
be->primary_book = book;
// Set up table version information
gnc_sql_init_version_info (&be->sql_be);
// Call all object backends to create any required tables
- qof_object_foreach_backend( GNC_SQL_BACKEND, create_tables_cb, be );
+ qof_object_foreach_backend (GNC_SQL_BACKEND, create_tables_cb, be);
}
- gnc_sql_load( &be->sql_be, book, loadType );
+ gnc_sql_load (&be->sql_be, book, loadType);
- if ( GNUCASH_RESAVE_VERSION > gnc_sql_get_table_version( &be->sql_be, "Gnucash" ) )
+ if (GNUCASH_RESAVE_VERSION > gnc_sql_get_table_version (&be->sql_be,
+ "Gnucash"))
{
/* The database was loaded with an older database schema or
* data semantics. In order to ensure consistency, the whole
* thing needs to be saved anew. */
- qof_backend_set_error( qbe, ERR_SQL_DB_TOO_OLD );
+ qof_backend_set_error (qbe, ERR_SQL_DB_TOO_OLD);
}
- else if ( GNUCASH_RESAVE_VERSION < gnc_sql_get_table_version( &be->sql_be,
- "Gnucash-Resave"))
+ else if (GNUCASH_RESAVE_VERSION < gnc_sql_get_table_version (&be->sql_be,
+ "Gnucash-Resave"))
{
/* Worse, the database was created with a newer version. We
* can't safely write to this database, so the user will have
* to do a "save as" to make one that we can write to.
*/
- qof_backend_set_error( qbe, ERR_SQL_DB_TOO_NEW );
+ qof_backend_set_error (qbe, ERR_SQL_DB_TOO_NEW);
}
- LEAVE( "" );
+ LEAVE ("");
}
/* ================================================================= */
static gboolean
-save_may_clobber_data( QofBackend* qbe )
+save_may_clobber_data (QofBackend* qbe)
{
GncDbiBackend* be = (GncDbiBackend*)qbe;
const gchar* dbname;
@@ -1594,41 +1619,41 @@ save_may_clobber_data( QofBackend* qbe )
gboolean retval = FALSE;
/* Data may be clobbered iff the number of tables != 0 */
- dbname = dbi_conn_get_option( be->conn, "dbname" );
- result = dbi_conn_get_table_list( be->conn, dbname, NULL );
- if ( result )
+ dbname = dbi_conn_get_option (be->conn, "dbname");
+ result = dbi_conn_get_table_list (be->conn, dbname, NULL);
+ if (result)
{
- retval = dbi_result_get_numrows( result ) > 0;
- dbi_result_free( result );
+ retval = dbi_result_get_numrows (result) > 0;
+ dbi_result_free (result);
}
return retval;
}
static dbi_result
-conn_table_manage_backup (GncDbiSqlConnection *conn,
- gchar *table_name, TableOpType op )
+conn_table_manage_backup (GncDbiSqlConnection* conn,
+ gchar* table_name, TableOpType op)
{
- gchar *new_name = g_strdup_printf( "%s_%s", table_name, "back" );
+ gchar* new_name = g_strdup_printf ("%s_%s", table_name, "back");
dbi_result result = NULL;
- switch ( op )
+ switch (op)
{
case backup:
- result = dbi_conn_queryf( conn->conn, "ALTER TABLE %s RENAME TO %s",
- table_name, new_name );
+ result = dbi_conn_queryf (conn->conn, "ALTER TABLE %s RENAME TO %s",
+ table_name, new_name);
break;
case rollback:
- result = dbi_conn_queryf( conn->conn,
+ result = dbi_conn_queryf (conn->conn,
"ALTER TABLE %s RENAME TO %s",
- new_name, table_name );
+ new_name, table_name);
break;
case drop_backup:
- result = dbi_conn_queryf( conn->conn, "DROP TABLE %s",
- new_name );
+ result = dbi_conn_queryf (conn->conn, "DROP TABLE %s",
+ new_name);
break;
default:
break;
}
- g_free( new_name );
+ g_free (new_name);
return result;
}
@@ -1658,69 +1683,69 @@ conn_table_manage_backup (GncDbiSqlConnection *conn,
*/
static gboolean
-conn_table_operation( GncSqlConnection *sql_conn, GSList *table_name_list,
- TableOpType op )
+conn_table_operation (GncSqlConnection* sql_conn, GSList* table_name_list,
+ TableOpType op)
{
GSList* node;
gboolean result = TRUE;
- GncDbiSqlConnection *conn = (GncDbiSqlConnection*)(sql_conn);
- GSList *full_table_name_list = NULL;
- const gchar *dbname = dbi_conn_get_option( conn->conn, "dbname" );
+ GncDbiSqlConnection* conn = (GncDbiSqlConnection*) (sql_conn);
+ GSList* full_table_name_list = NULL;
+ const gchar* dbname = dbi_conn_get_option (conn->conn, "dbname");
- g_return_val_if_fail( table_name_list != NULL, FALSE );
- if ( op == rollback )
+ g_return_val_if_fail (table_name_list != NULL, FALSE);
+ if (op == rollback)
full_table_name_list =
- conn->provider->get_table_list( conn->conn, dbname );
+ conn->provider->get_table_list (conn->conn, dbname);
- for ( node = table_name_list; node != NULL && result; node = node->next )
+ for (node = table_name_list; node != NULL && result; node = node->next)
{
gchar* table_name = (gchar*)node->data;
dbi_result result;
/* Ignore the lock table */
- if ( g_strcmp0(table_name, lock_table) == 0)
+ if (g_strcmp0 (table_name, lock_table) == 0)
{
continue;
}
do
{
- gnc_dbi_init_error( conn );
- switch ( op )
+ gnc_dbi_init_error (conn);
+ switch (op)
{
case rollback:
- if (g_slist_find(full_table_name_list, table_name))
+ if (g_slist_find (full_table_name_list, table_name))
{
- result = dbi_conn_queryf( conn->conn, "DROP TABLE %s",
- table_name );
- if ( result )
+ result = dbi_conn_queryf (conn->conn, "DROP TABLE %s",
+ table_name);
+ if (result)
break;
}
/* Fall through */
case backup:
case drop_backup:
- result = conn_table_manage_backup( conn, table_name, op );
+ result = conn_table_manage_backup (conn, table_name, op);
break;
case empty:
- result = dbi_conn_queryf( conn->conn, "DELETE FROM TABLE %s",
- table_name );
+ result = dbi_conn_queryf (conn->conn, "DELETE FROM TABLE %s",
+ table_name);
break;
case drop:
default:
- result = dbi_conn_queryf( conn->conn, "DROP TABLE %s",
- table_name );
+ result = dbi_conn_queryf (conn->conn, "DROP TABLE %s",
+ table_name);
break;
}
}
- while ( conn->retry );
- if ( result != NULL )
+ while (conn->retry);
+ if (result != NULL)
{
- if ( dbi_result_free( result ) < 0 )
+ if (dbi_result_free (result) < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
+ PERR ("Error in dbi_result_free() result\n");
result = FALSE;
}
}
}
- gnc_table_slist_free( full_table_name_list );
+ gnc_table_slist_free (full_table_name_list);
return result;
}
@@ -1734,101 +1759,102 @@ conn_table_operation( GncSqlConnection *sql_conn, GSList *table_name_list,
* @param book: QofBook to be saved in the database.
*/
static void
-gnc_dbi_safe_sync_all( QofBackend *qbe, QofBook *book )
+gnc_dbi_safe_sync_all (QofBackend* qbe, QofBook* book)
{
- GncDbiBackend *be = (GncDbiBackend*)qbe;
- GncDbiSqlConnection *conn = (GncDbiSqlConnection*)(((GncSqlBackend*)be)->conn);
- GSList *table_list, *index_list, *iter;
+ GncDbiBackend* be = (GncDbiBackend*)qbe;
+ GncDbiSqlConnection* conn = (GncDbiSqlConnection*) (((GncSqlBackend*)
+ be)->conn);
+ GSList* table_list, *index_list, *iter;
const gchar* dbname = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( book != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (book != NULL);
- ENTER( "book=%p, primary=%p", book, be->primary_book );
- dbname = dbi_conn_get_option( be->conn, "dbname" );
- table_list = conn->provider->get_table_list( conn->conn, dbname );
- if ( !conn_table_operation( (GncSqlConnection*)conn, table_list,
- backup ) )
+ ENTER ("book=%p, primary=%p", book, be->primary_book);
+ dbname = dbi_conn_get_option (be->conn, "dbname");
+ table_list = conn->provider->get_table_list (conn->conn, dbname);
+ if (!conn_table_operation ((GncSqlConnection*)conn, table_list,
+ backup))
{
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
- conn_table_operation( (GncSqlConnection*)conn, table_list,
- rollback );
- LEAVE( "Failed to rename tables" );
- gnc_table_slist_free( table_list );
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
+ conn_table_operation ((GncSqlConnection*)conn, table_list,
+ rollback);
+ LEAVE ("Failed to rename tables");
+ gnc_table_slist_free (table_list);
return;
}
- index_list = conn->provider->get_index_list( conn->conn );
- for ( iter = index_list; iter != NULL; iter = g_slist_next( iter) )
+ index_list = conn->provider->get_index_list (conn->conn);
+ for (iter = index_list; iter != NULL; iter = g_slist_next (iter))
{
- const char *errmsg;
- conn->provider->drop_index (conn->conn, static_cast<char*>(iter->data));
- if ( DBI_ERROR_NONE != dbi_conn_error( conn->conn, &errmsg ) )
+ const char* errmsg;
+ conn->provider->drop_index (conn->conn, static_cast<char*> (iter->data));
+ if (DBI_ERROR_NONE != dbi_conn_error (conn->conn, &errmsg))
{
- qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
- gnc_table_slist_free( index_list );
- conn_table_operation( (GncSqlConnection*)conn, table_list,
- rollback );
- gnc_table_slist_free( table_list );
- LEAVE( "Failed to drop indexes %s", errmsg );
+ qof_backend_set_error (qbe, ERR_BACKEND_SERVER_ERR);
+ gnc_table_slist_free (index_list);
+ conn_table_operation ((GncSqlConnection*)conn, table_list,
+ rollback);
+ gnc_table_slist_free (table_list);
+ LEAVE ("Failed to drop indexes %s", errmsg);
return;
}
}
- gnc_table_slist_free( index_list );
+ gnc_table_slist_free (index_list);
be->is_pristine_db = TRUE;
be->primary_book = book;
- gnc_sql_sync_all( &be->sql_be, book );
+ gnc_sql_sync_all (&be->sql_be, book);
if (qof_backend_check_error (qbe))
{
- conn_table_operation( (GncSqlConnection*)conn, table_list,
- rollback );
- LEAVE( "Failed to create new database tables" );
+ conn_table_operation ((GncSqlConnection*)conn, table_list,
+ rollback);
+ LEAVE ("Failed to create new database tables");
return;
}
- conn_table_operation( (GncSqlConnection*)conn, table_list,
- drop_backup );
- gnc_table_slist_free( table_list );
- LEAVE("book=%p", book);
+ conn_table_operation ((GncSqlConnection*)conn, table_list,
+ drop_backup);
+ gnc_table_slist_free (table_list);
+ LEAVE ("book=%p", book);
}
/* ================================================================= */
static void
-gnc_dbi_begin_edit( QofBackend *qbe, QofInstance *inst )
+gnc_dbi_begin_edit (QofBackend* qbe, QofInstance* inst)
{
GncDbiBackend* be = (GncDbiBackend*)qbe;
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (inst != NULL);
- gnc_sql_begin_edit( &be->sql_be, inst );
+ gnc_sql_begin_edit (&be->sql_be, inst);
}
static void
-gnc_dbi_rollback_edit( QofBackend *qbe, QofInstance *inst )
+gnc_dbi_rollback_edit (QofBackend* qbe, QofInstance* inst)
{
GncDbiBackend* be = (GncDbiBackend*)qbe;
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (inst != NULL);
- gnc_sql_rollback_edit( &be->sql_be, inst );
+ gnc_sql_rollback_edit (&be->sql_be, inst);
}
static void
-gnc_dbi_commit_edit( QofBackend *qbe, QofInstance *inst )
+gnc_dbi_commit_edit (QofBackend* qbe, QofInstance* inst)
{
GncDbiBackend* be = (GncDbiBackend*)qbe;
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (inst != NULL);
- gnc_sql_commit_edit( &be->sql_be, inst );
+ gnc_sql_commit_edit (&be->sql_be, inst);
}
/* ================================================================= */
static void
-init_sql_backend( GncDbiBackend* dbi_be )
+init_sql_backend (GncDbiBackend* dbi_be)
{
QofBackend* be;
@@ -1859,57 +1885,57 @@ init_sql_backend( GncDbiBackend* dbi_be )
be->export_fn = NULL;
- gnc_sql_init( &dbi_be->sql_be );
+ gnc_sql_init (&dbi_be->sql_be);
dbi_be->sql_be.conn = NULL;
dbi_be->sql_be.book = NULL;
}
static QofBackend*
-new_backend( void (*session_begin)( QofBackend *, QofSession *, const gchar *,
- gboolean,
- gboolean,
- gboolean ) )
+new_backend (void (*session_begin) (QofBackend*, QofSession*, const gchar*,
+ gboolean,
+ gboolean,
+ gboolean))
{
- GncDbiBackend *dbi_be;
- QofBackend *be;
+ GncDbiBackend* dbi_be;
+ QofBackend* be;
- dbi_be = g_new0( GncDbiBackend, 1 );
- g_assert( dbi_be != NULL );
+ dbi_be = g_new0 (GncDbiBackend, 1);
+ g_assert (dbi_be != NULL);
be = (QofBackend*)dbi_be;
- qof_backend_init( be );
+ qof_backend_init (be);
be->session_begin = session_begin;
- init_sql_backend( dbi_be );
+ init_sql_backend (dbi_be);
return be;
}
static QofBackend*
-gnc_dbi_backend_sqlite3_new( void )
+gnc_dbi_backend_sqlite3_new (void)
{
- return new_backend( gnc_dbi_sqlite3_session_begin );
+ return new_backend (gnc_dbi_sqlite3_session_begin);
}
static QofBackend*
-gnc_dbi_backend_mysql_new( void )
+gnc_dbi_backend_mysql_new (void)
{
- return new_backend( gnc_dbi_mysql_session_begin );
+ return new_backend (gnc_dbi_mysql_session_begin);
}
static QofBackend*
-gnc_dbi_backend_postgres_new( void )
+gnc_dbi_backend_postgres_new (void)
{
- return new_backend( gnc_dbi_postgres_session_begin );
+ return new_backend (gnc_dbi_postgres_session_begin);
}
static void
-gnc_dbi_provider_free( QofBackendProvider *prov )
+gnc_dbi_provider_free (QofBackendProvider* prov)
{
- g_return_if_fail( prov != NULL );
+ g_return_if_fail (prov != NULL);
- g_free( prov );
+ g_free (prov);
}
/*
@@ -1917,50 +1943,50 @@ gnc_dbi_provider_free( QofBackendProvider *prov )
*
*/
static gboolean
-gnc_dbi_check_sqlite3_file( const gchar *uri )
+gnc_dbi_check_sqlite3_file (const gchar* uri)
{
FILE* f;
gchar buf[50];
G_GNUC_UNUSED size_t chars_read;
gint status;
- gchar *filename;
+ gchar* filename;
// BAD if the path is null
- g_return_val_if_fail( uri != NULL, FALSE );
+ g_return_val_if_fail (uri != NULL, FALSE);
- filename = gnc_uri_get_path ( uri );
- f = g_fopen( filename, "r" );
- g_free ( filename );
+ filename = gnc_uri_get_path (uri);
+ f = g_fopen (filename, "r");
+ g_free (filename);
// OK if the file doesn't exist - new file
- if ( f == NULL )
+ if (f == NULL)
{
- PINFO( "doesn't exist (errno=%d) -> DBI", errno );
+ PINFO ("doesn't exist (errno=%d) -> DBI", errno);
return TRUE;
}
// OK if file has the correct header
- chars_read = fread( buf, sizeof(buf), 1, f );
- status = fclose( f );
- if ( status < 0 )
+ chars_read = fread (buf, sizeof (buf), 1, f);
+ status = fclose (f);
+ if (status < 0)
{
- PERR( "Error in fclose(): %d\n", errno );
+ PERR ("Error in fclose(): %d\n", errno);
}
- if ( g_str_has_prefix( buf, "SQLite format 3" ) )
+ if (g_str_has_prefix (buf, "SQLite format 3"))
{
- PINFO( "has SQLite format string -> DBI" );
+ PINFO ("has SQLite format string -> DBI");
return TRUE;
}
- PINFO( "exists, does not have SQLite format string -> not DBI" );
+ PINFO ("exists, does not have SQLite format string -> not DBI");
// Otherwise, BAD
return FALSE;
}
void
-gnc_module_init_backend_dbi(void)
+gnc_module_init_backend_dbi (void)
{
- QofBackendProvider *prov;
+ QofBackendProvider* prov;
const gchar* driver_dir;
int num_drivers;
gboolean have_sqlite3_driver = FALSE;
@@ -1969,118 +1995,118 @@ gnc_module_init_backend_dbi(void)
/* Initialize libdbi and see which drivers are available. Only register qof backends which
have drivers available. */
- driver_dir = g_getenv( "GNC_DBD_DIR" );
- if ( driver_dir == NULL )
+ driver_dir = g_getenv ("GNC_DBD_DIR");
+ if (driver_dir == NULL)
{
- PINFO( "GNC_DBD_DIR not set: using libdbi built-in default\n");
+ PINFO ("GNC_DBD_DIR not set: using libdbi built-in default\n");
}
/* dbi_initialize returns -1 in case of errors */
#if HAVE_LIBDBI_R
if (dbi_instance)
return;
- num_drivers = dbi_initialize_r( driver_dir, &dbi_instance );
+ num_drivers = dbi_initialize_r (driver_dir, &dbi_instance);
#else
- num_drivers = dbi_initialize( driver_dir );
+ num_drivers = dbi_initialize (driver_dir);
#endif
- if ( num_drivers <= 0 )
+ if (num_drivers <= 0)
{
- gchar *dir = g_build_filename(gnc_path_get_libdir(), "dbd", NULL);
+ gchar* dir = g_build_filename (gnc_path_get_libdir (), "dbd", NULL);
#if HAVE_LIBDBI_R
- if (dbi_instance)
- return;
- num_drivers = dbi_initialize_r( dir, &dbi_instance );
+ if (dbi_instance)
+ return;
+ num_drivers = dbi_initialize_r (dir, &dbi_instance);
#else
- num_drivers = dbi_initialize( dir );
+ num_drivers = dbi_initialize (dir);
#endif
- g_free (dir);
+ g_free (dir);
}
- if ( num_drivers <= 0 )
+ if (num_drivers <= 0)
{
- PWARN( "No DBD drivers found\n" );
+ PWARN ("No DBD drivers found\n");
}
else
{
dbi_driver driver = NULL;
- PINFO( "%d DBD drivers found\n", num_drivers );
+ PINFO ("%d DBD drivers found\n", num_drivers);
do
{
- #if HAVE_LIBDBI_R
- driver = dbi_driver_list_r( driver, dbi_instance );
- #else
- driver = dbi_driver_list( driver );
- #endif
+#if HAVE_LIBDBI_R
+ driver = dbi_driver_list_r (driver, dbi_instance);
+#else
+ driver = dbi_driver_list (driver);
+#endif
- if ( driver != NULL )
+ if (driver != NULL)
{
- const gchar* name = dbi_driver_get_name( driver );
+ const gchar* name = dbi_driver_get_name (driver);
- PINFO( "Driver: %s\n", name );
- if ( strcmp( name, "sqlite3" ) == 0 )
+ PINFO ("Driver: %s\n", name);
+ if (strcmp (name, "sqlite3") == 0)
{
have_sqlite3_driver = TRUE;
}
- else if ( strcmp( name, "mysql" ) == 0 )
+ else if (strcmp (name, "mysql") == 0)
{
have_mysql_driver = TRUE;
}
- else if ( strcmp( name, "pgsql" ) == 0 )
+ else if (strcmp (name, "pgsql") == 0)
{
have_pgsql_driver = TRUE;
}
}
}
- while ( driver != NULL );
+ while (driver != NULL);
}
- if ( have_sqlite3_driver )
+ if (have_sqlite3_driver)
{
- prov = g_new0( QofBackendProvider, 1 );
- g_assert( prov != NULL );
+ prov = g_new0 (QofBackendProvider, 1);
+ g_assert (prov != NULL);
prov->provider_name = "GnuCash Libdbi (SQLITE3) Backend";
prov->access_method = FILE_URI_TYPE;
prov->backend_new = gnc_dbi_backend_sqlite3_new;
prov->provider_free = gnc_dbi_provider_free;
prov->check_data_type = gnc_dbi_check_sqlite3_file;
- qof_backend_register_provider( prov );
+ qof_backend_register_provider (prov);
- prov = g_new0( QofBackendProvider, 1 );
- g_assert( prov != NULL );
+ prov = g_new0 (QofBackendProvider, 1);
+ g_assert (prov != NULL);
prov->provider_name = "GnuCash Libdbi (SQLITE3) Backend";
prov->access_method = SQLITE3_URI_TYPE;
prov->backend_new = gnc_dbi_backend_sqlite3_new;
prov->provider_free = gnc_dbi_provider_free;
prov->check_data_type = gnc_dbi_check_sqlite3_file;
- qof_backend_register_provider( prov );
+ qof_backend_register_provider (prov);
}
- if ( have_mysql_driver )
+ if (have_mysql_driver)
{
- prov = g_new0( QofBackendProvider, 1 );
- g_assert( prov != NULL );
+ prov = g_new0 (QofBackendProvider, 1);
+ g_assert (prov != NULL);
prov->provider_name = "GnuCash Libdbi (MYSQL) Backend";
prov->access_method = "mysql";
prov->backend_new = gnc_dbi_backend_mysql_new;
prov->provider_free = gnc_dbi_provider_free;
prov->check_data_type = NULL;
- qof_backend_register_provider( prov );
+ qof_backend_register_provider (prov);
}
- if ( have_pgsql_driver )
+ if (have_pgsql_driver)
{
- prov = g_new0( QofBackendProvider, 1 );
- g_assert( prov != NULL );
+ prov = g_new0 (QofBackendProvider, 1);
+ g_assert (prov != NULL);
prov->provider_name = "GnuCash Libdbi (POSTGRESQL) Backend";
prov->access_method = "postgres";
prov->backend_new = gnc_dbi_backend_postgres_new;
prov->provider_free = gnc_dbi_provider_free;
prov->check_data_type = NULL;
- qof_backend_register_provider( prov );
+ qof_backend_register_provider (prov);
}
/* If needed, set log level to DEBUG so that SQl statements will be put into
@@ -2090,29 +2116,29 @@ gnc_module_init_backend_dbi(void)
#ifndef GNC_NO_LOADABLE_MODULES
G_MODULE_EXPORT void
-qof_backend_module_init( void )
+qof_backend_module_init (void)
{
- gnc_module_init_backend_dbi();
+ gnc_module_init_backend_dbi ();
}
G_MODULE_EXPORT void
-qof_backend_module_finalize( void )
+qof_backend_module_finalize (void)
{
- gnc_module_finalize_backend_dbi();
+ gnc_module_finalize_backend_dbi ();
}
#endif /* GNC_NO_LOADABLE_MODULES */
void
-gnc_module_finalize_backend_dbi( void )
+gnc_module_finalize_backend_dbi (void)
{
#if HAVE_LIBDBI_R
- if (dbi_instance)
- {
- dbi_shutdown_r(dbi_instance);
- dbi_instance = NULL;
- }
+ if (dbi_instance)
+ {
+ dbi_shutdown_r (dbi_instance);
+ dbi_instance = NULL;
+ }
#else
- dbi_shutdown();
+ dbi_shutdown ();
#endif
}
@@ -2126,108 +2152,109 @@ typedef struct
} GncDbiSqlRow;
static void
-row_dispose( GncSqlRow* row )
+row_dispose (GncSqlRow* row)
{
GncDbiSqlRow* dbi_row = (GncDbiSqlRow*)row;
GList* node;
- if ( dbi_row->gvalue_list != NULL )
+ if (dbi_row->gvalue_list != NULL)
{
- for ( node = dbi_row->gvalue_list; node != NULL; node = node->next )
+ for (node = dbi_row->gvalue_list; node != NULL; node = node->next)
{
GValue* value;
- if ( !G_IS_VALUE(node->data) )
+ if (!G_IS_VALUE (node->data))
continue;
value = (GValue*)node->data;
- if ( G_VALUE_HOLDS_STRING(value) )
+ if (G_VALUE_HOLDS_STRING (value))
{
- g_free( (gpointer)g_value_get_string( value ) );
+ g_free ((gpointer)g_value_get_string (value));
}
- g_free( value );
+ g_free (value);
}
- g_list_free( dbi_row->gvalue_list );
+ g_list_free (dbi_row->gvalue_list);
}
- g_free( dbi_row );
+ g_free (dbi_row);
}
static const GValue*
-row_get_value_at_col_name( GncSqlRow* row, const gchar* col_name )
+row_get_value_at_col_name (GncSqlRow* row, const gchar* col_name)
{
GncDbiSqlRow* dbi_row = (GncDbiSqlRow*)row;
gushort type;
guint attrs;
GValue* value;
- type = dbi_result_get_field_type( dbi_row->result, col_name );
- attrs = dbi_result_get_field_attribs( dbi_row->result, col_name );
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
+ type = dbi_result_get_field_type (dbi_row->result, col_name);
+ attrs = dbi_result_get_field_attribs (dbi_row->result, col_name);
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
- switch ( type )
+ switch (type)
{
case DBI_TYPE_INTEGER:
- (void)g_value_init( value, G_TYPE_INT64 );
- g_value_set_int64( value, dbi_result_get_longlong( dbi_row->result, col_name ) );
+ (void)g_value_init (value, G_TYPE_INT64);
+ g_value_set_int64 (value, dbi_result_get_longlong (dbi_row->result, col_name));
break;
case DBI_TYPE_DECIMAL:
- gnc_push_locale( LC_NUMERIC, "C" );
- if ( (attrs & DBI_DECIMAL_SIZEMASK) == DBI_DECIMAL_SIZE4 )
+ gnc_push_locale (LC_NUMERIC, "C");
+ if ((attrs & DBI_DECIMAL_SIZEMASK) == DBI_DECIMAL_SIZE4)
{
- (void)g_value_init( value, G_TYPE_FLOAT );
- g_value_set_float( value, dbi_result_get_float( dbi_row->result, col_name ) );
+ (void)g_value_init (value, G_TYPE_FLOAT);
+ g_value_set_float (value, dbi_result_get_float (dbi_row->result, col_name));
}
- else if ( (attrs & DBI_DECIMAL_SIZEMASK) == DBI_DECIMAL_SIZE8 )
+ else if ((attrs & DBI_DECIMAL_SIZEMASK) == DBI_DECIMAL_SIZE8)
{
- (void)g_value_init( value, G_TYPE_DOUBLE );
- g_value_set_double( value, dbi_result_get_double( dbi_row->result, col_name ) );
+ (void)g_value_init (value, G_TYPE_DOUBLE);
+ g_value_set_double (value, dbi_result_get_double (dbi_row->result, col_name));
}
else
{
- PERR( "Field %s: strange decimal length attrs=%d\n", col_name, attrs );
+ PERR ("Field %s: strange decimal length attrs=%d\n", col_name, attrs);
}
- gnc_pop_locale( LC_NUMERIC );
+ gnc_pop_locale (LC_NUMERIC);
break;
case DBI_TYPE_STRING:
- (void)g_value_init( value, G_TYPE_STRING );
- g_value_take_string( value, dbi_result_get_string_copy( dbi_row->result, col_name ) );
+ (void)g_value_init (value, G_TYPE_STRING);
+ g_value_take_string (value, dbi_result_get_string_copy (dbi_row->result,
+ col_name));
break;
case DBI_TYPE_DATETIME:
- if ( dbi_result_field_is_null( dbi_row->result, col_name ) )
+ if (dbi_result_field_is_null (dbi_row->result, col_name))
{
return NULL;
}
- else
- {
- /* A seriously evil hack to work around libdbi bug #15
- * https://sourceforge.net/p/libdbi/bugs/15/. When libdbi
- * v0.9 is widely available this can be replaced with
- * dbi_result_get_as_longlong.
- */
- dbi_result_t *result = (dbi_result_t*)(dbi_row->result);
- guint64 row = dbi_result_get_currow (result);
- guint idx = dbi_result_get_field_idx (result, col_name) - 1;
- time64 time = result->rows[row]->field_values[idx].d_datetime;
- (void)g_value_init( value, G_TYPE_INT64 );
- g_value_set_int64 (value, time);
- }
+ else
+ {
+ /* A seriously evil hack to work around libdbi bug #15
+ * https://sourceforge.net/p/libdbi/bugs/15/. When libdbi
+ * v0.9 is widely available this can be replaced with
+ * dbi_result_get_as_longlong.
+ */
+ dbi_result_t* result = (dbi_result_t*) (dbi_row->result);
+ guint64 row = dbi_result_get_currow (result);
+ guint idx = dbi_result_get_field_idx (result, col_name) - 1;
+ time64 time = result->rows[row]->field_values[idx].d_datetime;
+ (void)g_value_init (value, G_TYPE_INT64);
+ g_value_set_int64 (value, time);
+ }
break;
default:
- PERR( "Field %s: unknown DBI_TYPE: %d\n", col_name, type );
- g_free( value );
+ PERR ("Field %s: unknown DBI_TYPE: %d\n", col_name, type);
+ g_free (value);
return NULL;
}
- dbi_row->gvalue_list = g_list_prepend( dbi_row->gvalue_list, value );
+ dbi_row->gvalue_list = g_list_prepend (dbi_row->gvalue_list, value);
return value;
}
static GncSqlRow*
-create_dbi_row( dbi_result result )
+create_dbi_row (dbi_result result)
{
GncDbiSqlRow* row;
- row = g_new0( GncDbiSqlRow, 1 );
- g_assert( row != NULL );
+ row = g_new0 (GncDbiSqlRow, 1);
+ g_assert (row != NULL);
row->base.getValueAtColName = row_get_value_at_col_name;
row->base.dispose = row_dispose;
@@ -2248,30 +2275,30 @@ typedef struct
} GncDbiSqlResult;
static void
-result_dispose( GncSqlResult* result )
+result_dispose (GncSqlResult* result)
{
GncDbiSqlResult* dbi_result = (GncDbiSqlResult*)result;
- if ( dbi_result->row != NULL )
+ if (dbi_result->row != NULL)
{
- gnc_sql_row_dispose( dbi_result->row );
+ gnc_sql_row_dispose (dbi_result->row);
}
- if ( dbi_result->result != NULL )
+ if (dbi_result->result != NULL)
{
gint status;
- status = dbi_result_free( dbi_result->result );
- if ( status < 0 )
+ status = dbi_result_free (dbi_result->result);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
}
- g_free( result );
+ g_free (result);
}
static guint
-result_get_num_rows( GncSqlResult* result )
+result_get_num_rows (GncSqlResult* result)
{
GncDbiSqlResult* dbi_result = (GncDbiSqlResult*)result;
@@ -2279,25 +2306,25 @@ result_get_num_rows( GncSqlResult* result )
}
static GncSqlRow*
-result_get_first_row( GncSqlResult* result )
+result_get_first_row (GncSqlResult* result)
{
GncDbiSqlResult* dbi_result = (GncDbiSqlResult*)result;
- if ( dbi_result->row != NULL )
+ if (dbi_result->row != NULL)
{
- gnc_sql_row_dispose( dbi_result->row );
+ gnc_sql_row_dispose (dbi_result->row);
dbi_result->row = NULL;
}
- if ( dbi_result->num_rows > 0 )
+ if (dbi_result->num_rows > 0)
{
- gint status = dbi_result_first_row( dbi_result->result );
- if ( status == 0 )
+ gint status = dbi_result_first_row (dbi_result->result);
+ if (status == 0)
{
- PERR( "Error in dbi_result_first_row()\n" );
- qof_backend_set_error( dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_first_row()\n");
+ qof_backend_set_error (dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
dbi_result->cur_row = 1;
- dbi_result->row = create_dbi_row( dbi_result->result );
+ dbi_result->row = create_dbi_row (dbi_result->result);
return dbi_result->row;
}
else
@@ -2307,25 +2334,25 @@ result_get_first_row( GncSqlResult* result )
}
static GncSqlRow*
-result_get_next_row( GncSqlResult* result )
+result_get_next_row (GncSqlResult* result)
{
GncDbiSqlResult* dbi_result = (GncDbiSqlResult*)result;
- if ( dbi_result->row != NULL )
+ if (dbi_result->row != NULL)
{
- gnc_sql_row_dispose( dbi_result->row );
+ gnc_sql_row_dispose (dbi_result->row);
dbi_result->row = NULL;
}
- if ( dbi_result->cur_row < dbi_result->num_rows )
+ if (dbi_result->cur_row < dbi_result->num_rows)
{
- gint status = dbi_result_next_row( dbi_result->result );
- if ( status == 0 )
+ gint status = dbi_result_next_row (dbi_result->result);
+ if (status == 0)
{
- PERR( "Error in dbi_result_first_row()\n" );
- qof_backend_set_error( dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_first_row()\n");
+ qof_backend_set_error (dbi_result->dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
dbi_result->cur_row++;
- dbi_result->row = create_dbi_row( dbi_result->result );
+ dbi_result->row = create_dbi_row (dbi_result->result);
return dbi_result->row;
}
else
@@ -2335,19 +2362,19 @@ result_get_next_row( GncSqlResult* result )
}
static GncSqlResult*
-create_dbi_result( GncDbiSqlConnection* dbi_conn, dbi_result result )
+create_dbi_result (GncDbiSqlConnection* dbi_conn, dbi_result result)
{
GncDbiSqlResult* dbi_result;
- dbi_result = g_new0( GncDbiSqlResult, 1 );
- g_assert( dbi_result != NULL );
+ dbi_result = g_new0 (GncDbiSqlResult, 1);
+ g_assert (dbi_result != NULL);
dbi_result->base.dispose = result_dispose;
dbi_result->base.getNumRows = result_get_num_rows;
dbi_result->base.getFirstRow = result_get_first_row;
dbi_result->base.getNextRow = result_get_next_row;
dbi_result->result = result;
- dbi_result->num_rows = (guint)dbi_result_get_numrows( result );
+ dbi_result->num_rows = (guint)dbi_result_get_numrows (result);
dbi_result->cur_row = 0;
dbi_result->dbi_conn = dbi_conn;
@@ -2363,19 +2390,19 @@ typedef struct
} GncDbiSqlStatement;
static void
-stmt_dispose( GncSqlStatement* stmt )
+stmt_dispose (GncSqlStatement* stmt)
{
GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt;
- if ( dbi_stmt->sql != NULL )
+ if (dbi_stmt->sql != NULL)
{
- (void)g_string_free( dbi_stmt->sql, TRUE );
+ (void)g_string_free (dbi_stmt->sql, TRUE);
}
- g_free( stmt );
+ g_free (stmt);
}
static gchar*
-stmt_to_sql( GncSqlStatement* stmt )
+stmt_to_sql (GncSqlStatement* stmt)
{
GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt;
@@ -2383,72 +2410,73 @@ stmt_to_sql( GncSqlStatement* stmt )
}
static void
-stmt_add_where_cond( GncSqlStatement* stmt, QofIdTypeConst type_name,
- gpointer obj, const GncSqlColumnTableEntry* table_row, GValue* value )
+stmt_add_where_cond (GncSqlStatement* stmt, QofIdTypeConst type_name,
+ gpointer obj, const GncSqlColumnTableEntry* table_row, GValue* value)
{
GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt;
gchar* buf;
gchar* value_str;
- value_str = gnc_sql_get_sql_value( dbi_stmt->conn, value );
- buf = g_strdup_printf( " WHERE %s = %s", table_row->col_name,
- value_str );
- g_free( value_str );
- (void)g_string_append( dbi_stmt->sql, buf );
- g_free( buf );
+ value_str = gnc_sql_get_sql_value (dbi_stmt->conn, value);
+ buf = g_strdup_printf (" WHERE %s = %s", table_row->col_name,
+ value_str);
+ g_free (value_str);
+ (void)g_string_append (dbi_stmt->sql, buf);
+ g_free (buf);
}
static GncSqlStatement*
-create_dbi_statement( GncSqlConnection* conn, const gchar* sql )
+create_dbi_statement (GncSqlConnection* conn, const gchar* sql)
{
GncDbiSqlStatement* stmt;
- stmt = g_new0( GncDbiSqlStatement, 1 );
- g_assert( stmt != NULL );
+ stmt = g_new0 (GncDbiSqlStatement, 1);
+ g_assert (stmt != NULL);
stmt->base.dispose = stmt_dispose;
stmt->base.toSql = stmt_to_sql;
stmt->base.addWhereCond = stmt_add_where_cond;
- stmt->sql = g_string_new( sql );
+ stmt->sql = g_string_new (sql);
stmt->conn = conn;
return (GncSqlStatement*)stmt;
}
/* --------------------------------------------------------- */
static void
-conn_dispose( GncSqlConnection* conn )
+conn_dispose (GncSqlConnection* conn)
{
//GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
- g_free( conn );
+ g_free (conn);
}
static GncSqlResult*
-conn_execute_select_statement( GncSqlConnection* conn, GncSqlStatement* stmt )
+conn_execute_select_statement (GncSqlConnection* conn, GncSqlStatement* stmt)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt;
dbi_result result;
- DEBUG( "SQL: %s\n", dbi_stmt->sql->str );
- gnc_push_locale( LC_NUMERIC, "C" );
+ DEBUG ("SQL: %s\n", dbi_stmt->sql->str);
+ gnc_push_locale (LC_NUMERIC, "C");
do
{
- gnc_dbi_init_error( dbi_conn );
- result = dbi_conn_query( dbi_conn->conn, dbi_stmt->sql->str );
+ gnc_dbi_init_error (dbi_conn);
+ result = dbi_conn_query (dbi_conn->conn, dbi_stmt->sql->str);
}
- while ( dbi_conn->retry );
- if ( result == NULL )
+ while (dbi_conn->retry);
+ if (result == NULL)
{
- PERR( "Error executing SQL %s\n", dbi_stmt->sql->str );
+ PERR ("Error executing SQL %s\n", dbi_stmt->sql->str);
return NULL;
}
- gnc_pop_locale( LC_NUMERIC );
- return create_dbi_result( dbi_conn, result );
+ gnc_pop_locale (LC_NUMERIC);
+ return create_dbi_result (dbi_conn, result);
}
static gint
-conn_execute_nonselect_statement( GncSqlConnection* conn, GncSqlStatement* stmt )
+conn_execute_nonselect_statement (GncSqlConnection* conn,
+ GncSqlStatement* stmt)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt;
@@ -2456,38 +2484,38 @@ conn_execute_nonselect_statement( GncSqlConnection* conn, GncSqlStatement* stmt
gint num_rows;
gint status;
- DEBUG( "SQL: %s\n", dbi_stmt->sql->str );
+ DEBUG ("SQL: %s\n", dbi_stmt->sql->str);
do
{
- gnc_dbi_init_error( dbi_conn );
- result = dbi_conn_query( dbi_conn->conn, dbi_stmt->sql->str );
+ gnc_dbi_init_error (dbi_conn);
+ result = dbi_conn_query (dbi_conn->conn, dbi_stmt->sql->str);
}
- while ( dbi_conn->retry );
- if ( result == NULL )
+ while (dbi_conn->retry);
+ if (result == NULL)
{
- PERR( "Error executing SQL %s\n", dbi_stmt->sql->str );
+ PERR ("Error executing SQL %s\n", dbi_stmt->sql->str);
return -1;
}
- num_rows = (gint)dbi_result_get_numrows_affected( result );
- status = dbi_result_free( result );
- if ( status < 0 )
+ num_rows = (gint)dbi_result_get_numrows_affected (result);
+ status = dbi_result_free (result);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
return num_rows;
}
static GncSqlStatement*
-conn_create_statement_from_sql( GncSqlConnection* conn, const gchar* sql )
+conn_create_statement_from_sql (GncSqlConnection* conn, const gchar* sql)
{
//GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
- return create_dbi_statement( conn, sql );
+ return create_dbi_statement (conn, sql);
}
static gboolean
-conn_does_table_exist( GncSqlConnection* conn, const gchar* table_name )
+conn_does_table_exist (GncSqlConnection* conn, const gchar* table_name)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
gint nTables;
@@ -2495,20 +2523,20 @@ conn_does_table_exist( GncSqlConnection* conn, const gchar* table_name )
const gchar* dbname;
gint status;
- g_return_val_if_fail( conn != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
+ g_return_val_if_fail (conn != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
- dbname = dbi_conn_get_option( dbi_conn->conn, "dbname" );
- tables = dbi_conn_get_table_list( dbi_conn->conn, dbname, table_name );
- nTables = (gint)dbi_result_get_numrows( tables );
- status = dbi_result_free( tables );
- if ( status < 0 )
+ dbname = dbi_conn_get_option (dbi_conn->conn, "dbname");
+ tables = dbi_conn_get_table_list (dbi_conn->conn, dbname, table_name);
+ nTables = (gint)dbi_result_get_numrows (tables);
+ status = dbi_result_free (tables);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
- if ( nTables == 1 )
+ if (nTables == 1)
{
return TRUE;
}
@@ -2519,340 +2547,340 @@ conn_does_table_exist( GncSqlConnection* conn, const gchar* table_name )
}
static gboolean
-conn_begin_transaction( GncSqlConnection* conn )
+conn_begin_transaction (GncSqlConnection* conn)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result;
gint status;
gboolean success = FALSE;
- DEBUG( "BEGIN\n" );
+ DEBUG ("BEGIN\n");
- if ( !gnc_dbi_verify_conn (dbi_conn) )
+ if (!gnc_dbi_verify_conn (dbi_conn))
{
- PERR( "gnc_dbi_verify_conn() failed\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("gnc_dbi_verify_conn() failed\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
return FALSE;
}
do
{
- gnc_dbi_init_error( dbi_conn );
- result = dbi_conn_queryf( dbi_conn->conn, "BEGIN" );
+ gnc_dbi_init_error (dbi_conn);
+ result = dbi_conn_queryf (dbi_conn->conn, "BEGIN");
}
- while ( dbi_conn->retry );
+ while (dbi_conn->retry);
- success = ( result != NULL );
- status = dbi_result_free( result );
- if ( status < 0 )
+ success = (result != NULL);
+ status = dbi_result_free (result);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
- if ( !success )
+ if (!success)
{
- PERR( "BEGIN transaction failed()\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("BEGIN transaction failed()\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
return success;
}
static gboolean
-conn_rollback_transaction( GncSqlConnection* conn )
+conn_rollback_transaction (GncSqlConnection* conn)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result;
gint status;
gboolean success = FALSE;
- DEBUG( "ROLLBACK\n" );
- result = dbi_conn_queryf( dbi_conn->conn, "ROLLBACK" );
- success = ( result != NULL );
+ DEBUG ("ROLLBACK\n");
+ result = dbi_conn_queryf (dbi_conn->conn, "ROLLBACK");
+ success = (result != NULL);
- status = dbi_result_free( result );
- if ( status < 0 )
+ status = dbi_result_free (result);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
- if ( !success )
+ if (!success)
{
- PERR( "Error in conn_rollback_transaction()\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in conn_rollback_transaction()\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
return success;
}
static gboolean
-conn_commit_transaction( GncSqlConnection* conn )
+conn_commit_transaction (GncSqlConnection* conn)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result;
gint status;
gboolean success = FALSE;
- DEBUG( "COMMIT\n" );
- result = dbi_conn_queryf( dbi_conn->conn, "COMMIT" );
- success = ( result != NULL );
+ DEBUG ("COMMIT\n");
+ result = dbi_conn_queryf (dbi_conn->conn, "COMMIT");
+ success = (result != NULL);
- status = dbi_result_free( result );
- if ( status < 0 )
+ status = dbi_result_free (result);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
- if ( !success )
+ if (!success)
{
- PERR( "Error in conn_commit_transaction()\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in conn_commit_transaction()\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
return success;
}
static gchar*
-create_index_ddl( GncSqlConnection* conn,
+create_index_ddl (GncSqlConnection* conn,
const gchar* index_name,
const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+ const GncSqlColumnTableEntry* col_table)
{
GString* ddl;
const GncSqlColumnTableEntry* table_row;
- g_return_val_if_fail( conn != NULL, NULL );
- g_return_val_if_fail( index_name != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( col_table != NULL, NULL );
+ g_return_val_if_fail (conn != NULL, NULL);
+ g_return_val_if_fail (index_name != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (col_table != NULL, NULL);
- ddl = g_string_new( "" );
- g_string_printf( ddl, "CREATE INDEX %s ON %s (", index_name, table_name );
- for ( table_row = col_table; table_row->col_name != NULL; ++table_row )
+ ddl = g_string_new ("");
+ g_string_printf (ddl, "CREATE INDEX %s ON %s (", index_name, table_name);
+ for (table_row = col_table; table_row->col_name != NULL; ++table_row)
{
- if ( table_row != col_table )
+ if (table_row != col_table)
{
- (void)g_string_append( ddl, ", " );
+ (void)g_string_append (ddl, ", ");
}
- g_string_append_printf( ddl, "%s", table_row->col_name );
+ g_string_append_printf (ddl, "%s", table_row->col_name);
}
- (void)g_string_append( ddl, ")" );
+ (void)g_string_append (ddl, ")");
- return g_string_free( ddl, FALSE );
+ return g_string_free (ddl, FALSE);
}
static gchar*
-add_columns_ddl( GncSqlConnection* conn,
+add_columns_ddl (GncSqlConnection* conn,
const gchar* table_name,
- GList* col_info_list )
+ GList* col_info_list)
{
GString* ddl;
const GList* list_node;
guint col_num;
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
- g_return_val_if_fail( conn != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( col_info_list != NULL, NULL );
+ g_return_val_if_fail (conn != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (col_info_list != NULL, NULL);
- ddl = g_string_new( "" );
- g_string_printf( ddl, "ALTER TABLE %s ", table_name );
- for ( list_node = col_info_list, col_num = 0; list_node != NULL;
- list_node = list_node->next, col_num++ )
+ ddl = g_string_new ("");
+ g_string_printf (ddl, "ALTER TABLE %s ", table_name);
+ for (list_node = col_info_list, col_num = 0; list_node != NULL;
+ list_node = list_node->next, col_num++)
{
- GncSqlColumnInfo* info = (GncSqlColumnInfo*)(list_node->data);
+ GncSqlColumnInfo* info = (GncSqlColumnInfo*) (list_node->data);
- if ( col_num != 0 )
+ if (col_num != 0)
{
- (void)g_string_append( ddl, ", " );
+ (void)g_string_append (ddl, ", ");
}
- g_string_append( ddl, "ADD COLUMN " );
- dbi_conn->provider->append_col_def( ddl, info );
- g_free( info->name );
- g_free( info );
+ g_string_append (ddl, "ADD COLUMN ");
+ dbi_conn->provider->append_col_def (ddl, info);
+ g_free (info->name);
+ g_free (info);
}
- return g_string_free( ddl, FALSE );
+ return g_string_free (ddl, FALSE);
}
static void
-append_sqlite3_col_def( GString* ddl, GncSqlColumnInfo* info )
+append_sqlite3_col_def (GString* ddl, GncSqlColumnInfo* info)
{
const char* type_name = nullptr;
- if ( info->type == BCT_INT )
+ if (info->type == BCT_INT)
{
type_name = "integer";
}
- else if ( info->type == BCT_INT64 )
+ else if (info->type == BCT_INT64)
{
type_name = "bigint";
}
- else if ( info->type == BCT_DOUBLE )
+ else if (info->type == BCT_DOUBLE)
{
type_name = "float8";
}
- else if ( info->type == BCT_STRING || info->type == BCT_DATE
- || info->type == BCT_DATETIME )
+ else if (info->type == BCT_STRING || info->type == BCT_DATE
+ || info->type == BCT_DATETIME)
{
type_name = "text";
}
else
{
- PERR( "Unknown column type: %d\n", info->type );
+ PERR ("Unknown column type: %d\n", info->type);
type_name = "";
}
- g_string_append_printf( ddl, "%s %s", info->name, type_name );
- if ( info->size != 0 )
+ g_string_append_printf (ddl, "%s %s", info->name, type_name);
+ if (info->size != 0)
{
- (void)g_string_append_printf( ddl, "(%d)", info->size );
+ (void)g_string_append_printf (ddl, "(%d)", info->size);
}
- if ( info->is_primary_key )
+ if (info->is_primary_key)
{
- (void)g_string_append( ddl, " PRIMARY KEY" );
+ (void)g_string_append (ddl, " PRIMARY KEY");
}
- if ( info->is_autoinc )
+ if (info->is_autoinc)
{
- (void)g_string_append( ddl, " AUTOINCREMENT" );
+ (void)g_string_append (ddl, " AUTOINCREMENT");
}
- if ( !info->null_allowed )
+ if (!info->null_allowed)
{
- (void)g_string_append( ddl, " NOT NULL" );
+ (void)g_string_append (ddl, " NOT NULL");
}
}
static gchar*
-conn_create_table_ddl_sqlite3( GncSqlConnection* conn,
+conn_create_table_ddl_sqlite3 (GncSqlConnection* conn,
const gchar* table_name,
- const GList* col_info_list )
+ const GList* col_info_list)
{
GString* ddl;
const GList* list_node;
guint col_num;
- g_return_val_if_fail( conn != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( col_info_list != NULL, NULL );
+ g_return_val_if_fail (conn != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (col_info_list != NULL, NULL);
- ddl = g_string_new( "" );
- g_string_printf( ddl, "CREATE TABLE %s (", table_name );
- for ( list_node = col_info_list, col_num = 0; list_node != NULL;
- list_node = list_node->next, col_num++ )
+ ddl = g_string_new ("");
+ g_string_printf (ddl, "CREATE TABLE %s (", table_name);
+ for (list_node = col_info_list, col_num = 0; list_node != NULL;
+ list_node = list_node->next, col_num++)
{
- GncSqlColumnInfo* info = (GncSqlColumnInfo*)(list_node->data);
+ GncSqlColumnInfo* info = (GncSqlColumnInfo*) (list_node->data);
- if ( col_num != 0 )
+ if (col_num != 0)
{
- (void)g_string_append( ddl, ", " );
+ (void)g_string_append (ddl, ", ");
}
- append_sqlite3_col_def( ddl, info );
- g_free( info->name );
- g_free( info );
+ append_sqlite3_col_def (ddl, info);
+ g_free (info->name);
+ g_free (info);
}
- (void)g_string_append( ddl, ")" );
+ (void)g_string_append (ddl, ")");
- return g_string_free( ddl, FALSE );
+ return g_string_free (ddl, FALSE);
}
static void
-append_mysql_col_def( GString* ddl, GncSqlColumnInfo* info )
+append_mysql_col_def (GString* ddl, GncSqlColumnInfo* info)
{
const char* type_name = nullptr;
- if ( info->type == BCT_INT )
+ if (info->type == BCT_INT)
{
type_name = "integer";
}
- else if ( info->type == BCT_INT64 )
+ else if (info->type == BCT_INT64)
{
type_name = "bigint";
}
- else if ( info->type == BCT_DOUBLE )
+ else if (info->type == BCT_DOUBLE)
{
type_name = "double";
}
- else if ( info->type == BCT_STRING )
+ else if (info->type == BCT_STRING)
{
type_name = "varchar";
}
- else if ( info->type == BCT_DATE )
+ else if (info->type == BCT_DATE)
{
info->size = 0;
type_name = "date";
}
- else if ( info->type == BCT_DATETIME )
+ else if (info->type == BCT_DATETIME)
{
info->size = 0;
type_name = "TIMESTAMP NULL DEFAULT 0";
}
else
{
- PERR( "Unknown column type: %d\n", info->type );
+ PERR ("Unknown column type: %d\n", info->type);
type_name = "";
}
- g_string_append_printf( ddl, "%s %s", info->name, type_name );
- if ( info->size != 0 )
+ g_string_append_printf (ddl, "%s %s", info->name, type_name);
+ if (info->size != 0)
{
- g_string_append_printf( ddl, "(%d)", info->size );
+ g_string_append_printf (ddl, "(%d)", info->size);
}
- if ( info->is_unicode )
+ if (info->is_unicode)
{
- (void)g_string_append( ddl, " CHARACTER SET utf8" );
+ (void)g_string_append (ddl, " CHARACTER SET utf8");
}
- if ( info->is_primary_key )
+ if (info->is_primary_key)
{
- (void)g_string_append( ddl, " PRIMARY KEY" );
+ (void)g_string_append (ddl, " PRIMARY KEY");
}
- if ( info->is_autoinc )
+ if (info->is_autoinc)
{
- (void)g_string_append( ddl, " AUTO_INCREMENT" );
+ (void)g_string_append (ddl, " AUTO_INCREMENT");
}
- if ( !info->null_allowed )
+ if (!info->null_allowed)
{
- (void)g_string_append( ddl, " NOT NULL" );
+ (void)g_string_append (ddl, " NOT NULL");
}
}
static gchar*
-conn_create_table_ddl_mysql( GncSqlConnection* conn, const gchar* table_name,
- const GList* col_info_list )
+conn_create_table_ddl_mysql (GncSqlConnection* conn, const gchar* table_name,
+ const GList* col_info_list)
{
GString* ddl;
const GList* list_node;
guint col_num;
- g_return_val_if_fail( conn != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( col_info_list != NULL, NULL );
+ g_return_val_if_fail (conn != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (col_info_list != NULL, NULL);
- ddl = g_string_new( "" );
- g_string_printf( ddl, "CREATE TABLE %s (", table_name );
- for ( list_node = col_info_list, col_num = 0; list_node != NULL;
- list_node = list_node->next, col_num++ )
+ ddl = g_string_new ("");
+ g_string_printf (ddl, "CREATE TABLE %s (", table_name);
+ for (list_node = col_info_list, col_num = 0; list_node != NULL;
+ list_node = list_node->next, col_num++)
{
- GncSqlColumnInfo* info = (GncSqlColumnInfo*)(list_node->data);
+ GncSqlColumnInfo* info = (GncSqlColumnInfo*) (list_node->data);
- if ( col_num != 0 )
+ if (col_num != 0)
{
- (void)g_string_append( ddl, ", " );
+ (void)g_string_append (ddl, ", ");
}
- append_mysql_col_def( ddl, info );
- g_free( info->name );
- g_free( info );
+ append_mysql_col_def (ddl, info);
+ g_free (info->name);
+ g_free (info);
}
- (void)g_string_append( ddl, ")" );
+ (void)g_string_append (ddl, ")");
- return g_string_free( ddl, FALSE );
+ return g_string_free (ddl, FALSE);
}
static void
-append_pgsql_col_def( GString* ddl, GncSqlColumnInfo* info )
+append_pgsql_col_def (GString* ddl, GncSqlColumnInfo* info)
{
const char* type_name = nullptr;
- if ( info->type == BCT_INT )
+ if (info->type == BCT_INT)
{
- if ( info->is_autoinc )
+ if (info->is_autoinc)
{
type_name = "serial";
}
@@ -2861,113 +2889,113 @@ append_pgsql_col_def( GString* ddl, GncSqlColumnInfo* info )
type_name = "integer";
}
}
- else if ( info->type == BCT_INT64 )
+ else if (info->type == BCT_INT64)
{
type_name = "int8";
}
- else if ( info->type == BCT_DOUBLE )
+ else if (info->type == BCT_DOUBLE)
{
type_name = "double precision";
}
- else if ( info->type == BCT_STRING )
+ else if (info->type == BCT_STRING)
{
type_name = "varchar";
}
- else if ( info->type == BCT_DATE )
+ else if (info->type == BCT_DATE)
{
info->size = 0;
type_name = "date";
}
- else if ( info->type == BCT_DATETIME )
+ else if (info->type == BCT_DATETIME)
{
info->size = 0;
type_name = "timestamp without time zone";
}
else
{
- PERR( "Unknown column type: %d\n", info->type );
+ PERR ("Unknown column type: %d\n", info->type);
type_name = "";
}
- g_string_append_printf( ddl, "%s %s", info->name, type_name );
- if ( info->size != 0 )
+ g_string_append_printf (ddl, "%s %s", info->name, type_name);
+ if (info->size != 0)
{
- g_string_append_printf( ddl, "(%d)", info->size );
+ g_string_append_printf (ddl, "(%d)", info->size);
}
- if ( info->is_primary_key )
+ if (info->is_primary_key)
{
- (void)g_string_append( ddl, " PRIMARY KEY" );
+ (void)g_string_append (ddl, " PRIMARY KEY");
}
- if ( !info->null_allowed )
+ if (!info->null_allowed)
{
- (void)g_string_append( ddl, " NOT NULL" );
+ (void)g_string_append (ddl, " NOT NULL");
}
}
static gchar*
-conn_create_table_ddl_pgsql( GncSqlConnection* conn, const gchar* table_name,
- const GList* col_info_list )
+conn_create_table_ddl_pgsql (GncSqlConnection* conn, const gchar* table_name,
+ const GList* col_info_list)
{
GString* ddl;
const GList* list_node;
guint col_num;
gboolean is_unicode = FALSE;
- g_return_val_if_fail( conn != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( col_info_list != NULL, NULL );
+ g_return_val_if_fail (conn != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (col_info_list != NULL, NULL);
- ddl = g_string_new( "" );
- g_string_printf( ddl, "CREATE TABLE %s (", table_name );
- for ( list_node = col_info_list, col_num = 0; list_node != NULL;
- list_node = list_node->next, col_num++ )
+ ddl = g_string_new ("");
+ g_string_printf (ddl, "CREATE TABLE %s (", table_name);
+ for (list_node = col_info_list, col_num = 0; list_node != NULL;
+ list_node = list_node->next, col_num++)
{
- GncSqlColumnInfo* info = (GncSqlColumnInfo*)(list_node->data);
+ GncSqlColumnInfo* info = (GncSqlColumnInfo*) (list_node->data);
- if ( col_num != 0 )
+ if (col_num != 0)
{
- (void)g_string_append( ddl, ", " );
+ (void)g_string_append (ddl, ", ");
}
- append_pgsql_col_def( ddl, info );
+ append_pgsql_col_def (ddl, info);
is_unicode = is_unicode || info->is_unicode;
- g_free( info->name );
- g_free( info );
+ g_free (info->name);
+ g_free (info);
}
- (void)g_string_append( ddl, ")" );
- if ( is_unicode )
+ (void)g_string_append (ddl, ")");
+ if (is_unicode)
{
}
- return g_string_free( ddl, FALSE );
+ return g_string_free (ddl, FALSE);
}
static gboolean
-conn_create_table( GncSqlConnection* conn, const gchar* table_name,
- GList* col_info_list )
+conn_create_table (GncSqlConnection* conn, const gchar* table_name,
+ GList* col_info_list)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
gchar* ddl;
dbi_result result;
- g_return_val_if_fail( conn != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( col_info_list != NULL, FALSE );
+ g_return_val_if_fail (conn != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (col_info_list != NULL, FALSE);
- ddl = dbi_conn->provider->create_table_ddl( conn, table_name,
- col_info_list );
- g_list_free( col_info_list );
- if ( ddl != NULL )
+ ddl = dbi_conn->provider->create_table_ddl (conn, table_name,
+ col_info_list);
+ g_list_free (col_info_list);
+ if (ddl != NULL)
{
gint status;
- DEBUG( "SQL: %s\n", ddl );
- result = dbi_conn_query( dbi_conn->conn, ddl );
- g_free( ddl );
- status = dbi_result_free( result );
- if ( status < 0 )
+ DEBUG ("SQL: %s\n", ddl);
+ result = dbi_conn_query (dbi_conn->conn, ddl);
+ g_free (ddl);
+ status = dbi_result_free (result);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
}
else
@@ -2979,31 +3007,31 @@ conn_create_table( GncSqlConnection* conn, const gchar* table_name,
}
static gboolean
-conn_create_index( GncSqlConnection* conn, const gchar* index_name,
- const gchar* table_name, const GncSqlColumnTableEntry* col_table )
+conn_create_index (GncSqlConnection* conn, const gchar* index_name,
+ const gchar* table_name, const GncSqlColumnTableEntry* col_table)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
gchar* ddl;
dbi_result result;
- g_return_val_if_fail( conn != NULL, FALSE );
- g_return_val_if_fail( index_name != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( col_table != NULL, FALSE );
+ g_return_val_if_fail (conn != NULL, FALSE);
+ g_return_val_if_fail (index_name != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (col_table != NULL, FALSE);
- ddl = create_index_ddl( conn, index_name, table_name, col_table );
- if ( ddl != NULL )
+ ddl = create_index_ddl (conn, index_name, table_name, col_table);
+ if (ddl != NULL)
{
gint status;
- DEBUG( "SQL: %s\n", ddl );
- result = dbi_conn_query( dbi_conn->conn, ddl );
- g_free( ddl );
- status = dbi_result_free( result );
- if ( status < 0 )
+ DEBUG ("SQL: %s\n", ddl);
+ result = dbi_conn_query (dbi_conn->conn, ddl);
+ g_free (ddl);
+ status = dbi_result_free (result);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
}
else
@@ -3015,30 +3043,30 @@ conn_create_index( GncSqlConnection* conn, const gchar* index_name,
}
static gboolean
-conn_add_columns_to_table( GncSqlConnection* conn, const gchar* table_name,
- GList* col_info_list )
+conn_add_columns_to_table (GncSqlConnection* conn, const gchar* table_name,
+ GList* col_info_list)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
gchar* ddl;
dbi_result result;
- g_return_val_if_fail( conn != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( col_info_list != NULL, FALSE );
+ g_return_val_if_fail (conn != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (col_info_list != NULL, FALSE);
- ddl = add_columns_ddl( conn, table_name, col_info_list );
- if ( ddl != NULL )
+ ddl = add_columns_ddl (conn, table_name, col_info_list);
+ if (ddl != NULL)
{
gint status;
- DEBUG( "SQL: %s\n", ddl );
- result = dbi_conn_query( dbi_conn->conn, ddl );
- g_free( ddl );
- status = dbi_result_free( result );
- if ( status < 0 )
+ DEBUG ("SQL: %s\n", ddl);
+ result = dbi_conn_query (dbi_conn->conn, ddl);
+ g_free (ddl);
+ status = dbi_result_free (result);
+ if (status < 0)
{
- PERR( "Error in dbi_result_free() result\n" );
- qof_backend_set_error( dbi_conn->qbe, ERR_BACKEND_SERVER_ERR );
+ PERR ("Error in dbi_result_free() result\n");
+ qof_backend_set_error (dbi_conn->qbe, ERR_BACKEND_SERVER_ERR);
}
}
else
@@ -3050,15 +3078,15 @@ conn_add_columns_to_table( GncSqlConnection* conn, const gchar* table_name,
}
static gchar*
-conn_quote_string( const GncSqlConnection* conn, gchar* unquoted_str )
+conn_quote_string (const GncSqlConnection* conn, gchar* unquoted_str)
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
gchar* quoted_str;
size_t size;
- size = dbi_conn_quote_string_copy( dbi_conn->conn, unquoted_str,
- "ed_str );
- if ( size != 0 )
+ size = dbi_conn_quote_string_copy (dbi_conn->conn, unquoted_str,
+ "ed_str);
+ if (size != 0)
{
return quoted_str;
}
@@ -3069,45 +3097,45 @@ conn_quote_string( const GncSqlConnection* conn, gchar* unquoted_str )
}
static GSList*
-conn_get_table_list( dbi_conn conn, const gchar* dbname )
+conn_get_table_list (dbi_conn conn, const gchar* dbname)
{
dbi_result tables;
GSList* list = NULL;
- tables = dbi_conn_get_table_list( conn, dbname, NULL );
- while ( dbi_result_next_row( tables ) != 0 )
+ tables = dbi_conn_get_table_list (conn, dbname, NULL);
+ while (dbi_result_next_row (tables) != 0)
{
const gchar* table_name;
- table_name = dbi_result_get_string_idx( tables, 1 );
- list = g_slist_prepend( list, strdup( table_name ) );
+ table_name = dbi_result_get_string_idx (tables, 1);
+ list = g_slist_prepend (list, strdup (table_name));
}
- dbi_result_free( tables );
+ dbi_result_free (tables);
return list;
}
static GSList*
-conn_get_table_list_sqlite3( dbi_conn conn, const gchar* dbname )
+conn_get_table_list_sqlite3 (dbi_conn conn, const gchar* dbname)
{
gboolean change_made;
/* Return the list, but remove the tables that sqlite3 adds for
* its own use. */
- GSList* list = conn_get_table_list( conn, dbname );
+ GSList* list = conn_get_table_list (conn, dbname);
change_made = TRUE;
- while ( list != NULL && change_made )
+ while (list != NULL && change_made)
{
GSList* node;
change_made = FALSE;
- for ( node = list; node != NULL; node = node->next )
+ for (node = list; node != NULL; node = node->next)
{
const gchar* table_name = (const gchar*)node->data;
- if ( strcmp( table_name, "sqlite_sequence" ) == 0 )
+ if (strcmp (table_name, "sqlite_sequence") == 0)
{
- g_free( node->data );
- list = g_slist_delete_link( list, node );
+ g_free (node->data);
+ list = g_slist_delete_link (list, node);
change_made = TRUE;
break;
}
@@ -3117,32 +3145,32 @@ conn_get_table_list_sqlite3( dbi_conn conn, const gchar* dbname )
}
static GSList*
-conn_get_table_list_pgsql( dbi_conn conn, const gchar* dbname )
+conn_get_table_list_pgsql (dbi_conn conn, const gchar* dbname)
{
gboolean change_made;
/* Return the list, but remove the tables that postgresql adds from the information schema. */
- GSList* list = conn_get_table_list( conn, dbname );
+ GSList* list = conn_get_table_list (conn, dbname);
change_made = TRUE;
- while ( list != NULL && change_made )
+ while (list != NULL && change_made)
{
GSList* node;
change_made = FALSE;
- for ( node = list; node != NULL; node = node->next )
+ for (node = list; node != NULL; node = node->next)
{
const gchar* table_name = (const gchar*)node->data;
- if ( strcmp( table_name, "sql_features" ) == 0 ||
- strcmp( table_name, "sql_implementation_info" ) == 0 ||
- strcmp( table_name, "sql_languages" ) == 0 ||
- strcmp( table_name, "sql_packages" ) == 0 ||
- strcmp( table_name, "sql_parts" ) == 0 ||
- strcmp( table_name, "sql_sizing" ) == 0 ||
- strcmp( table_name, "sql_sizing_profiles" ) == 0 )
+ if (strcmp (table_name, "sql_features") == 0 ||
+ strcmp (table_name, "sql_implementation_info") == 0 ||
+ strcmp (table_name, "sql_languages") == 0 ||
+ strcmp (table_name, "sql_packages") == 0 ||
+ strcmp (table_name, "sql_parts") == 0 ||
+ strcmp (table_name, "sql_sizing") == 0 ||
+ strcmp (table_name, "sql_sizing_profiles") == 0)
{
- g_free( node->data );
- list = g_slist_delete_link( list, node );
+ g_free (node->data);
+ list = g_slist_delete_link (list, node);
change_made = TRUE;
break;
}
@@ -3161,7 +3189,7 @@ conn_get_table_list_pgsql( dbi_conn conn, const gchar* dbname )
* GNC_DBI_FAIL_TEST if the bug was found.
*/
static GncDbiTestResult
-conn_test_dbi_library( dbi_conn conn )
+conn_test_dbi_library (dbi_conn conn)
{
gint64 testlonglong = -9223372036854775807LL, resultlonglong = 0;
guint64 testulonglong = 9223372036854775807LLU, resultulonglong = 0;
@@ -3169,66 +3197,68 @@ conn_test_dbi_library( dbi_conn conn )
dbi_result result;
gchar doublestr[G_ASCII_DTOSTR_BUF_SIZE], *querystr;
GncDbiTestResult retval = GNC_DBI_PASS;
- memset( doublestr, 0, sizeof(doublestr));
+ memset (doublestr, 0, sizeof (doublestr));
- result = dbi_conn_query( conn, "CREATE TEMPORARY TABLE numtest "
+ result = dbi_conn_query (conn, "CREATE TEMPORARY TABLE numtest "
"( test_int BIGINT, test_unsigned BIGINT,"
- " test_double FLOAT8 )" );
- if ( result == NULL )
+ " test_double FLOAT8 )");
+ if (result == NULL)
{
- PWARN("Test_DBI_Library: Create table failed");
+ PWARN ("Test_DBI_Library: Create table failed");
return GNC_DBI_FAIL_SETUP;
}
- dbi_result_free( result );
- g_ascii_dtostr( doublestr, sizeof(doublestr), testdouble );
- querystr = g_strdup_printf( "INSERT INTO numtest VALUES (%" G_GINT64_FORMAT
+ dbi_result_free (result);
+ g_ascii_dtostr (doublestr, sizeof (doublestr), testdouble);
+ querystr = g_strdup_printf ("INSERT INTO numtest VALUES (%" G_GINT64_FORMAT
", %" G_GUINT64_FORMAT ", %s)",
- testlonglong, testulonglong, doublestr );
- result = dbi_conn_query( conn, querystr );
- g_free( querystr );
- if ( result == NULL )
+ testlonglong, testulonglong, doublestr);
+ result = dbi_conn_query (conn, querystr);
+ g_free (querystr);
+ if (result == NULL)
{
- PWARN("Test_DBI_Library: Failed to insert test row into table" );
+ PWARN ("Test_DBI_Library: Failed to insert test row into table");
return GNC_DBI_FAIL_SETUP;
}
- dbi_result_free( result );
- gnc_push_locale( LC_NUMERIC, "C");
- result = dbi_conn_query( conn, "SELECT * FROM numtest" );
- if ( result == NULL )
- {
- const char *errmsg;
- dbi_conn_error( conn, &errmsg );
- PWARN("Test_DBI_Library: Failed to retrieve test row into table: %s",
- errmsg );
- result = dbi_conn_query( conn, "DROP TABLE numtest" );
- gnc_pop_locale( LC_NUMERIC );
+ dbi_result_free (result);
+ gnc_push_locale (LC_NUMERIC, "C");
+ result = dbi_conn_query (conn, "SELECT * FROM numtest");
+ if (result == NULL)
+ {
+ const char* errmsg;
+ dbi_conn_error (conn, &errmsg);
+ PWARN ("Test_DBI_Library: Failed to retrieve test row into table: %s",
+ errmsg);
+ result = dbi_conn_query (conn, "DROP TABLE numtest");
+ gnc_pop_locale (LC_NUMERIC);
return GNC_DBI_FAIL_SETUP;
}
- while ( dbi_result_next_row( result ))
+ while (dbi_result_next_row (result))
{
- resultlonglong = dbi_result_get_longlong( result, "test_int" );
- resultulonglong = dbi_result_get_ulonglong( result, "test_unsigned" );
- resultdouble = dbi_result_get_double( result, "test_double" );
+ resultlonglong = dbi_result_get_longlong (result, "test_int");
+ resultulonglong = dbi_result_get_ulonglong (result, "test_unsigned");
+ resultdouble = dbi_result_get_double (result, "test_double");
}
- gnc_pop_locale( LC_NUMERIC );
- if ( testlonglong != resultlonglong )
+ gnc_pop_locale (LC_NUMERIC);
+ if (testlonglong != resultlonglong)
{
- PWARN( "Test_DBI_Library: LongLong Failed %" G_GINT64_FORMAT " != % " G_GINT64_FORMAT,
- testlonglong, resultlonglong );
+ PWARN ("Test_DBI_Library: LongLong Failed %" G_GINT64_FORMAT " != % "
+ G_GINT64_FORMAT,
+ testlonglong, resultlonglong);
retval = GNC_DBI_FAIL_TEST;
}
- if ( testulonglong != resultulonglong )
+ if (testulonglong != resultulonglong)
{
- PWARN( "Test_DBI_Library: Unsigned longlong Failed %" G_GUINT64_FORMAT " != %" G_GUINT64_FORMAT,
- testulonglong, resultulonglong );
+ PWARN ("Test_DBI_Library: Unsigned longlong Failed %" G_GUINT64_FORMAT " != %"
+ G_GUINT64_FORMAT,
+ testulonglong, resultulonglong);
retval = GNC_DBI_FAIL_TEST;
}
/* A bug in libdbi stores only 7 digits of precision */
- if ( testdouble >= resultdouble + 0.000001e307 ||
- testdouble <= resultdouble - 0.000001e307 )
+ if (testdouble >= resultdouble + 0.000001e307 ||
+ testdouble <= resultdouble - 0.000001e307)
{
- PWARN( "Test_DBI_Library: Double Failed %17e != %17e",
- testdouble, resultdouble );
+ PWARN ("Test_DBI_Library: Double Failed %17e != %17e",
+ testdouble, resultdouble);
retval = GNC_DBI_FAIL_TEST;
}
return retval;
@@ -3236,14 +3266,14 @@ conn_test_dbi_library( dbi_conn conn )
static GncSqlConnection*
-create_dbi_connection( provider_functions_t* provider,
- QofBackend* qbe,
- dbi_conn conn )
+create_dbi_connection (provider_functions_t* provider,
+ QofBackend* qbe,
+ dbi_conn conn)
{
GncDbiSqlConnection* dbi_conn;
- dbi_conn = g_new0( GncDbiSqlConnection, 1 );
- g_assert( dbi_conn != NULL );
+ dbi_conn = g_new0 (GncDbiSqlConnection, 1);
+ g_assert (dbi_conn != NULL);
dbi_conn->base.dispose = conn_dispose;
dbi_conn->base.executeSelectStatement = conn_execute_select_statement;
@@ -3261,7 +3291,7 @@ create_dbi_connection( provider_functions_t* provider,
dbi_conn->conn = conn;
dbi_conn->provider = provider;
dbi_conn->conn_ok = TRUE;
- gnc_dbi_init_error(dbi_conn);
+ gnc_dbi_init_error (dbi_conn);
return (GncSqlConnection*)dbi_conn;
}
diff --git a/src/backend/dbi/gnc-backend-dbi.h b/src/backend/dbi/gnc-backend-dbi.h
index ecb0d22..d836d6e 100644
--- a/src/backend/dbi/gnc-backend-dbi.h
+++ b/src/backend/dbi/gnc-backend-dbi.h
@@ -36,17 +36,17 @@ extern "C"
/** Initialization function which can be used when this module is
* statically linked into the application. */
-void gnc_module_init_backend_dbi(void);
+void gnc_module_init_backend_dbi (void);
/** Shutdown function which can be used when this module is
* statically linked into the application. */
-void gnc_module_finalize_backend_dbi(void);
+void gnc_module_finalize_backend_dbi (void);
#ifndef GNC_NO_LOADABLE_MODULES
/** This is the standarized initialization function of a qof_backend
* GModule, but compiling this can be disabled by defining
* GNC_NO_LOADABLE_MODULES. */
-G_MODULE_EXPORT void qof_backend_module_init(void);
-G_MODULE_EXPORT void qof_backend_module_finalize(void);
+G_MODULE_EXPORT void qof_backend_module_init (void);
+G_MODULE_EXPORT void qof_backend_module_finalize (void);
#endif
#ifdef __cplusplus
}
diff --git a/src/backend/dbi/gncmod-backend-dbi.c b/src/backend/dbi/gncmod-backend-dbi.c
index e01dead..87846e0 100644
--- a/src/backend/dbi/gncmod-backend-dbi.c
+++ b/src/backend/dbi/gncmod-backend-dbi.c
@@ -43,38 +43,38 @@ int gnc_module_age = 0;
static GNCModule engine;
-gchar *
-gnc_module_path(void)
+gchar*
+gnc_module_path (void)
{
- return g_strdup( "gnucash/backend/dbi" );
+ return g_strdup ("gnucash/backend/dbi");
}
-gchar *
-gnc_module_description(void)
+gchar*
+gnc_module_description (void)
{
- return g_strdup( "The DBI/SQL backend for GnuCash" );
+ return g_strdup ("The DBI/SQL backend for GnuCash");
}
int
-gnc_module_init(int refcount)
+gnc_module_init (int refcount)
{
- engine = gnc_module_load( "gnucash/engine", 0 );
- if ( !engine ) return FALSE;
+ engine = gnc_module_load ("gnucash/engine", 0);
+ if (!engine) return FALSE;
return TRUE;
}
int
-gnc_module_end(int refcount)
+gnc_module_end (int refcount)
{
int unload = TRUE;
- if ( engine != NULL )
+ if (engine != NULL)
{
- unload = gnc_module_unload(engine);
+ unload = gnc_module_unload (engine);
}
- if ( refcount == 0 )
+ if (refcount == 0)
{
engine = NULL;
}
diff --git a/src/backend/dbi/test/test-backend-dbi-basic.cpp b/src/backend/dbi/test/test-backend-dbi-basic.cpp
index f81572e..01941cc 100644
--- a/src/backend/dbi/test/test-backend-dbi-basic.cpp
+++ b/src/backend/dbi/test/test-backend-dbi-basic.cpp
@@ -37,10 +37,10 @@ extern "C"
#include <qof.h>
#include <unittest-support.h>
#include <test-stuff.h>
-/* For cleaning up the database */
+ /* For cleaning up the database */
#include <dbi/dbi.h>
#include <gnc-uri-utils.h>
-/* For setup_business */
+ /* For setup_business */
#include "Account.h"
#include <TransLog.h>
#include "Transaction.h"
@@ -49,7 +49,7 @@ extern "C"
#include "gncAddress.h"
#include "gncCustomer.h"
#include "gncInvoice.h"
-/* For version_control */
+ /* For version_control */
#include <gnc-prefs.h>
#include <qofsession-p.h>
}
@@ -70,66 +70,68 @@ void test_suite_gnc_backend_dbi (void);
typedef struct
{
- QofSession *session;
- gchar *filename;
- GSList *hdlrs;
+ QofSession* session;
+ gchar* filename;
+ GSList* hdlrs;
} Fixture;
static void
-setup (Fixture *fixture, gconstpointer pData)
+setup (Fixture* fixture, gconstpointer pData)
{
- gchar *url = (gchar *)pData;
- fixture->session = qof_session_new();
+ gchar* url = (gchar*)pData;
+ fixture->session = qof_session_new ();
/* When running distcheck the source directory is read-only, which
* prevents creating the lock file. Force the session to get
* around that.
*/
qof_session_begin (fixture->session, DBI_TEST_XML_FILENAME, TRUE,
FALSE, TRUE);
- g_assert_cmpint (qof_session_get_error (fixture->session), ==,
+ g_assert_cmpint (qof_session_get_error (fixture->session), == ,
ERR_BACKEND_NO_ERR);
qof_session_load (fixture->session, NULL);
if (g_strcmp0 (url, "sqlite3") == 0)
- fixture->filename = g_strdup_printf ("/tmp/test-sqlite-%d", getpid());
+ fixture->filename = g_strdup_printf ("/tmp/test-sqlite-%d", getpid ());
else
fixture->filename = NULL;
}
static void
-setup_memory (Fixture *fixture, gconstpointer pData)
+setup_memory (Fixture* fixture, gconstpointer pData)
{
- QofSession* session = qof_session_new();
- gchar *url = (gchar*)pData;
+ QofSession* session = qof_session_new ();
+ gchar* url = (gchar*)pData;
QofBook* book;
- Account *root, *acct1, *acct2;
+ Account* root, *acct1, *acct2;
Transaction* tx;
- Split *spl1, *spl2;
+ Split* spl1, *spl2;
gnc_commodity_table* table;
gnc_commodity* currency;
- session = qof_session_new();
+ session = qof_session_new ();
book = qof_session_get_book (session);
root = gnc_book_get_root_account (book);
table = gnc_commodity_table_get_table (book);
- currency = gnc_commodity_table_lookup (table, GNC_COMMODITY_NS_CURRENCY, "CAD");
+ currency = gnc_commodity_table_lookup (table, GNC_COMMODITY_NS_CURRENCY,
+ "CAD");
acct1 = xaccMallocAccount (book);
xaccAccountSetType (acct1, ACCT_TYPE_BANK);
xaccAccountSetName (acct1, "Bank 1");
xaccAccountSetCommodity (acct1, currency);
- auto frame = qof_instance_get_slots (QOF_INSTANCE(acct1));
- frame->set("int64-val", new KvpValue(INT64_C(100)));
- frame->set("double-val", new KvpValue(3.14159));
- frame->set("numeric-val", new KvpValue(gnc_numeric_zero()));
+ auto frame = qof_instance_get_slots (QOF_INSTANCE (acct1));
+ frame->set ("int64-val", new KvpValue (INT64_C (100)));
+ frame->set ("double-val", new KvpValue (3.14159));
+ frame->set ("numeric-val", new KvpValue (gnc_numeric_zero ()));
- frame->set("timespec-val", new KvpValue(timespec_now ()));
+ frame->set ("timespec-val", new KvpValue (timespec_now ()));
- frame->set("string-val", new KvpValue("abcdefghijklmnop"));
- auto guid = qof_instance_get_guid (QOF_INSTANCE(acct1));
- frame->set("guid-val", new KvpValue(const_cast<GncGUID*>(guid_copy(guid))));
+ frame->set ("string-val", new KvpValue ("abcdefghijklmnop"));
+ auto guid = qof_instance_get_guid (QOF_INSTANCE (acct1));
+ frame->set ("guid-val", new KvpValue (const_cast<GncGUID*> (guid_copy (
+ guid))));
gnc_account_append_child (root, acct1);
@@ -148,16 +150,16 @@ setup_memory (Fixture *fixture, gconstpointer pData)
fixture->session = session;
if (g_strcmp0 (url, "sqlite3") == 0)
- fixture->filename = g_strdup_printf ("/tmp/test-sqlite-%d", getpid());
+ fixture->filename = g_strdup_printf ("/tmp/test-sqlite-%d", getpid ());
else
fixture->filename = NULL;
}
static void
-setup_business (Fixture *fixture, gconstpointer pData)
+setup_business (Fixture* fixture, gconstpointer pData)
{
- QofSession* session = qof_session_new();
- gchar *url = (gchar*)pData;
+ QofSession* session = qof_session_new ();
+ gchar* url = (gchar*)pData;
QofBook* book = qof_session_get_book (session);
Account* root = gnc_book_get_root_account (book);
Account* acct1;
@@ -171,7 +173,8 @@ setup_business (Fixture *fixture, gconstpointer pData)
GncTaxTableEntry* tte;
table = gnc_commodity_table_get_table (book);
- currency = gnc_commodity_table_lookup (table, GNC_COMMODITY_NS_CURRENCY, "CAD");
+ currency = gnc_commodity_table_lookup (table, GNC_COMMODITY_NS_CURRENCY,
+ "CAD");
acct1 = xaccMallocAccount (book);
xaccAccountSetType (acct1, ACCT_TYPE_BANK);
@@ -191,15 +194,15 @@ setup_business (Fixture *fixture, gconstpointer pData)
tt = gncTaxTableCreate (book);
gncTaxTableSetName (tt, "tt");
- tte = gncTaxTableEntryCreate();
+ tte = gncTaxTableEntryCreate ();
gncTaxTableEntrySetAccount (tte, acct1);
gncTaxTableEntrySetType (tte, GNC_AMT_TYPE_VALUE);
- gncTaxTableEntrySetAmount (tte, gnc_numeric_zero());
+ gncTaxTableEntrySetAmount (tte, gnc_numeric_zero ());
gncTaxTableAddEntry (tt, tte);
- tte = gncTaxTableEntryCreate();
+ tte = gncTaxTableEntryCreate ();
gncTaxTableEntrySetAccount (tte, acct2);
gncTaxTableEntrySetType (tte, GNC_AMT_TYPE_PERCENT);
- gncTaxTableEntrySetAmount (tte, gnc_numeric_zero());
+ gncTaxTableEntrySetAmount (tte, gnc_numeric_zero ());
gncTaxTableAddEntry (tt, tte);
cust = gncCustomerCreate (book);
@@ -207,7 +210,7 @@ setup_business (Fixture *fixture, gconstpointer pData)
gncCustomerSetName (cust, "MyCustomer");
gncCustomerSetNotes (cust, "Here are some notes");
gncCustomerSetCurrency (cust, currency);
- addr = gncAddressCreate (book, QOF_INSTANCE(cust));
+ addr = gncAddressCreate (book, QOF_INSTANCE (cust));
gncAddressSetName (addr, "theAddress");
gncAddressSetAddr1 (addr, "Address line #1");
gncAddressSetAddr2 (addr, "Address line #2");
@@ -225,7 +228,7 @@ setup_business (Fixture *fixture, gconstpointer pData)
fixture->session = session;
if (g_strcmp0 (url, "sqlite3") == 0)
- fixture->filename = g_strdup_printf ("/tmp/test-sqlite-%d", getpid());
+ fixture->filename = g_strdup_printf ("/tmp/test-sqlite-%d", getpid ());
else
fixture->filename = NULL;
}
@@ -233,9 +236,9 @@ setup_business (Fixture *fixture, gconstpointer pData)
static void
drop_table (gconstpointer tdata, gconstpointer cdata)
{
- gchar *table = (gchar*)tdata;
+ gchar* table = (gchar*)tdata;
dbi_conn conn = (dbi_conn)cdata;
- gchar *query = g_strdup_printf ("DROP TABLE %s", table);
+ gchar* query = g_strdup_printf ("DROP TABLE %s", table);
dbi_result rslt = dbi_conn_query (conn, query);
g_free (query);
}
@@ -243,35 +246,35 @@ drop_table (gconstpointer tdata, gconstpointer cdata)
static void
destroy_database (gchar* url)
{
- gchar *protocol = NULL;
- gchar *host = NULL;
- gchar *dbname = NULL;
- gchar *username = NULL;
- gchar *password = NULL;
- gchar *basename = NULL;
+ gchar* protocol = NULL;
+ gchar* host = NULL;
+ gchar* dbname = NULL;
+ gchar* username = NULL;
+ gchar* password = NULL;
+ gchar* basename = NULL;
gint portnum = 0;
- gchar *port = NULL;
+ gchar* port = NULL;
auto pgsql = "pgsql";
dbi_conn conn = NULL;
auto errfmt = "Unable to delete tables in %s: %s";
gint fail = 0;
dbi_result tables;
- GSList *list = NULL;
+ GSList* list = NULL;
- gnc_uri_get_components (url, &protocol, &host, &portnum,
- &username, &password, &dbname);
+ gnc_uri_get_components (url, &protocol, &host, &portnum,
+ &username, &password, &dbname);
if (g_strcmp0 (protocol, "postgres") == 0)
- #if HAVE_LIBDBI_R
- conn = dbi_conn_new_r( pgsql, dbi_instance );
- #else
- conn = dbi_conn_new( pgsql );
- #endif
+#if HAVE_LIBDBI_R
+ conn = dbi_conn_new_r (pgsql, dbi_instance);
+#else
+ conn = dbi_conn_new (pgsql);
+#endif
else
- #if HAVE_LIBDBI_R
+#if HAVE_LIBDBI_R
conn = dbi_conn_new_r (protocol, dbi_instance);
- #else
+#else
conn = dbi_conn_new (protocol);
- #endif
+#endif
port = g_strdup_printf ("%d", portnum);
if (conn == NULL)
{
@@ -299,7 +302,7 @@ destroy_database (gchar* url)
fail = dbi_conn_connect (conn);
if (fail != 0)
{
- const gchar *error;
+ const gchar* error;
gint errnum = dbi_conn_error (conn, &error);
g_printf (errfmt, url, error);
dbi_conn_close (conn);
@@ -308,7 +311,7 @@ destroy_database (gchar* url)
tables = dbi_conn_get_table_list (conn, dbname, NULL);
while (dbi_result_next_row (tables) != 0)
{
- const gchar *table = dbi_result_get_string_idx (tables, 1);
+ const gchar* table = dbi_result_get_string_idx (tables, 1);
list = g_slist_prepend (list, g_strdup (table));
}
dbi_result_free (tables);
@@ -317,22 +320,25 @@ destroy_database (gchar* url)
}
static void
-teardown (Fixture *fixture, gconstpointer pData)
+teardown (Fixture* fixture, gconstpointer pData)
{
auto lockfile = g_strdup_printf ("%s/test-dbi.xml.LCK",
- g_path_get_dirname (DBI_TEST_XML_FILENAME));
- auto msg = g_strdup_printf ("[xml_session_end()] Error on g_unlink(%s): 2: No such file or directory", lockfile);
+ g_path_get_dirname (DBI_TEST_XML_FILENAME));
+ auto msg =
+ g_strdup_printf ("[xml_session_end()] Error on g_unlink(%s): 2: No such file or directory",
+ lockfile);
auto logdomain = "gnc.backend";
- auto loglevel = static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL);
- TestErrorStruct *check = test_error_struct_new (logdomain, loglevel, msg);
+ auto loglevel = static_cast<GLogLevelFlags> (G_LOG_LEVEL_WARNING |
+ G_LOG_FLAG_FATAL);
+ TestErrorStruct* check = test_error_struct_new (logdomain, loglevel, msg);
fixture->hdlrs = test_log_set_fatal_handler (fixture->hdlrs, check,
- (GLogFunc)test_checked_handler);
+ (GLogFunc)test_checked_handler);
qof_session_end (fixture->session);
qof_session_destroy (fixture->session);
if (fixture->filename)
{
g_unlink (fixture->filename);
- g_free (fixture->filename);
+ g_free (fixture->filename);
}
else
destroy_database ((gchar*)pData);
@@ -340,26 +346,26 @@ teardown (Fixture *fixture, gconstpointer pData)
g_free (msg);
g_free (lockfile);
g_slist_free_full (fixture->hdlrs, test_free_log_handler);
- test_clear_error_list();
+ test_clear_error_list ();
}
static void
-test_conn_index_functions (QofBackend *qbe)
+test_conn_index_functions (QofBackend* qbe)
{
- GncDbiBackend *be = (GncDbiBackend*)qbe;
- GncDbiSqlConnection *conn = (GncDbiSqlConnection*)(be->sql_be.conn);
- GSList *index_list, *iter;
+ GncDbiBackend* be = (GncDbiBackend*)qbe;
+ GncDbiSqlConnection* conn = (GncDbiSqlConnection*) (be->sql_be.conn);
+ GSList* index_list, *iter;
index_list = conn->provider->get_index_list (be->conn);
- g_test_message ("Returned from index list\n");
+ g_test_message ("Returned from index list\n");
g_assert (index_list != NULL);
- g_assert_cmpint (g_slist_length (index_list), ==, 4);
- for (iter = index_list; iter != NULL; iter = g_slist_next (iter))
+ g_assert_cmpint (g_slist_length (index_list), == , 4);
+ for (iter = index_list; iter != NULL; iter = g_slist_next (iter))
{
- const char *errmsg;
+ const char* errmsg;
conn->provider->drop_index (be->conn,
- static_cast<const char*>(iter->data));
+ static_cast<const char*> (iter->data));
g_assert (DBI_ERROR_NONE == dbi_conn_error (conn->conn, &errmsg));
}
@@ -370,42 +376,43 @@ test_conn_index_functions (QofBackend *qbe)
* QofSession::save_as to save it to a specified sql url, then load it
* back and compare. */
static void
-test_dbi_store_and_reload (Fixture *fixture, gconstpointer pData)
+test_dbi_store_and_reload (Fixture* fixture, gconstpointer pData)
{
const gchar* url = (const gchar*)pData;
QofSession* session_2;
QofSession* session_3;
- QofBackend *be;
+ QofBackend* be;
auto msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
auto log_domain = "gnc.backend.dbi";
- auto loglevel = static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL);
- TestErrorStruct *check = test_error_struct_new (log_domain, loglevel, msg);
+ auto loglevel = static_cast<GLogLevelFlags> (G_LOG_LEVEL_WARNING |
+ G_LOG_FLAG_FATAL);
+ TestErrorStruct* check = test_error_struct_new (log_domain, loglevel, msg);
fixture->hdlrs = test_log_set_fatal_handler (fixture->hdlrs, check,
- (GLogFunc)test_checked_handler);
+ (GLogFunc)test_checked_handler);
if (fixture->filename)
url = fixture->filename;
// Save the session data
- session_2 = qof_session_new();
+ session_2 = qof_session_new ();
qof_session_begin (session_2, url, FALSE, TRUE, TRUE);
g_assert (session_2 != NULL);
- g_assert_cmpint (qof_session_get_error (session_2), ==, ERR_BACKEND_NO_ERR);
+ g_assert_cmpint (qof_session_get_error (session_2), == , ERR_BACKEND_NO_ERR);
qof_session_swap_data (fixture->session, session_2);
qof_session_save (session_2, NULL);
g_assert (session_2 != NULL);
- g_assert_cmpint (qof_session_get_error (session_2), ==, ERR_BACKEND_NO_ERR);
+ g_assert_cmpint (qof_session_get_error (session_2), == , ERR_BACKEND_NO_ERR);
// Reload the session data
- session_3 = qof_session_new();
+ session_3 = qof_session_new ();
g_assert (session_3 != NULL);
qof_session_begin (session_3, url, TRUE, FALSE, FALSE);
g_assert (session_3 != NULL);
- g_assert_cmpint (qof_session_get_error (session_3), ==, ERR_BACKEND_NO_ERR);
+ g_assert_cmpint (qof_session_get_error (session_3), == , ERR_BACKEND_NO_ERR);
qof_session_load (session_3, NULL);
g_assert (session_3 != NULL);
- g_assert_cmpint (qof_session_get_error (session_3), ==, ERR_BACKEND_NO_ERR);
+ g_assert_cmpint (qof_session_get_error (session_3), == , ERR_BACKEND_NO_ERR);
// Compare with the original data
compare_books (qof_session_get_book (session_2),
qof_session_get_book (session_3));
@@ -424,16 +431,17 @@ test_dbi_store_and_reload (Fixture *fixture, gconstpointer pData)
* appropriate shell.
*/
static void
-test_dbi_safe_save (Fixture *fixture, gconstpointer pData)
+test_dbi_safe_save (Fixture* fixture, gconstpointer pData)
{
auto url = (gchar*)pData;
- QofSession *session_1 = NULL, *session_2 = NULL;
- QofBackend *be;
+ QofSession* session_1 = NULL, *session_2 = NULL;
+ QofBackend* be;
auto msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
auto log_domain = "gnc.backend.dbi";
- auto loglevel = static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL);
- TestErrorStruct *check = test_error_struct_new (log_domain, loglevel, msg);
+ auto loglevel = static_cast<GLogLevelFlags> (G_LOG_LEVEL_WARNING |
+ G_LOG_FLAG_FATAL);
+ TestErrorStruct* check = test_error_struct_new (log_domain, loglevel, msg);
if (fixture->filename)
url = fixture->filename;
@@ -442,7 +450,7 @@ test_dbi_safe_save (Fixture *fixture, gconstpointer pData)
session_1 = qof_session_new ();
qof_session_begin (session_1, url, FALSE, TRUE, TRUE);
if (session_1 &&
- qof_session_get_error (session_1) != ERR_BACKEND_NO_ERR)
+ qof_session_get_error (session_1) != ERR_BACKEND_NO_ERR)
{
g_warning ("Session Error: %d, %s", qof_session_get_error (session_1),
qof_session_get_error_message (session_1));
@@ -454,10 +462,10 @@ test_dbi_safe_save (Fixture *fixture, gconstpointer pData)
qof_session_save (session_1, NULL);
/* Do a safe save */
qof_session_safe_save (session_1, NULL);
- if (session_1 && qof_session_get_error(session_1) != ERR_BACKEND_NO_ERR)
+ if (session_1 && qof_session_get_error (session_1) != ERR_BACKEND_NO_ERR)
{
g_warning ("Session Error: %s",
- qof_session_get_error_message(session_1));
+ qof_session_get_error_message (session_1));
g_test_message ("DB Session Safe Save Failed");
g_assert (FALSE);
goto cleanup;
@@ -467,10 +475,10 @@ test_dbi_safe_save (Fixture *fixture, gconstpointer pData)
session_2 = qof_session_new ();
qof_session_begin (session_2, url, TRUE, FALSE, FALSE);
if (session_2 &&
- qof_session_get_error (session_2) != ERR_BACKEND_NO_ERR)
+ qof_session_get_error (session_2) != ERR_BACKEND_NO_ERR)
{
- g_warning ("Session Error: %d, %s", qof_session_get_error(session_2),
- qof_session_get_error_message(session_2));
+ g_warning ("Session Error: %d, %s", qof_session_get_error (session_2),
+ qof_session_get_error_message (session_2));
g_test_message ("DB Session re-creation Failed");
g_assert (FALSE);
goto cleanup;
@@ -483,7 +491,7 @@ test_dbi_safe_save (Fixture *fixture, gconstpointer pData)
cleanup:
fixture->hdlrs = test_log_set_fatal_handler (fixture->hdlrs, check,
- (GLogFunc)test_checked_handler);
+ (GLogFunc)test_checked_handler);
if (session_2 != NULL)
{
qof_session_end (session_2);
@@ -501,24 +509,24 @@ cleanup:
* be better to do this starting from a fresh file, but instead we're
* being lazy and using an existing one. */
static void
-test_dbi_version_control (Fixture *fixture, gconstpointer pData)
+test_dbi_version_control (Fixture* fixture, gconstpointer pData)
{
auto url = (gchar*)pData;
- QofSession *sess;
- QofBook *book;
- QofBackend *qbe;
+ QofSession* sess;
+ QofBook* book;
+ QofBackend* qbe;
QofBackendError err;
- gint ourversion = gnc_prefs_get_long_version();
+ gint ourversion = gnc_prefs_get_long_version ();
// Load the session data
if (fixture->filename)
url = fixture->filename;
- sess = qof_session_new();
+ sess = qof_session_new ();
qof_session_begin (sess, url, FALSE, TRUE, TRUE);
- if (sess && qof_session_get_error(sess) != ERR_BACKEND_NO_ERR)
+ if (sess && qof_session_get_error (sess) != ERR_BACKEND_NO_ERR)
{
- g_warning ("Session Error: %d, %s", qof_session_get_error(sess),
- qof_session_get_error_message(sess));
+ g_warning ("Session Error: %d, %s", qof_session_get_error (sess),
+ qof_session_get_error_message (sess));
g_test_message ("DB Session Creation Failed");
g_assert (FALSE);
goto cleanup;
@@ -533,11 +541,11 @@ test_dbi_version_control (Fixture *fixture, gconstpointer pData)
qof_book_commit_edit (book);
qof_session_end (sess);
qof_session_destroy (sess);
- sess = qof_session_new();
+ sess = qof_session_new ();
qof_session_begin (sess, url, TRUE, FALSE, FALSE);
qof_session_load (sess, NULL);
err = qof_session_pop_error (sess);
- g_assert_cmpint (err, ==, ERR_SQL_DB_TOO_OLD);
+ g_assert_cmpint (err, == , ERR_SQL_DB_TOO_OLD);
qbe = qof_session_get_backend (sess);
book = qof_session_get_book (sess);
qof_book_begin_edit (book);
@@ -548,12 +556,12 @@ test_dbi_version_control (Fixture *fixture, gconstpointer pData)
qof_book_commit_edit (book);
qof_session_end (sess);
qof_session_destroy (sess);
- sess = qof_session_new();
+ sess = qof_session_new ();
qof_session_begin (sess, url, TRUE, FALSE, FALSE);
qof_session_load (sess, NULL);
qof_session_ensure_all_data_loaded (sess);
err = qof_session_pop_error (sess);
- g_assert_cmpint (err, ==, ERR_SQL_DB_TOO_NEW);
+ g_assert_cmpint (err, == , ERR_SQL_DB_TOO_NEW);
cleanup:
qbe = qof_session_get_backend (sess);
book = qof_session_get_book (sess);
@@ -566,7 +574,7 @@ cleanup:
}
static void
-test_dbi_business_store_and_reload (Fixture *fixture, gconstpointer pData)
+test_dbi_business_store_and_reload (Fixture* fixture, gconstpointer pData)
{
QofSession* session_2;
QofSession* session_3;
@@ -574,28 +582,30 @@ test_dbi_business_store_and_reload (Fixture *fixture, gconstpointer pData)
auto msg = "[gnc_dbi_unlock()] There was no lock entry in the Lock table";
auto log_domain = "gnc.backend.dbi";
- auto loglevel = static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL);
- TestErrorStruct *check = test_error_struct_new (log_domain, loglevel, msg);
+ auto loglevel = static_cast<GLogLevelFlags> (G_LOG_LEVEL_WARNING |
+ G_LOG_FLAG_FATAL);
+ TestErrorStruct* check = test_error_struct_new (log_domain, loglevel, msg);
if (fixture->filename)
url = fixture->filename;
// Save the session data
- session_2 = qof_session_new();
+ session_2 = qof_session_new ();
qof_session_begin (session_2, url, FALSE, TRUE, TRUE);
qof_session_swap_data (fixture->session, session_2);
qof_session_save (session_2, NULL);
// Reload the session data
- session_3 = qof_session_new();
+ session_3 = qof_session_new ();
qof_session_begin (session_3, url, TRUE, FALSE, FALSE);
qof_session_load (session_3, NULL);
// Compare with the original data
- compare_business_books (qof_session_get_book (session_2), qof_session_get_book (session_3));
+ compare_business_books (qof_session_get_book (session_2),
+ qof_session_get_book (session_3));
qof_session_end (session_2);
qof_session_destroy (session_2);
fixture->hdlrs = test_log_set_fatal_handler (fixture->hdlrs, check,
- (GLogFunc)test_checked_handler);
+ (GLogFunc)test_checked_handler);
qof_session_end (session_3);
qof_session_destroy (session_3);
}
@@ -634,7 +644,7 @@ test_adjust_sql_options_string (void)
}
static void
-create_dbi_test_suite (const char *dbm_name, const char *url)
+create_dbi_test_suite (const char* dbm_name, const char* url)
{
auto subsuite = g_strdup_printf ("%s/%s", suitename, dbm_name);
GNC_TEST_ADD (subsuite, "store_and_reload", Fixture, url, setup,
@@ -653,15 +663,15 @@ void
test_suite_gnc_backend_dbi (void)
{
dbi_driver driver = NULL;
- GList *drivers = NULL;
- #if HAVE_LIBDBI_R
+ GList* drivers = NULL;
+#if HAVE_LIBDBI_R
if (dbi_instance == NULL)
- dbi_initialize_r (NULL, &dbi_instance);
+ dbi_initialize_r (NULL, &dbi_instance);
while ((driver = dbi_driver_list_r (driver, dbi_instance)))
- #else
+#else
dbi_initialize (NULL);
while ((driver = dbi_driver_list (driver)))
- #endif
+#endif
{
drivers = g_list_prepend (drivers,
(gchar*)dbi_driver_get_name (driver));
@@ -669,10 +679,10 @@ test_suite_gnc_backend_dbi (void)
if (g_list_find_custom (drivers, "sqlite3", (GCompareFunc)g_strcmp0))
create_dbi_test_suite ("sqlite3", "sqlite3");
if (strlen (TEST_MYSQL_URL) > 0 &&
- g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0))
+ g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0))
create_dbi_test_suite ("mysql", TEST_MYSQL_URL);
if (strlen (TEST_PGSQL_URL) > 0 &&
- g_list_find_custom (drivers, "pgsql", (GCompareFunc)g_strcmp0))
+ g_list_find_custom (drivers, "pgsql", (GCompareFunc)g_strcmp0))
{
g_setenv ("PGOPTIONS", "-c client_min_messages=WARNING", FALSE);
create_dbi_test_suite ("postgres", TEST_PGSQL_URL);
diff --git a/src/backend/dbi/test/test-backend-dbi.cpp b/src/backend/dbi/test/test-backend-dbi.cpp
index 282dace..6bf6785 100644
--- a/src/backend/dbi/test/test-backend-dbi.cpp
+++ b/src/backend/dbi/test/test-backend-dbi.cpp
@@ -1,6 +1,6 @@
/********************************************************************
* test-backend-dbi.c: GLib test execution file for backend/dbi *
- * Copyright 2011 John Ralls <jralls at ceridwen.us> *
+ * Copyright 2011 John Ralls <jralls at ceridwen.us> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@@ -33,18 +33,18 @@ extern void test_suite_gnc_backend_dbi ();
int
main (int argc,
- char *argv[])
+ char* argv[])
{
- qof_init(); /* equally initializes gobject system */
- qof_log_init_filename_special("stderr"); /* Init the log system */
- g_test_init ( &argc, &argv, NULL ); /* initialize test program */
- g_test_bug_base("https://bugzilla.gnome.org/show_bug.cgi?id="); /* init the bugzilla URL */
- cashobjects_register();
+ qof_init (); /* equally initializes gobject system */
+ qof_log_init_filename_special ("stderr"); /* Init the log system */
+ g_test_init (&argc, &argv, NULL); /* initialize test program */
+ g_test_bug_base ("https://bugzilla.gnome.org/show_bug.cgi?id="); /* init the bugzilla URL */
+ cashobjects_register ();
g_assert (qof_load_backend_library ("../.libs/", GNC_LIB_NAME));
g_assert (qof_load_backend_library ("../../xml/.libs",
"gncmod-backend-xml"));
test_suite_gnc_backend_dbi ();
- return g_test_run( );
+ return g_test_run ();
}
diff --git a/src/backend/dbi/test/test-dbi-business-stuff.cpp b/src/backend/dbi/test/test-dbi-business-stuff.cpp
index 6657189..6461f41 100644
--- a/src/backend/dbi/test/test-dbi-business-stuff.cpp
+++ b/src/backend/dbi/test/test-dbi-business-stuff.cpp
@@ -47,147 +47,159 @@ extern "C"
G_GNUC_UNUSED static QofLogModule log_module = "test-dbi";
static void
-compare_single_customer( QofInstance* inst, gpointer user_data )
+compare_single_customer (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- GncCustomer* cust_1 = GNC_CUSTOMER(inst);
- GncCustomer* cust_2 = gncCustomerLookup( info->book_2, qof_instance_get_guid(inst) );
+ GncCustomer* cust_1 = GNC_CUSTOMER (inst);
+ GncCustomer* cust_2 = gncCustomerLookup (info->book_2,
+ qof_instance_get_guid (inst));
- if (!gncCustomerEqual( cust_1, cust_2 ))
+ if (!gncCustomerEqual (cust_1, cust_2))
{
info->result = FALSE;
}
}
static void
-compare_customers( QofBook* book_1, QofBook* book_2 )
+compare_customers (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_CUSTOMER, compare_single_customer, "Customer lists match" );
+ do_compare (book_1, book_2, GNC_ID_CUSTOMER, compare_single_customer,
+ "Customer lists match");
}
static void
-compare_single_employee( QofInstance* inst, gpointer user_data )
+compare_single_employee (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- GncEmployee* emp_1 = GNC_EMPLOYEE(inst);
- GncEmployee* emp_2 = gncEmployeeLookup( info->book_2, qof_instance_get_guid(inst) );
+ GncEmployee* emp_1 = GNC_EMPLOYEE (inst);
+ GncEmployee* emp_2 = gncEmployeeLookup (info->book_2,
+ qof_instance_get_guid (inst));
- if (!gncEmployeeEqual( emp_1, emp_2 ))
+ if (!gncEmployeeEqual (emp_1, emp_2))
{
info->result = FALSE;
}
}
static void
-compare_employees( QofBook* book_1, QofBook* book_2 )
+compare_employees (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_EMPLOYEE, compare_single_employee, "Employee lists match" );
+ do_compare (book_1, book_2, GNC_ID_EMPLOYEE, compare_single_employee,
+ "Employee lists match");
}
static void
-compare_single_invoice( QofInstance* inst, gpointer user_data )
+compare_single_invoice (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- GncInvoice* inv_1 = GNC_INVOICE(inst);
- GncInvoice* inv_2 = gncInvoiceLookup( info->book_2, qof_instance_get_guid(inst) );
+ GncInvoice* inv_1 = GNC_INVOICE (inst);
+ GncInvoice* inv_2 = gncInvoiceLookup (info->book_2,
+ qof_instance_get_guid (inst));
- if (!gncInvoiceEqual( inv_1, inv_2 ))
+ if (!gncInvoiceEqual (inv_1, inv_2))
{
info->result = FALSE;
}
}
static void
-compare_invoices( QofBook* book_1, QofBook* book_2 )
+compare_invoices (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_INVOICE, compare_single_invoice, "Invoice lists match" );
+ do_compare (book_1, book_2, GNC_ID_INVOICE, compare_single_invoice,
+ "Invoice lists match");
}
static void
-compare_single_job( QofInstance* inst, gpointer user_data )
+compare_single_job (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- GncJob* job_1 = GNC_JOB(inst);
- GncJob* job_2 = gncJobLookup( info->book_2, qof_instance_get_guid(inst) );
+ GncJob* job_1 = GNC_JOB (inst);
+ GncJob* job_2 = gncJobLookup (info->book_2, qof_instance_get_guid (inst));
- if (!gncJobEqual( job_1, job_2 ))
+ if (!gncJobEqual (job_1, job_2))
{
info->result = FALSE;
}
}
static void
-compare_jobs( QofBook* book_1, QofBook* book_2 )
+compare_jobs (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_JOB, compare_single_job, "Job lists match" );
+ do_compare (book_1, book_2, GNC_ID_JOB, compare_single_job, "Job lists match");
}
static void
-compare_single_vendor( QofInstance* inst, gpointer user_data )
+compare_single_vendor (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- GncVendor* vendor_1 = GNC_VENDOR(inst);
- GncVendor* vendor_2 = gncVendorLookup( info->book_2, qof_instance_get_guid(inst) );
+ GncVendor* vendor_1 = GNC_VENDOR (inst);
+ GncVendor* vendor_2 = gncVendorLookup (info->book_2,
+ qof_instance_get_guid (inst));
- if (!gncVendorEqual( vendor_1, vendor_2 ))
+ if (!gncVendorEqual (vendor_1, vendor_2))
{
info->result = FALSE;
}
}
static void
-compare_vendors( QofBook* book_1, QofBook* book_2 )
+compare_vendors (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_VENDOR, compare_single_vendor, "Vendor lists match" );
+ do_compare (book_1, book_2, GNC_ID_VENDOR, compare_single_vendor,
+ "Vendor lists match");
}
static void
-compare_single_billterm( QofInstance* inst, gpointer user_data )
+compare_single_billterm (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- GncBillTerm* bt_1 = GNC_BILLTERM(inst);
- GncBillTerm* bt_2 = gncBillTermLookup( info->book_2, qof_instance_get_guid(inst) );
+ GncBillTerm* bt_1 = GNC_BILLTERM (inst);
+ GncBillTerm* bt_2 = gncBillTermLookup (info->book_2,
+ qof_instance_get_guid (inst));
- if (!gncBillTermEqual( bt_1, bt_2 ))
+ if (!gncBillTermEqual (bt_1, bt_2))
{
info->result = FALSE;
}
}
static void
-compare_billterms( QofBook* book_1, QofBook* book_2 )
+compare_billterms (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_BILLTERM, compare_single_billterm, "Billterms lists match" );
+ do_compare (book_1, book_2, GNC_ID_BILLTERM, compare_single_billterm,
+ "Billterms lists match");
}
static void
-compare_single_taxtable( QofInstance* inst, gpointer user_data )
+compare_single_taxtable (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- GncTaxTable* tt_1 = GNC_TAXTABLE(inst);
- GncTaxTable* tt_2 = gncTaxTableLookup( info->book_2, qof_instance_get_guid(inst) );
+ GncTaxTable* tt_1 = GNC_TAXTABLE (inst);
+ GncTaxTable* tt_2 = gncTaxTableLookup (info->book_2,
+ qof_instance_get_guid (inst));
- if (!gncTaxTableEqual( tt_1, tt_2 ))
+ if (!gncTaxTableEqual (tt_1, tt_2))
{
info->result = FALSE;
}
}
static void
-compare_taxtables( QofBook* book_1, QofBook* book_2 )
+compare_taxtables (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_TAXTABLE, compare_single_taxtable, "TaxTable lists match" );
+ do_compare (book_1, book_2, GNC_ID_TAXTABLE, compare_single_taxtable,
+ "TaxTable lists match");
}
void
-compare_business_books( QofBook* book_1, QofBook* book_2 )
+compare_business_books (QofBook* book_1, QofBook* book_2)
{
- compare_billterms( book_1, book_2 );
- compare_taxtables( book_1, book_2 );
+ compare_billterms (book_1, book_2);
+ compare_taxtables (book_1, book_2);
- compare_customers( book_1, book_2 );
- compare_employees( book_1, book_2 );
- compare_invoices( book_1, book_2 );
- compare_jobs( book_1, book_2 );
- compare_vendors( book_1, book_2 );
+ compare_customers (book_1, book_2);
+ compare_employees (book_1, book_2);
+ compare_invoices (book_1, book_2);
+ compare_jobs (book_1, book_2);
+ compare_vendors (book_1, book_2);
}
diff --git a/src/backend/dbi/test/test-dbi-business-stuff.h b/src/backend/dbi/test/test-dbi-business-stuff.h
index c70165e..53d46d4 100644
--- a/src/backend/dbi/test/test-dbi-business-stuff.h
+++ b/src/backend/dbi/test/test-dbi-business-stuff.h
@@ -26,5 +26,5 @@
#ifndef _TEST_DBI_BUSINESS_STUFF_H_
#define _TEST_DBI_BUSINESS_STUFF_H_
-void compare_business_books( QofBook* book_1, QofBook* book_2 );
+void compare_business_books (QofBook* book_1, QofBook* book_2);
#endif
diff --git a/src/backend/dbi/test/test-dbi-stuff.cpp b/src/backend/dbi/test/test-dbi-stuff.cpp
index f053c26..ea1f043 100644
--- a/src/backend/dbi/test/test-dbi-stuff.cpp
+++ b/src/backend/dbi/test/test-dbi-stuff.cpp
@@ -50,58 +50,58 @@ static void do_test (G_GNUC_UNUSED gboolean foo, G_GNUC_UNUSED gchar* bar)
}
void
-do_compare( QofBook* book_1, QofBook* book_2, const gchar* id,
- QofInstanceForeachCB cb, const gchar* msg )
+do_compare (QofBook* book_1, QofBook* book_2, const gchar* id,
+ QofInstanceForeachCB cb, const gchar* msg)
{
QofCollection* coll;
CompareInfoStruct info;
- coll = qof_book_get_collection( book_1, id );
+ coll = qof_book_get_collection (book_1, id);
info.book_1 = book_1;
info.book_2 = book_2;
info.result = TRUE;
- qof_collection_foreach(coll, cb, &info);
+ qof_collection_foreach (coll, cb, &info);
}
static void
-compare_account_trees( QofBook* book_1, QofBook* book_2 )
+compare_account_trees (QofBook* book_1, QofBook* book_2)
{
- Account* root_1 = gnc_book_get_root_account( book_1 );
- Account* root_2 = gnc_book_get_root_account( book_2 );
+ Account* root_1 = gnc_book_get_root_account (book_1);
+ Account* root_2 = gnc_book_get_root_account (book_2);
- xaccAccountSetHidden( root_1, xaccAccountGetHidden( root_1 ) );
- g_assert (xaccAccountEqual( root_1, root_2, FALSE ));
+ xaccAccountSetHidden (root_1, xaccAccountGetHidden (root_1));
+ g_assert (xaccAccountEqual (root_1, root_2, FALSE));
}
static void
-compare_single_tx( QofInstance* inst, gpointer user_data )
+compare_single_tx (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- Transaction* tx_1 = GNC_TRANS(inst);
- Transaction* tx_2 = xaccTransLookup( qof_instance_get_guid(inst),
- info->book_2 );
+ Transaction* tx_1 = GNC_TRANS (inst);
+ Transaction* tx_2 = xaccTransLookup (qof_instance_get_guid (inst),
+ info->book_2);
g_assert (xaccTransEqual (tx_1, tx_2, TRUE, TRUE, TRUE, FALSE));
}
static void
-compare_txs( QofBook* book_1, QofBook* book_2 )
+compare_txs (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_TRANS,
- compare_single_tx, "Transaction lists match" );
+ do_compare (book_1, book_2, GNC_ID_TRANS,
+ compare_single_tx, "Transaction lists match");
}
static SchedXaction*
-get_sx_by_guid (QofBook* book, const GncGUID *guid)
+get_sx_by_guid (QofBook* book, const GncGUID* guid)
{
- SchedXactions *sxes = gnc_book_get_schedxactions (book);
- GList *sxitem;
+ SchedXactions* sxes = gnc_book_get_schedxactions (book);
+ GList* sxitem;
for (sxitem = sxes->sx_list; sxitem != NULL; sxitem = sxitem->next)
{
- const GncGUID *sx_guid;
- sx_guid = qof_instance_get_guid (QOF_INSTANCE(sxitem->data));
+ const GncGUID* sx_guid;
+ sx_guid = qof_instance_get_guid (QOF_INSTANCE (sxitem->data));
if (guid_equal (sx_guid, guid))
- return static_cast<SchedXaction*>(sxitem->data);
+ return static_cast<SchedXaction*> (sxitem->data);
}
return NULL;
}
@@ -111,37 +111,37 @@ get_sx_by_guid (QofBook* book, const GncGUID *guid)
*/
#define TEST_GDATES_EQUAL(gd1, gd2) \
- if (g_date_valid (gd1)) \
- { \
- g_assert (g_date_valid (gd2)); \
+ if (g_date_valid (gd1)) \
+ { \
+ g_assert (g_date_valid (gd2)); \
g_assert (g_date_compare (gd1, gd2) == 0);\
}
static void
-compare_recurrences (GList *rl_1, GList *rl_2)
+compare_recurrences (GList* rl_1, GList* rl_2)
{
- GList *ritem1, *ritem2;
+ GList* ritem1, *ritem2;
if (rl_1 == NULL)
return;
g_assert (rl_2 != NULL);
- g_assert_cmpint (g_list_length (rl_1), ==, g_list_length (rl_2));
+ g_assert_cmpint (g_list_length (rl_1), == , g_list_length (rl_2));
for (ritem1 = rl_1, ritem2 = rl_2; ritem1 != NULL && ritem2 != NULL;
- ritem1 = g_list_next (ritem1), ritem2 = g_list_next (ritem2))
+ ritem1 = g_list_next (ritem1), ritem2 = g_list_next (ritem2))
{
- auto r1 = static_cast<Recurrence*>(ritem1->data);
- auto r2 = static_cast<Recurrence*>(ritem2->data);
+ auto r1 = static_cast<Recurrence*> (ritem1->data);
+ auto r2 = static_cast<Recurrence*> (ritem2->data);
TEST_GDATES_EQUAL (&r1->start, &r2->start);
- g_assert_cmpint (r1->ptype, ==, r2->ptype);
- g_assert_cmpint (r1->mult, ==, r2->mult);
- g_assert_cmpint (r1->wadj, ==, r2->wadj);
+ g_assert_cmpint (r1->ptype, == , r2->ptype);
+ g_assert_cmpint (r1->mult, == , r2->mult);
+ g_assert_cmpint (r1->wadj, == , r2->wadj);
}
}
static void
-compare_single_sx( QofInstance* inst, gpointer user_data )
+compare_single_sx (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
SchedXaction* sx_1 = GNC_SCHEDXACTION (inst);
@@ -149,107 +149,107 @@ compare_single_sx( QofInstance* inst, gpointer user_data )
qof_instance_get_guid (inst));
g_assert (sx_2 != NULL);
- g_assert_cmpstr (sx_1->name, ==, sx_2->name);
+ g_assert_cmpstr (sx_1->name, == , sx_2->name);
compare_recurrences (sx_2->schedule, sx_1->schedule);
- TEST_GDATES_EQUAL(&sx_2->last_date, &sx_1->last_date);
- TEST_GDATES_EQUAL(&sx_2->start_date, &sx_1->start_date);
- TEST_GDATES_EQUAL(&sx_2->end_date, &sx_1->end_date);
- g_assert_cmpint (sx_2->num_occurances_total, ==,
+ TEST_GDATES_EQUAL (&sx_2->last_date, &sx_1->last_date);
+ TEST_GDATES_EQUAL (&sx_2->start_date, &sx_1->start_date);
+ TEST_GDATES_EQUAL (&sx_2->end_date, &sx_1->end_date);
+ g_assert_cmpint (sx_2->num_occurances_total, == ,
sx_1->num_occurances_total);
- g_assert_cmpint (sx_2->num_occurances_remain, ==,
+ g_assert_cmpint (sx_2->num_occurances_remain, == ,
sx_1->num_occurances_remain);
- g_assert_cmpint (sx_2->instance_num, ==, sx_1->instance_num);
- g_assert_cmpint (sx_2->enabled, ==, sx_1->enabled);
- g_assert_cmpint (sx_2->autoCreateOption, ==, sx_1->autoCreateOption);
- g_assert_cmpint (sx_2->autoCreateNotify, ==, sx_1->autoCreateNotify);
- g_assert_cmpint (sx_2->advanceCreateDays, ==, sx_1->advanceCreateDays);
- g_assert_cmpint (sx_2->advanceRemindDays, ==, sx_1->advanceRemindDays);
+ g_assert_cmpint (sx_2->instance_num, == , sx_1->instance_num);
+ g_assert_cmpint (sx_2->enabled, == , sx_1->enabled);
+ g_assert_cmpint (sx_2->autoCreateOption, == , sx_1->autoCreateOption);
+ g_assert_cmpint (sx_2->autoCreateNotify, == , sx_1->autoCreateNotify);
+ g_assert_cmpint (sx_2->advanceCreateDays, == , sx_1->advanceCreateDays);
+ g_assert_cmpint (sx_2->advanceRemindDays, == , sx_1->advanceRemindDays);
}
static void
-compare_sxs( QofBook* book_1, QofBook* book_2 )
+compare_sxs (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_SCHEDXACTION,
- compare_single_sx, "Scheduled transaction lists match" );
+ do_compare (book_1, book_2, GNC_ID_SCHEDXACTION,
+ compare_single_sx, "Scheduled transaction lists match");
}
/* EFFECTIVE FRIEND FUNCTION */
-extern KvpFrame *qof_instance_get_slots (const QofInstance *);
+extern KvpFrame* qof_instance_get_slots (const QofInstance*);
static void
-compare_single_lot( QofInstance* inst, gpointer user_data )
+compare_single_lot (QofInstance* inst, gpointer user_data)
{
CompareInfoStruct* info = (CompareInfoStruct*)user_data;
- GNCLot *lot_1 = GNC_LOT(inst);
- GNCLot *lot_2 = gnc_lot_lookup (qof_instance_get_guid(inst),
- info->book_2 );
- GList *split1, *splits1, *splits2;
+ GNCLot* lot_1 = GNC_LOT (inst);
+ GNCLot* lot_2 = gnc_lot_lookup (qof_instance_get_guid (inst),
+ info->book_2);
+ GList* split1, *splits1, *splits2;
- g_assert (xaccAccountEqual( gnc_lot_get_account (lot_1),
- gnc_lot_get_account (lot_2), FALSE ));
- g_assert_cmpint (gnc_lot_is_closed (lot_1), ==, gnc_lot_is_closed (lot_2));
+ g_assert (xaccAccountEqual (gnc_lot_get_account (lot_1),
+ gnc_lot_get_account (lot_2), FALSE));
+ g_assert_cmpint (gnc_lot_is_closed (lot_1), == , gnc_lot_is_closed (lot_2));
g_assert (compare (qof_instance_get_slots (QOF_INSTANCE (lot_1)),
qof_instance_get_slots (QOF_INSTANCE (lot_2))) == 0);
splits1 = gnc_lot_get_split_list (lot_1);
splits2 = gnc_lot_get_split_list (lot_2);
- g_assert_cmpint (g_list_length (splits1), ==, g_list_length (splits2));
+ g_assert_cmpint (g_list_length (splits1), == , g_list_length (splits2));
for (split1 = splits1; split1 != NULL; split1 = g_list_next (split1))
{
- Split *split2;
+ Split* split2;
g_assert (GNC_IS_SPLIT (split1->data));
split2 = xaccSplitLookup (qof_instance_get_guid (split1->data),
info->book_2);
g_assert (GNC_IS_SPLIT (split2));
- g_assert (xaccSplitEqual (static_cast<Split*>(split1->data),
+ g_assert (xaccSplitEqual (static_cast<Split*> (split1->data),
split2, TRUE, TRUE, TRUE));
}
}
static void
-compare_lots( QofBook* book_1, QofBook* book_2 )
+compare_lots (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_LOT, compare_single_lot, "Lot lists match" );
+ do_compare (book_1, book_2, GNC_ID_LOT, compare_single_lot, "Lot lists match");
}
static void
-test_conn_index_functions( QofBackend *qbe )
+test_conn_index_functions (QofBackend* qbe)
{
- GncDbiBackend *be = (GncDbiBackend*)qbe;
- GncDbiSqlConnection *conn = (GncDbiSqlConnection*)(be->sql_be.conn);
- GSList *index_list, *iter;
+ GncDbiBackend* be = (GncDbiBackend*)qbe;
+ GncDbiSqlConnection* conn = (GncDbiSqlConnection*) (be->sql_be.conn);
+ GSList* index_list, *iter;
- index_list = conn->provider->get_index_list( be->conn );
- g_test_message ( "Returned from index list\n");
+ index_list = conn->provider->get_index_list (be->conn);
+ g_test_message ("Returned from index list\n");
g_assert (index_list != NULL);
- g_assert_cmpint (g_slist_length( index_list ), ==, 4);
- for ( iter = index_list; iter != NULL; iter = g_slist_next( iter) )
+ g_assert_cmpint (g_slist_length (index_list), == , 4);
+ for (iter = index_list; iter != NULL; iter = g_slist_next (iter))
{
- const char *errmsg;
+ const char* errmsg;
conn->provider->drop_index (be->conn,
- static_cast<const char*>(iter->data));
- g_assert (DBI_ERROR_NONE == dbi_conn_error( conn->conn, &errmsg));
+ static_cast<const char*> (iter->data));
+ g_assert (DBI_ERROR_NONE == dbi_conn_error (conn->conn, &errmsg));
}
- g_slist_free( index_list );
+ g_slist_free (index_list);
}
static void
-compare_pricedbs( QofBook* book_1, QofBook* book_2 )
+compare_pricedbs (QofBook* book_1, QofBook* book_2)
{
- do_compare( book_1, book_2, GNC_ID_TRANS,
- compare_single_tx, "Transaction lists match" );
+ do_compare (book_1, book_2, GNC_ID_TRANS,
+ compare_single_tx, "Transaction lists match");
}
void
-compare_books( QofBook* book_1, QofBook* book_2 )
+compare_books (QofBook* book_1, QofBook* book_2)
{
- QofBackend *be = qof_book_get_backend( book_2 );
- compare_account_trees( book_1, book_2 );
- compare_pricedbs( book_1, book_2 );
- compare_txs( book_1, book_2 );
- compare_sxs( book_1, book_2 );
- compare_lots( book_1, book_2 );
+ QofBackend* be = qof_book_get_backend (book_2);
+ compare_account_trees (book_1, book_2);
+ compare_pricedbs (book_1, book_2);
+ compare_txs (book_1, book_2);
+ compare_sxs (book_1, book_2);
+ compare_lots (book_1, book_2);
}
diff --git a/src/backend/dbi/test/test-dbi-stuff.h b/src/backend/dbi/test/test-dbi-stuff.h
index c9a025a..81f3fe1 100644
--- a/src/backend/dbi/test/test-dbi-stuff.h
+++ b/src/backend/dbi/test/test-dbi-stuff.h
@@ -37,9 +37,10 @@ typedef struct
QofBook* book_2;
gboolean result;
} CompareInfoStruct;
-void compare_books( QofBook* book_1, QofBook* book_2 );
+void compare_books (QofBook* book_1, QofBook* book_2);
-void do_compare( QofBook* book_1, QofBook* book_2, const gchar* id, QofInstanceForeachCB cb, const gchar* msg );
+void do_compare (QofBook* book_1, QofBook* book_2, const gchar* id,
+ QofInstanceForeachCB cb, const gchar* msg);
#ifdef __cplusplus
}
#endif
diff --git a/src/backend/sql/escape.cpp b/src/backend/sql/escape.cpp
index a51e283..5c4103c 100644
--- a/src/backend/sql/escape.cpp
+++ b/src/backend/sql/escape.cpp
@@ -42,7 +42,7 @@ static QofLogModule log_module = GNC_MOD_BACKEND;
struct _escape
{
/* pointer to memory used for escaping arguments */
- char * escape;
+ char* escape;
size_t esc_buflen;
};
@@ -51,25 +51,25 @@ struct _escape
* database SQL parser doesn't puke on the query string
*/
-const char *
-sqlEscapeString (sqlEscape *b, const char *str)
+const char*
+sqlEscapeString (sqlEscape* b, const char* str)
{
- const char *p, *src_head;
- char *dst_tail;
+ const char* p, *src_head;
+ char* dst_tail;
size_t len, slen;
- ENTER("str = %s", str);
+ ENTER ("str = %s", str);
if (!b || !str)
{
- LEAVE("(null) args");
+ LEAVE ("(null) args");
return NULL;
}
/* if a string is escaped twice, just return the first */
if (b->escape == str)
{
- LEAVE("%s: already escaped", str);
+ LEAVE ("%s: already escaped", str);
return str;
}
@@ -78,7 +78,7 @@ sqlEscapeString (sqlEscape *b, const char *str)
slen = strcspn (str, "\\\'");
if (len == slen)
{
- LEAVE("nothing to escape");
+ LEAVE ("nothing to escape");
return str;
}
@@ -93,13 +93,13 @@ sqlEscapeString (sqlEscape *b, const char *str)
/* get more space, if needed */
if (len >= b->esc_buflen)
{
- b->escape = static_cast<decltype(b->escape)>(g_realloc(b->escape,
- len + 100));
+ b->escape = static_cast < decltype (b->escape) > (g_realloc (b->escape,
+ len + 100));
b->esc_buflen = len + 100;
}
/* copy and escape */
- src_head = (char *) str;
+ src_head = (char*) str;
dst_tail = b->escape;
p = src_head + strcspn (src_head, "\\\'");
while (*p)
@@ -125,7 +125,7 @@ sqlEscapeString (sqlEscape *b, const char *str)
}
*dst_tail = 0;
- LEAVE("b->escape = %s", b->escape);
+ LEAVE ("b->escape = %s", b->escape);
return b->escape;
}
@@ -133,12 +133,12 @@ sqlEscapeString (sqlEscape *b, const char *str)
#define INITIAL_BUFSZ 2000
-sqlEscape *
+sqlEscape*
sqlEscape_new (void)
{
- sqlEscape *b = g_new (sqlEscape, 1);
+ sqlEscape* b = g_new (sqlEscape, 1);
- b->escape = static_cast<decltype(b->escape)>(g_malloc (INITIAL_BUFSZ));
+ b->escape = static_cast < decltype (b->escape) > (g_malloc (INITIAL_BUFSZ));
b->esc_buflen = INITIAL_BUFSZ;
return (b);
}
@@ -146,18 +146,18 @@ sqlEscape_new (void)
/* ================================================ */
void
-sqlEscape_destroy (sqlEscape *b)
+sqlEscape_destroy (sqlEscape* b)
{
- ENTER(" ");
+ ENTER (" ");
if (!b)
{
- LEAVE("b is (null)");
+ LEAVE ("b is (null)");
return;
}
g_free (b->escape);
b->escape = NULL;
g_free (b);
- LEAVE(" ");
+ LEAVE (" ");
}
/* ================ END OF FILE ==================== */
diff --git a/src/backend/sql/escape.h b/src/backend/sql/escape.h
index 711d4b8..becfd9e 100644
--- a/src/backend/sql/escape.h
+++ b/src/backend/sql/escape.h
@@ -36,10 +36,10 @@
typedef struct _escape sqlEscape;
-sqlEscape * sqlEscape_new(void);
-void sqlEscape_destroy (sqlEscape *);
+sqlEscape* sqlEscape_new (void);
+void sqlEscape_destroy (sqlEscape*);
-const char * sqlEscapeString (sqlEscape *, const char *orig_string);
+const char* sqlEscapeString (sqlEscape*, const char* orig_string);
#endif /* SQL_ESCAPE_H */
diff --git a/src/backend/sql/gnc-account-sql.cpp b/src/backend/sql/gnc-account-sql.cpp
index c85c7f9..226f385 100644
--- a/src/backend/sql/gnc-account-sql.cpp
+++ b/src/backend/sql/gnc-account-sql.cpp
@@ -52,9 +52,9 @@ static QofLogModule log_module = G_LOG_DOMAIN;
#define TABLE_NAME "accounts"
#define TABLE_VERSION 1
-static gpointer get_parent( gpointer pObject );
-static void set_parent( gpointer pObject, gpointer pValue );
-static void set_parent_guid( gpointer pObject, gpointer pValue );
+static gpointer get_parent (gpointer pObject);
+static void set_parent (gpointer pObject, gpointer pValue);
+static void set_parent_guid (gpointer pObject, gpointer pValue);
#define ACCOUNT_MAX_NAME_LEN 2048
#define ACCOUNT_MAX_TYPE_LEN 2048
@@ -87,114 +87,114 @@ static GncSqlColumnTableEntry parent_col_table[] =
typedef struct
{
- Account* pAccount;
+ Account* pAccount;
GncGUID guid;
} account_parent_guid_struct;
/* ================================================================= */
static gpointer
-get_parent( gpointer pObject )
+get_parent (gpointer pObject)
{
const Account* pAccount;
const Account* pParent;
const GncGUID* parent_guid;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_ACCOUNT(pObject), NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (GNC_IS_ACCOUNT (pObject), NULL);
- pAccount = GNC_ACCOUNT(pObject);
- pParent = gnc_account_get_parent( pAccount );
- if ( pParent == NULL )
+ pAccount = GNC_ACCOUNT (pObject);
+ pParent = gnc_account_get_parent (pAccount);
+ if (pParent == NULL)
{
parent_guid = NULL;
}
else
{
- parent_guid = qof_instance_get_guid( QOF_INSTANCE(pParent) );
+ parent_guid = qof_instance_get_guid (QOF_INSTANCE (pParent));
}
return (gpointer)parent_guid;
}
static void
-set_parent( gpointer pObject, gpointer pValue )
+set_parent (gpointer pObject, gpointer pValue)
{
Account* pAccount;
QofBook* pBook;
GncGUID* guid = (GncGUID*)pValue;
Account* pParent;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_ACCOUNT(pObject) );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (GNC_IS_ACCOUNT (pObject));
- pAccount = GNC_ACCOUNT(pObject);
- pBook = qof_instance_get_book( QOF_INSTANCE(pAccount) );
- if ( guid != NULL )
+ pAccount = GNC_ACCOUNT (pObject);
+ pBook = qof_instance_get_book (QOF_INSTANCE (pAccount));
+ if (guid != NULL)
{
- pParent = xaccAccountLookup( guid, pBook );
- if ( pParent != NULL )
+ pParent = xaccAccountLookup (guid, pBook);
+ if (pParent != NULL)
{
- gnc_account_append_child( pParent, pAccount );
+ gnc_account_append_child (pParent, pAccount);
}
}
}
static void
-set_parent_guid( gpointer pObject, gpointer pValue )
+set_parent_guid (gpointer pObject, gpointer pValue)
{
account_parent_guid_struct* s = (account_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pValue != NULL);
s->guid = *guid;
}
static Account*
-load_single_account( GncSqlBackend* be, GncSqlRow* row,
- GList** l_accounts_needing_parents )
+load_single_account (GncSqlBackend* be, GncSqlRow* row,
+ GList** l_accounts_needing_parents)
{
const GncGUID* guid;
Account* pAccount = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
- g_return_val_if_fail( l_accounts_needing_parents != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
+ g_return_val_if_fail (l_accounts_needing_parents != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- if ( guid != NULL )
+ guid = gnc_sql_load_guid (be, row);
+ if (guid != NULL)
{
- pAccount = xaccAccountLookup( guid, be->book );
+ pAccount = xaccAccountLookup (guid, be->book);
}
- if ( pAccount == NULL )
+ if (pAccount == NULL)
{
- pAccount = xaccMallocAccount( be->book );
+ pAccount = xaccMallocAccount (be->book);
}
- xaccAccountBeginEdit( pAccount );
- gnc_sql_load_object( be, row, GNC_ID_ACCOUNT, pAccount, col_table );
- xaccAccountCommitEdit( pAccount );
+ xaccAccountBeginEdit (pAccount);
+ gnc_sql_load_object (be, row, GNC_ID_ACCOUNT, pAccount, col_table);
+ xaccAccountCommitEdit (pAccount);
/* If we don't have a parent and this isn't the root account, it might be because the parent
account hasn't been loaded yet. Remember the account and its parent guid for later. */
- if ( gnc_account_get_parent( pAccount ) == NULL
- && pAccount != gnc_book_get_root_account( be->book ) )
+ if (gnc_account_get_parent (pAccount) == NULL
+ && pAccount != gnc_book_get_root_account (be->book))
{
- account_parent_guid_struct* s = static_cast<decltype(s)>(
- g_malloc(sizeof(account_parent_guid_struct)));
- g_assert( s != NULL );
+ account_parent_guid_struct* s = static_cast<decltype (s)> (
+ g_malloc (sizeof (account_parent_guid_struct)));
+ g_assert (s != NULL);
s->pAccount = pAccount;
- gnc_sql_load_object( be, row, GNC_ID_ACCOUNT, s, parent_col_table );
- *l_accounts_needing_parents = g_list_prepend( *l_accounts_needing_parents, s );
+ gnc_sql_load_object (be, row, GNC_ID_ACCOUNT, s, parent_col_table);
+ *l_accounts_needing_parents = g_list_prepend (*l_accounts_needing_parents, s);
}
return pAccount;
}
static void
-load_all_accounts( GncSqlBackend* be )
+load_all_accounts (GncSqlBackend* be)
{
GncSqlStatement* stmt = NULL;
GncSqlResult* result;
@@ -203,63 +203,64 @@ load_all_accounts( GncSqlBackend* be )
GSList* bal_slist;
GSList* bal;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- ENTER( "" );
+ ENTER ("");
pBook = be->book;
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- if ( stmt == NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ if (stmt == NULL)
{
- LEAVE( "stmt == NULL" );
+ LEAVE ("stmt == NULL");
return;
}
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
gchar* sql;
- while ( row != NULL )
+ while (row != NULL)
{
- load_single_account( be, row, &l_accounts_needing_parents );
- row = gnc_sql_result_get_next_row( result );
+ load_single_account (be, row, &l_accounts_needing_parents);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
- gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)xaccAccountLookup );
- g_free( sql );
+ sql = g_strdup_printf ("SELECT DISTINCT guid FROM %s", TABLE_NAME);
+ gnc_sql_slots_load_for_sql_subquery (be, sql, (BookLookupFn)xaccAccountLookup);
+ g_free (sql);
/* While there are items on the list of accounts needing parents,
try to see if the parent has now been loaded. Theory says that if
items are removed from the front and added to the back if the
parent is still not available, then eventually, the list will
shrink to size 0. */
- if ( l_accounts_needing_parents != NULL )
+ if (l_accounts_needing_parents != NULL)
{
gboolean progress_made = TRUE;
Account* root;
Account* pParent;
GList* elem;
- while ( progress_made )
+ while (progress_made)
{
progress_made = FALSE;
- for ( elem = l_accounts_needing_parents; elem != NULL; )
+ for (elem = l_accounts_needing_parents; elem != NULL;)
{
account_parent_guid_struct* s = (account_parent_guid_struct*)elem->data;
- pParent = xaccAccountLookup( &s->guid, be->book );
- if ( pParent != NULL )
+ pParent = xaccAccountLookup (&s->guid, be->book);
+ if (pParent != NULL)
{
GList* next_elem;
- gnc_account_append_child( pParent, s->pAccount );
- next_elem = g_list_next( elem );
- l_accounts_needing_parents = g_list_delete_link( l_accounts_needing_parents, elem );
- g_free( s );
+ gnc_account_append_child (pParent, s->pAccount);
+ next_elem = g_list_next (elem);
+ l_accounts_needing_parents = g_list_delete_link (l_accounts_needing_parents,
+ elem);
+ g_free (s);
elem = next_elem;
progress_made = TRUE;
}
@@ -267,95 +268,97 @@ load_all_accounts( GncSqlBackend* be )
{
/* Can't be up in the for loop because the 'then' clause reads inside a node freed
by g_list_delete_link(). */
- elem = g_list_next( elem );
+ elem = g_list_next (elem);
}
}
}
/* Any non-ROOT accounts left over must be parented by the root account */
- root = gnc_book_get_root_account( pBook );
- while ( l_accounts_needing_parents != NULL )
+ root = gnc_book_get_root_account (pBook);
+ while (l_accounts_needing_parents != NULL)
{
- account_parent_guid_struct* s = (account_parent_guid_struct*)l_accounts_needing_parents->data;
- if ( xaccAccountGetType( s->pAccount ) != ACCT_TYPE_ROOT )
+ account_parent_guid_struct* s = (account_parent_guid_struct*)
+ l_accounts_needing_parents->data;
+ if (xaccAccountGetType (s->pAccount) != ACCT_TYPE_ROOT)
{
- gnc_account_append_child( root, s->pAccount );
+ gnc_account_append_child (root, s->pAccount);
}
- g_free( s );
- l_accounts_needing_parents = g_list_delete_link( l_accounts_needing_parents, l_accounts_needing_parents );
+ g_free (s);
+ l_accounts_needing_parents = g_list_delete_link (l_accounts_needing_parents,
+ l_accounts_needing_parents);
}
}
/* Load starting balances */
- bal_slist = gnc_sql_get_account_balances_slist( be );
- for ( bal = bal_slist; bal != NULL; bal = bal->next )
+ bal_slist = gnc_sql_get_account_balances_slist (be);
+ for (bal = bal_slist; bal != NULL; bal = bal->next)
{
acct_balances_t* balances = (acct_balances_t*)bal->data;
- qof_instance_increase_editlevel (balances->acct);
- g_object_set( balances->acct,
+ qof_instance_increase_editlevel (balances->acct);
+ g_object_set (balances->acct,
"start-balance", &balances->balance,
"start-cleared-balance", &balances->cleared_balance,
"start-reconciled-balance", &balances->reconciled_balance,
NULL);
- qof_instance_decrease_editlevel (balances->acct);
+ qof_instance_decrease_editlevel (balances->acct);
}
- if ( bal_slist != NULL )
+ if (bal_slist != NULL)
{
- g_slist_free( bal_slist );
+ g_slist_free (bal_slist);
}
}
- LEAVE( "" );
+ LEAVE ("");
}
/* ================================================================= */
static void
-create_account_tables( GncSqlBackend* be )
+create_account_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
}
/* ================================================================= */
gboolean
-gnc_sql_save_account( GncSqlBackend* be, QofInstance* inst )
+gnc_sql_save_account (GncSqlBackend* be, QofInstance* inst)
{
- Account* pAcc = GNC_ACCOUNT(inst);
+ Account* pAcc = GNC_ACCOUNT (inst);
const GncGUID* guid;
gboolean is_infant;
gboolean is_ok = FALSE;
gnc_commodity* commodity;
E_DB_OPERATION op;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_ACCOUNT(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_ACCOUNT (inst), FALSE);
- ENTER( "inst=%p", inst );
+ ENTER ("inst=%p", inst);
- is_infant = qof_instance_get_infant( inst );
+ is_infant = qof_instance_get_infant (inst);
// If there is no commodity yet, this might be because a new account name
// has been entered directly into the register and an account window will
// be opened. The account info is not complete yet, but the name has been
// set, triggering this commit
- commodity = xaccAccountGetCommodity( pAcc );
+ commodity = xaccAccountGetCommodity (pAcc);
is_ok = TRUE;
- if ( qof_instance_get_destroying( inst ) )
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -365,72 +368,74 @@ gnc_sql_save_account( GncSqlBackend* be, QofInstance* inst )
}
// If not deleting the account, ensure the commodity is in the db
- if ( op != OP_DB_DELETE && commodity != NULL )
+ if (op != OP_DB_DELETE && commodity != NULL)
{
- is_ok = gnc_sql_save_commodity( be, commodity );
+ is_ok = gnc_sql_save_commodity (be, commodity);
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_ACCOUNT, pAcc, col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, TABLE_NAME, GNC_ID_ACCOUNT, pAcc,
+ col_table);
}
- if ( is_ok )
+ if (is_ok)
{
// Now, commit or delete any slots
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
+ is_ok = gnc_sql_slots_delete (be, guid);
}
}
- LEAVE( "is_ok=%d", is_ok );
+ LEAVE ("is_ok=%d", is_ok);
return is_ok;
}
/* ================================================================= */
static void
-load_account_guid( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_account_guid (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
Account* account = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- (void)string_to_guid( g_value_get_string( val ), &guid );
- account = xaccAccountLookup( &guid, be->book );
- if ( account != NULL )
+ (void)string_to_guid (g_value_get_string (val), &guid);
+ account = xaccAccountLookup (&guid, be->book);
+ if (account != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, account, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, account, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)account );
+ g_return_if_fail (setter != NULL);
+ (*setter) (pObject, (const gpointer)account);
}
}
else
{
- PWARN( "Account ref '%s' not found", g_value_get_string( val ) );
+ PWARN ("Account ref '%s' not found", g_value_get_string (val));
}
}
}
@@ -443,23 +448,23 @@ static GncSqlColumnTypeHandler account_guid_handler
};
/* ================================================================= */
void
-gnc_sql_init_account_handler( void )
+gnc_sql_init_account_handler (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_ACCOUNT,
- gnc_sql_save_account, /* commit */
- load_all_accounts, /* initial_load */
- create_account_tables, /* create_tables */
+ gnc_sql_save_account, /* commit */
+ load_all_accounts, /* initial_load */
+ create_account_tables, /* create_tables */
NULL, /* compile_query */
NULL, /* run_query */
NULL, /* free_query */
NULL /* write */
};
- (void)qof_object_register_backend( GNC_ID_ACCOUNT, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (GNC_ID_ACCOUNT, GNC_SQL_BACKEND, &be_data);
- gnc_sql_register_col_type_handler( CT_ACCOUNTREF, &account_guid_handler );
+ gnc_sql_register_col_type_handler (CT_ACCOUNTREF, &account_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-account-sql.h b/src/backend/sql/gnc-account-sql.h
index 06e6daa..c6e0935 100644
--- a/src/backend/sql/gnc-account-sql.h
+++ b/src/backend/sql/gnc-account-sql.h
@@ -34,7 +34,7 @@ extern "C"
{
#include "qof.h"
}
-void gnc_sql_init_account_handler( void );
-gboolean gnc_sql_save_account( GncSqlBackend* be, QofInstance* inst );
+void gnc_sql_init_account_handler (void);
+gboolean gnc_sql_save_account (GncSqlBackend* be, QofInstance* inst);
#endif /* GNC_ACCOUNT_SQL_H */
diff --git a/src/backend/sql/gnc-address-sql.cpp b/src/backend/sql/gnc-address-sql.cpp
index 7fc1b1f..bca6be7 100644
--- a/src/backend/sql/gnc-address-sql.cpp
+++ b/src/backend/sql/gnc-address-sql.cpp
@@ -63,13 +63,13 @@ static GncSqlColumnTableEntry col_table[] =
{ NULL }
};
-typedef void (*AddressSetterFunc)( gpointer, GncAddress* );
-typedef GncAddress* (*AddressGetterFunc)( const gpointer );
+typedef void (*AddressSetterFunc) (gpointer, GncAddress*);
+typedef GncAddress* (*AddressGetterFunc) (const gpointer);
static void
-load_address( const GncSqlBackend* be, GncSqlRow* row,
+load_address (const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
gchar* buf;
@@ -78,116 +78,121 @@ load_address( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* subtable;
const gchar* s;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- addr = gncAddressCreate( be->book, NULL );
- for ( subtable = col_table; subtable->col_name != NULL; subtable++ )
+ addr = gncAddressCreate (be->book, NULL);
+ for (subtable = col_table; subtable->col_name != NULL; subtable++)
{
- buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable->col_name );
- val = gnc_sql_row_get_value_at_col_name( row, buf );
- g_free( buf );
- if ( val == NULL )
+ buf = g_strdup_printf ("%s_%s", table_row->col_name, subtable->col_name);
+ val = gnc_sql_row_get_value_at_col_name (row, buf);
+ g_free (buf);
+ if (val == NULL)
{
s = NULL;
}
else
{
- s = g_value_get_string( val );
+ s = g_value_get_string (val);
}
- if ( subtable->gobj_param_name != NULL )
+ if (subtable->gobj_param_name != NULL)
{
- g_object_set( addr, subtable->gobj_param_name, s, NULL );
+ g_object_set (addr, subtable->gobj_param_name, s, NULL);
}
else
{
- if ( subtable->qof_param_name != NULL )
+ if (subtable->qof_param_name != NULL)
{
- setter = qof_class_get_parameter_setter( GNC_ID_ADDRESS, subtable->qof_param_name );
+ setter = qof_class_get_parameter_setter (GNC_ID_ADDRESS,
+ subtable->qof_param_name);
}
else
{
setter = subtable->setter;
}
- (*setter)( addr, (const gpointer)s );
+ (*setter) (addr, (const gpointer)s);
}
}
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, addr, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, addr, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- (*a_setter)( pObject, addr );
+ (*a_setter) (pObject, addr);
}
}
static void
-add_address_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_address_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
gchar* buf;
const GncSqlColumnTableEntry* subtable_row;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- for ( subtable_row = col_table; subtable_row->col_name != NULL; subtable_row++ )
+ for (subtable_row = col_table; subtable_row->col_name != NULL; subtable_row++)
{
- buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable_row->col_name );
- info = g_new0( GncSqlColumnInfo, 1 );
+ buf = g_strdup_printf ("%s_%s", table_row->col_name, subtable_row->col_name);
+ info = g_new0 (GncSqlColumnInfo, 1);
info->name = buf;
info->type = BCT_STRING;
info->size = subtable_row->size;
info->is_primary_key = (table_row->flags & COL_PKEY) ? TRUE : FALSE;
info->null_allowed = (table_row->flags & COL_NNUL) ? FALSE : TRUE;
info->is_unicode = TRUE;
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
}
static void
-add_address_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
+add_address_colname_to_list (const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
- gnc_sql_add_subtable_colnames_to_list( table_row, col_table, pList );
+ gnc_sql_add_subtable_colnames_to_list (table_row, col_table, pList);
}
static void
-get_gvalue_address( const GncSqlBackend* be, QofIdTypeConst obj_name, const gpointer pObject,
- const GncSqlColumnTableEntry* table_row, GValue* value )
+get_gvalue_address (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject,
+ const GncSqlColumnTableEntry* table_row, GValue* value)
{
AddressGetterFunc getter;
GncAddress* addr;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( value != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (value != NULL);
- memset( value, 0, sizeof( GValue ) );
- if ( table_row->gobj_param_name != NULL )
+ memset (value, 0, sizeof (GValue));
+ if (table_row->gobj_param_name != NULL)
{
- g_object_get( pObject, table_row->gobj_param_name, &addr, NULL );
+ g_object_get (pObject, table_row->gobj_param_name, &addr, NULL);
}
else
{
- getter = (AddressGetterFunc)gnc_sql_get_getter( obj_name, table_row );
- addr = (*getter)( pObject );
+ getter = (AddressGetterFunc)gnc_sql_get_getter (obj_name, table_row);
+ addr = (*getter) (pObject);
}
- g_value_init( value, gnc_address_get_type() );
- g_value_set_object( value, addr );
+ g_value_init (value, gnc_address_get_type ());
+ g_value_set_object (value, addr);
}
static void
-add_gvalue_address_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_address_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
GValue value;
GValue* subfield_value;
@@ -196,39 +201,39 @@ add_gvalue_address_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
QofAccessFunc getter;
const GncSqlColumnTableEntry* subtable_row;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- memset( &value, 0, sizeof( GValue ) );
- get_gvalue_address( be, obj_name, pObject, table_row, &value );
+ memset (&value, 0, sizeof (GValue));
+ get_gvalue_address (be, obj_name, pObject, table_row, &value);
- if ( G_VALUE_TYPE(&value) != 0 )
+ if (G_VALUE_TYPE (&value) != 0)
{
- addr = static_cast<decltype(addr)>(g_value_get_object(&value));
- for ( subtable_row = col_table; subtable_row->col_name != NULL; subtable_row++ )
+ addr = static_cast<decltype (addr)> (g_value_get_object (&value));
+ for (subtable_row = col_table; subtable_row->col_name != NULL; subtable_row++)
{
- subfield_value = g_new0( GValue, 1 );
- if ( subtable_row->gobj_param_name != NULL )
+ subfield_value = g_new0 (GValue, 1);
+ if (subtable_row->gobj_param_name != NULL)
{
- g_object_get( addr, subtable_row->gobj_param_name, &s, NULL );
+ g_object_get (addr, subtable_row->gobj_param_name, &s, NULL);
}
else
{
- getter = gnc_sql_get_getter( GNC_ID_ADDRESS, subtable_row );
- s = (gchar*)(*getter)( addr, NULL );
+ getter = gnc_sql_get_getter (GNC_ID_ADDRESS, subtable_row);
+ s = (gchar*) (*getter) (addr, NULL);
}
- g_value_init( subfield_value, G_TYPE_STRING );
- if ( s )
+ g_value_init (subfield_value, G_TYPE_STRING);
+ if (s)
{
- g_value_set_string( subfield_value, s );
+ g_value_set_string (subfield_value, s);
}
else
{
- g_value_set_string( subfield_value, "NULL" );
+ g_value_set_string (subfield_value, "NULL");
}
- (*pList) = g_slist_append( (*pList), subfield_value );
+ (*pList) = g_slist_append ((*pList), subfield_value);
}
}
}
@@ -242,8 +247,8 @@ static GncSqlColumnTypeHandler address_handler
/* ================================================================= */
void
-gnc_address_sql_initialize( void )
+gnc_address_sql_initialize (void)
{
- gnc_sql_register_col_type_handler( CT_ADDRESS, &address_handler );
+ gnc_sql_register_col_type_handler (CT_ADDRESS, &address_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-address-sql.h b/src/backend/sql/gnc-address-sql.h
index 589ae4e..51e6034 100644
--- a/src/backend/sql/gnc-address-sql.h
+++ b/src/backend/sql/gnc-address-sql.h
@@ -31,6 +31,6 @@
#define CT_ADDRESS "address"
-void gnc_address_sql_initialize( void );
+void gnc_address_sql_initialize (void);
#endif /* GNC_ADDRESS_SQL_H */
diff --git a/src/backend/sql/gnc-backend-sql.cpp b/src/backend/sql/gnc-backend-sql.cpp
index 0ede462..f57fbee 100644
--- a/src/backend/sql/gnc-backend-sql.cpp
+++ b/src/backend/sql/gnc-backend-sql.cpp
@@ -79,31 +79,31 @@ extern "C"
#include "gnc-tax-table-sql.h"
#include "gnc-vendor-sql.h"
-static void gnc_sql_init_object_handlers( void );
-static void update_progress( GncSqlBackend* be );
-static void finish_progress( GncSqlBackend* be );
-static void register_standard_col_type_handlers( void );
-static gboolean reset_version_info( GncSqlBackend* be );
-static GncSqlStatement* build_insert_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table );
-static GncSqlStatement* build_update_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table );
-static GncSqlStatement* build_delete_statement( GncSqlBackend* be,
- const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table );
-
-static GList *post_load_commodities = NULL;
+static void gnc_sql_init_object_handlers (void);
+static void update_progress (GncSqlBackend* be);
+static void finish_progress (GncSqlBackend* be);
+static void register_standard_col_type_handlers (void);
+static gboolean reset_version_info (GncSqlBackend* be);
+static GncSqlStatement* build_insert_statement (GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table);
+static GncSqlStatement* build_update_statement (GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table);
+static GncSqlStatement* build_delete_statement (GncSqlBackend* be,
+ const gchar* table_name,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table);
+
+static GList* post_load_commodities = NULL;
#define TRANSACTION_NAME "trans"
typedef struct
{
- QofIdType searchObj;
+ QofIdType searchObj;
gpointer pCompiledQuery;
} gnc_sql_query_info;
@@ -126,14 +126,14 @@ static QofLogModule log_module = G_LOG_DOMAIN;
/* ================================================================= */
void
-gnc_sql_init( GncSqlBackend* be )
+gnc_sql_init (GncSqlBackend* be)
{
static gboolean initialized = FALSE;
- if ( !initialized )
+ if (!initialized)
{
- register_standard_col_type_handlers();
- gnc_sql_init_object_handlers();
+ register_standard_col_type_handlers ();
+ gnc_sql_init_object_handlers ();
initialized = TRUE;
}
}
@@ -141,18 +141,18 @@ gnc_sql_init( GncSqlBackend* be )
/* ================================================================= */
static void
-create_tables_cb( const gchar* type, gpointer data_p, gpointer be_p )
+create_tables_cb (const gchar* type, gpointer data_p, gpointer be_p)
{
- GncSqlObjectBackend* pData = static_cast<decltype(pData)>(data_p);
- GncSqlBackend* be = static_cast<decltype(be)>(be_p);
+ GncSqlObjectBackend* pData = static_cast<decltype (pData)> (data_p);
+ GncSqlBackend* be = static_cast<decltype (be)> (be_p);
- g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
- g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
+ g_return_if_fail (type != NULL && data_p != NULL && be_p != NULL);
+ g_return_if_fail (pData->version == GNC_SQL_BACKEND_VERSION);
- if ( pData->create_tables != NULL )
+ if (pData->create_tables != NULL)
{
- update_progress( be );
- (pData->create_tables)( be );
+ update_progress (be);
+ (pData->create_tables) (be);
}
}
@@ -166,114 +166,114 @@ static const gchar* fixed_load_order[] =
static const gchar** other_load_order = NULL;
void
-gnc_sql_set_load_order( const gchar** load_order )
+gnc_sql_set_load_order (const gchar** load_order)
{
other_load_order = load_order;
}
static void
-initial_load_cb( const gchar* type, gpointer data_p, gpointer be_p )
+initial_load_cb (const gchar* type, gpointer data_p, gpointer be_p)
{
- GncSqlObjectBackend* pData = static_cast<decltype(pData)>(data_p);
- GncSqlBackend* be = static_cast<decltype(be)>(be_p);
+ GncSqlObjectBackend* pData = static_cast<decltype (pData)> (data_p);
+ GncSqlBackend* be = static_cast<decltype (be)> (be_p);
gint i;
- g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
- g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
+ g_return_if_fail (type != NULL && data_p != NULL && be_p != NULL);
+ g_return_if_fail (pData->version == GNC_SQL_BACKEND_VERSION);
// Don't need to load anything if it has already been loaded with the fixed order
- for ( i = 0; fixed_load_order[i] != NULL; i++ )
+ for (i = 0; fixed_load_order[i] != NULL; i++)
{
- update_progress( be );
- if ( g_ascii_strcasecmp( type, fixed_load_order[i] ) == 0 ) return;
+ update_progress (be);
+ if (g_ascii_strcasecmp (type, fixed_load_order[i]) == 0) return;
}
- if ( other_load_order != NULL )
+ if (other_load_order != NULL)
{
- for ( i = 0; other_load_order[i] != NULL; i++ )
+ for (i = 0; other_load_order[i] != NULL; i++)
{
- update_progress( be );
- if ( g_ascii_strcasecmp( type, other_load_order[i] ) == 0 ) return;
+ update_progress (be);
+ if (g_ascii_strcasecmp (type, other_load_order[i]) == 0) return;
}
}
- if ( pData->initial_load != NULL )
+ if (pData->initial_load != NULL)
{
- (pData->initial_load)( be );
+ (pData->initial_load) (be);
}
}
void
-gnc_sql_push_commodity_for_postload_processing (GncSqlBackend *be,
- gpointer comm)
+gnc_sql_push_commodity_for_postload_processing (GncSqlBackend* be,
+ gpointer comm)
{
- post_load_commodities = g_list_prepend(post_load_commodities, comm);
+ post_load_commodities = g_list_prepend (post_load_commodities, comm);
}
static void
commit_commodity (gpointer data)
{
- gnc_commodity *comm = GNC_COMMODITY (data);
+ gnc_commodity* comm = GNC_COMMODITY (data);
gnc_sql_commit_commodity (comm);
}
void
-gnc_sql_load( GncSqlBackend* be, QofBook *book, QofBackendLoadType loadType )
+gnc_sql_load (GncSqlBackend* be, QofBook* book, QofBackendLoadType loadType)
{
GncSqlObjectBackend* pData;
gint i;
Account* root;
- g_return_if_fail( be != NULL );
- g_return_if_fail( book != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (book != NULL);
- ENTER( "be=%p, book=%p", be, book );
+ ENTER ("be=%p, book=%p", be, book);
be->loading = TRUE;
- if ( loadType == LOAD_TYPE_INITIAL_LOAD )
+ if (loadType == LOAD_TYPE_INITIAL_LOAD)
{
- g_assert( be->book == NULL );
+ g_assert (be->book == NULL);
be->book = book;
/* Load any initial stuff. Some of this needs to happen in a certain order */
- for ( i = 0; fixed_load_order[i] != NULL; i++ )
+ for (i = 0; fixed_load_order[i] != NULL; i++)
{
- pData = static_cast<decltype(pData)>(qof_object_lookup_backend(
- fixed_load_order[i],
- GNC_SQL_BACKEND));
- if ( pData->initial_load != NULL )
+ pData = static_cast<decltype (pData)> (qof_object_lookup_backend (
+ fixed_load_order[i],
+ GNC_SQL_BACKEND));
+ if (pData->initial_load != NULL)
{
- update_progress( be );
- (pData->initial_load)( be );
+ update_progress (be);
+ (pData->initial_load) (be);
}
}
- if ( other_load_order != NULL )
+ if (other_load_order != NULL)
{
- for ( i = 0; other_load_order[i] != NULL; i++ )
+ for (i = 0; other_load_order[i] != NULL; i++)
{
pData =
- static_cast<decltype(pData)>(qof_object_lookup_backend(
- other_load_order[i],
- GNC_SQL_BACKEND));
- if ( pData->initial_load != NULL )
+ static_cast<decltype (pData)> (qof_object_lookup_backend (
+ other_load_order[i],
+ GNC_SQL_BACKEND));
+ if (pData->initial_load != NULL)
{
- update_progress( be );
- (pData->initial_load)( be );
+ update_progress (be);
+ (pData->initial_load) (be);
}
}
}
- root = gnc_book_get_root_account( book );
- gnc_account_foreach_descendant( root, (AccountCb)xaccAccountBeginEdit, NULL );
+ root = gnc_book_get_root_account (book);
+ gnc_account_foreach_descendant (root, (AccountCb)xaccAccountBeginEdit, NULL);
- qof_object_foreach_backend( GNC_SQL_BACKEND, initial_load_cb, be );
+ qof_object_foreach_backend (GNC_SQL_BACKEND, initial_load_cb, be);
- gnc_account_foreach_descendant( root, (AccountCb)xaccAccountCommitEdit, NULL );
+ gnc_account_foreach_descendant (root, (AccountCb)xaccAccountCommitEdit, NULL);
}
- else if ( loadType == LOAD_TYPE_LOAD_ALL )
+ else if (loadType == LOAD_TYPE_LOAD_ALL)
{
// Load all transactions
- gnc_sql_transaction_load_all_tx( be );
+ gnc_sql_transaction_load_all_tx (be);
}
be->loading = FALSE;
@@ -283,70 +283,70 @@ gnc_sql_load( GncSqlBackend* be, QofBook *book, QofBackendLoadType loadType )
/* Mark the sessoion as clean -- though it should never be marked
* dirty with this backend
*/
- qof_book_mark_session_saved( book );
- finish_progress( be );
+ qof_book_mark_session_saved (book);
+ finish_progress (be);
- LEAVE( "" );
+ LEAVE ("");
}
/* ================================================================= */
static gboolean
-write_account_tree( GncSqlBackend* be, Account* root )
+write_account_tree (GncSqlBackend* be, Account* root)
{
GList* descendants;
GList* node;
gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( root != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (root != NULL, FALSE);
- is_ok = gnc_sql_save_account( be, QOF_INSTANCE(root) );
- if ( is_ok )
+ is_ok = gnc_sql_save_account (be, QOF_INSTANCE (root));
+ if (is_ok)
{
- descendants = gnc_account_get_descendants( root );
- for ( node = descendants; node != NULL && is_ok; node = g_list_next(node) )
+ descendants = gnc_account_get_descendants (root);
+ for (node = descendants; node != NULL && is_ok; node = g_list_next (node))
{
- is_ok = gnc_sql_save_account( be, QOF_INSTANCE(GNC_ACCOUNT(node->data)) );
- if ( !is_ok ) break;
+ is_ok = gnc_sql_save_account (be, QOF_INSTANCE (GNC_ACCOUNT (node->data)));
+ if (!is_ok) break;
}
- g_list_free( descendants );
+ g_list_free (descendants);
}
- update_progress( be );
+ update_progress (be);
return is_ok;
}
static gboolean
-write_accounts( GncSqlBackend* be )
+write_accounts (GncSqlBackend* be)
{
gboolean is_ok;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
- update_progress( be );
- is_ok = write_account_tree( be, gnc_book_get_root_account( be->book ) );
- if ( is_ok )
+ update_progress (be);
+ is_ok = write_account_tree (be, gnc_book_get_root_account (be->book));
+ if (is_ok)
{
- update_progress( be );
- is_ok = write_account_tree( be, gnc_book_get_template_root( be->book ) );
+ update_progress (be);
+ is_ok = write_account_tree (be, gnc_book_get_template_root (be->book));
}
return is_ok;
}
static int
-write_tx( Transaction* tx, gpointer data )
+write_tx (Transaction* tx, gpointer data)
{
write_objects_t* s = (write_objects_t*)data;
- g_return_val_if_fail( tx != NULL, 0 );
- g_return_val_if_fail( data != NULL, 0 );
+ g_return_val_if_fail (tx != NULL, 0);
+ g_return_val_if_fail (data != NULL, 0);
- s->is_ok = gnc_sql_save_transaction( s->be, QOF_INSTANCE(tx) );
- update_progress( s->be );
+ s->is_ok = gnc_sql_save_transaction (s->be, QOF_INSTANCE (tx));
+ update_progress (s->be);
- if ( s->is_ok )
+ if (s->is_ok)
{
return 0;
}
@@ -357,204 +357,205 @@ write_tx( Transaction* tx, gpointer data )
}
static gboolean
-write_transactions( GncSqlBackend* be )
+write_transactions (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- (void)xaccAccountTreeForEachTransaction(
- gnc_book_get_root_account( be->book ), write_tx, &data );
- update_progress( be );
+ (void)xaccAccountTreeForEachTransaction (
+ gnc_book_get_root_account (be->book), write_tx, &data);
+ update_progress (be);
return data.is_ok;
}
static gboolean
-write_template_transactions( GncSqlBackend* be )
+write_template_transactions (GncSqlBackend* be)
{
Account* ra;
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.is_ok = TRUE;
data.be = be;
- ra = gnc_book_get_template_root( be->book );
- if ( gnc_account_n_descendants( ra ) > 0 )
+ ra = gnc_book_get_template_root (be->book);
+ if (gnc_account_n_descendants (ra) > 0)
{
- (void)xaccAccountTreeForEachTransaction( ra, write_tx, &data );
- update_progress( be );
+ (void)xaccAccountTreeForEachTransaction (ra, write_tx, &data);
+ update_progress (be);
}
return data.is_ok;
}
static gboolean
-write_schedXactions( GncSqlBackend* be )
+write_schedXactions (GncSqlBackend* be)
{
GList* schedXactions;
SchedXaction* tmpSX;
gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
- schedXactions = gnc_book_get_schedxactions( be->book )->sx_list;
+ schedXactions = gnc_book_get_schedxactions (be->book)->sx_list;
- for ( ; schedXactions != NULL && is_ok; schedXactions = schedXactions->next )
+ for (; schedXactions != NULL && is_ok; schedXactions = schedXactions->next)
{
- tmpSX = static_cast<decltype(tmpSX)>(schedXactions->data);
- is_ok = gnc_sql_save_schedxaction( be, QOF_INSTANCE( tmpSX ) );
+ tmpSX = static_cast<decltype (tmpSX)> (schedXactions->data);
+ is_ok = gnc_sql_save_schedxaction (be, QOF_INSTANCE (tmpSX));
}
- update_progress( be );
+ update_progress (be);
return is_ok;
}
static void
-write_cb( const gchar* type, gpointer data_p, gpointer be_p )
+write_cb (const gchar* type, gpointer data_p, gpointer be_p)
{
- GncSqlObjectBackend* pData = static_cast<decltype(pData)>(data_p);
- GncSqlBackend* be = static_cast<decltype(be)>(be_p);
+ GncSqlObjectBackend* pData = static_cast<decltype (pData)> (data_p);
+ GncSqlBackend* be = static_cast<decltype (be)> (be_p);
- g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
- g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
+ g_return_if_fail (type != NULL && data_p != NULL && be_p != NULL);
+ g_return_if_fail (pData->version == GNC_SQL_BACKEND_VERSION);
- if ( pData->write != NULL )
+ if (pData->write != NULL)
{
- (void)(pData->write)( be );
- update_progress( be );
+ (void) (pData->write) (be);
+ update_progress (be);
}
}
static void
-update_progress( GncSqlBackend* be )
+update_progress (GncSqlBackend* be)
{
- if ( be->be.percentage != NULL )
- (be->be.percentage)( NULL, 101.0 );
+ if (be->be.percentage != NULL)
+ (be->be.percentage) (NULL, 101.0);
}
static void
-finish_progress( GncSqlBackend* be )
+finish_progress (GncSqlBackend* be)
{
- if ( be->be.percentage != NULL )
- (be->be.percentage)( NULL, -1.0 );
+ if (be->be.percentage != NULL)
+ (be->be.percentage) (NULL, -1.0);
}
void
-gnc_sql_sync_all( GncSqlBackend* be, QofBook *book )
+gnc_sql_sync_all (GncSqlBackend* be, QofBook* book)
{
gboolean is_ok;
- g_return_if_fail( be != NULL );
- g_return_if_fail( book != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (book != NULL);
- ENTER( "book=%p, be->book=%p", book, be->book );
- update_progress( be );
- (void)reset_version_info( be );
+ ENTER ("book=%p, be->book=%p", book, be->book);
+ update_progress (be);
+ (void)reset_version_info (be);
/* Create new tables */
be->is_pristine_db = TRUE;
- qof_object_foreach_backend( GNC_SQL_BACKEND, create_tables_cb, be );
+ qof_object_foreach_backend (GNC_SQL_BACKEND, create_tables_cb, be);
/* Save all contents */
be->book = book;
be->obj_total = 0;
- be->obj_total += 1 + gnc_account_n_descendants( gnc_book_get_root_account( book ) );
- be->obj_total += gnc_book_count_transactions( book );
+ be->obj_total += 1 + gnc_account_n_descendants (gnc_book_get_root_account (
+ book));
+ be->obj_total += gnc_book_count_transactions (book);
be->operations_done = 0;
- is_ok = gnc_sql_connection_begin_transaction( be->conn );
+ is_ok = gnc_sql_connection_begin_transaction (be->conn);
// FIXME: should write the set of commodities that are used
//write_commodities( be, book );
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_save_book( be, QOF_INSTANCE(book) );
+ is_ok = gnc_sql_save_book (be, QOF_INSTANCE (book));
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = write_accounts( be );
+ is_ok = write_accounts (be);
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = write_transactions( be );
+ is_ok = write_transactions (be);
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = write_template_transactions( be );
+ is_ok = write_template_transactions (be);
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = write_schedXactions( be );
+ is_ok = write_schedXactions (be);
}
- if ( is_ok )
+ if (is_ok)
{
- qof_object_foreach_backend( GNC_SQL_BACKEND, write_cb, be );
+ qof_object_foreach_backend (GNC_SQL_BACKEND, write_cb, be);
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_connection_commit_transaction( be->conn );
+ is_ok = gnc_sql_connection_commit_transaction (be->conn);
}
- if ( is_ok )
+ if (is_ok)
{
be->is_pristine_db = FALSE;
/* Mark the session as clean -- though it shouldn't ever get
- * marked dirty with this backend
- */
- qof_book_mark_session_saved( book );
+ * marked dirty with this backend
+ */
+ qof_book_mark_session_saved (book);
}
else
{
if (!qof_backend_check_error ((QofBackend*)be))
- qof_backend_set_error( (QofBackend*)be, ERR_BACKEND_SERVER_ERR );
- is_ok = gnc_sql_connection_rollback_transaction( be->conn );
+ qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_SERVER_ERR);
+ is_ok = gnc_sql_connection_rollback_transaction (be->conn);
}
- finish_progress( be );
- LEAVE( "book=%p", book );
+ finish_progress (be);
+ LEAVE ("book=%p", book);
}
/* ================================================================= */
/* Routines to deal with the creation of multiple books. */
void
-gnc_sql_begin_edit( GncSqlBackend *be, QofInstance *inst )
+gnc_sql_begin_edit (GncSqlBackend* be, QofInstance* inst)
{
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (inst != NULL);
- ENTER( " " );
- LEAVE( "" );
+ ENTER (" ");
+ LEAVE ("");
}
void
-gnc_sql_rollback_edit( GncSqlBackend *be, QofInstance *inst )
+gnc_sql_rollback_edit (GncSqlBackend* be, QofInstance* inst)
{
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (inst != NULL);
- ENTER( " " );
- LEAVE( "" );
+ ENTER (" ");
+ LEAVE ("");
}
static void
-commit_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
+commit_cb (const gchar* type, gpointer data_p, gpointer be_data_p)
{
- GncSqlObjectBackend* pData = static_cast<decltype(pData)>(data_p);
- sql_backend* be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncSqlObjectBackend* pData = static_cast<decltype (pData)> (data_p);
+ sql_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
- g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
- g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
+ g_return_if_fail (type != NULL && pData != NULL && be_data != NULL);
+ g_return_if_fail (pData->version == GNC_SQL_BACKEND_VERSION);
/* If this has already been handled, or is not the correct handler, return */
- if ( strcmp( pData->type_name, be_data->inst->e_type ) != 0 ) return;
- if ( be_data->is_known ) return;
+ if (strcmp (pData->type_name, be_data->inst->e_type) != 0) return;
+ if (be_data->is_known) return;
- if ( pData->commit != NULL )
+ if (pData->commit != NULL)
{
- be_data->is_ok = (pData->commit)( be_data->be, be_data->inst );
+ be_data->is_ok = (pData->commit) (be_data->be, be_data->inst);
be_data->is_known = TRUE;
}
}
@@ -563,58 +564,58 @@ commit_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
* type and call its commit handler
*/
void
-gnc_sql_commit_edit( GncSqlBackend *be, QofInstance *inst )
+gnc_sql_commit_edit (GncSqlBackend* be, QofInstance* inst)
{
sql_backend be_data;
gboolean is_dirty;
gboolean is_destroying;
gboolean is_infant;
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (inst != NULL);
- if ( qof_book_is_readonly( be->book ) )
+ if (qof_book_is_readonly (be->book))
{
- qof_backend_set_error( (QofBackend*)be, ERR_BACKEND_READONLY );
- (void)gnc_sql_connection_rollback_transaction( be->conn );
+ qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_READONLY);
+ (void)gnc_sql_connection_rollback_transaction (be->conn);
return;
}
/* During initial load where objects are being created, don't commit
anything, but do mark the object as clean. */
- if ( be->loading )
+ if (be->loading)
{
- qof_instance_mark_clean( inst );
+ qof_instance_mark_clean (inst);
return;
}
// The engine has a PriceDB object but it isn't in the database
- if ( strcmp( inst->e_type, "PriceDB" ) == 0 )
+ if (strcmp (inst->e_type, "PriceDB") == 0)
{
- qof_instance_mark_clean( inst );
- qof_book_mark_session_saved( be->book );
+ qof_instance_mark_clean (inst);
+ qof_book_mark_session_saved (be->book);
return;
}
- ENTER( " " );
+ ENTER (" ");
- is_dirty = qof_instance_get_dirty_flag( inst );
- is_destroying = qof_instance_get_destroying( inst );
- is_infant = qof_instance_get_infant( inst );
+ is_dirty = qof_instance_get_dirty_flag (inst);
+ is_destroying = qof_instance_get_destroying (inst);
+ is_infant = qof_instance_get_infant (inst);
- DEBUG( "%s dirty = %d, do_free = %d, infant = %d\n",
- (inst->e_type ? inst->e_type : "(null)"),
- is_dirty, is_destroying, is_infant );
+ DEBUG ("%s dirty = %d, do_free = %d, infant = %d\n",
+ (inst->e_type ? inst->e_type : "(null)"),
+ is_dirty, is_destroying, is_infant);
- if ( !is_dirty && !is_destroying )
+ if (!is_dirty && !is_destroying)
{
- LEAVE( "!dirty OR !destroying" );
+ LEAVE ("!dirty OR !destroying");
return;
}
- if ( !gnc_sql_connection_begin_transaction( be->conn ) )
+ if (!gnc_sql_connection_begin_transaction (be->conn))
{
- PERR( "gnc_sql_commit_edit(): begin_transaction failed\n" );
- LEAVE( "Rolled back - database transaction begin error" );
+ PERR ("gnc_sql_commit_edit(): begin_transaction failed\n");
+ LEAVE ("Rolled back - database transaction begin error");
return;
}
@@ -623,41 +624,41 @@ gnc_sql_commit_edit( GncSqlBackend *be, QofInstance *inst )
be_data.inst = inst;
be_data.is_ok = TRUE;
- qof_object_foreach_backend( GNC_SQL_BACKEND, commit_cb, &be_data );
+ qof_object_foreach_backend (GNC_SQL_BACKEND, commit_cb, &be_data);
- if ( !be_data.is_known )
+ if (!be_data.is_known)
{
- PERR( "gnc_sql_commit_edit(): Unknown object type '%s'\n", inst->e_type );
- (void)gnc_sql_connection_rollback_transaction( be->conn );
+ PERR ("gnc_sql_commit_edit(): Unknown object type '%s'\n", inst->e_type);
+ (void)gnc_sql_connection_rollback_transaction (be->conn);
// Don't let unknown items still mark the book as being dirty
- qof_book_mark_session_saved( be->book );
- qof_instance_mark_clean(inst);
- LEAVE( "Rolled back - unknown object type" );
+ qof_book_mark_session_saved (be->book);
+ qof_instance_mark_clean (inst);
+ LEAVE ("Rolled back - unknown object type");
return;
}
- if ( !be_data.is_ok )
+ if (!be_data.is_ok)
{
// Error - roll it back
- (void)gnc_sql_connection_rollback_transaction( be->conn );
+ (void)gnc_sql_connection_rollback_transaction (be->conn);
// This *should* leave things marked dirty
- LEAVE( "Rolled back - database error" );
+ LEAVE ("Rolled back - database error");
return;
}
- (void)gnc_sql_connection_commit_transaction( be->conn );
+ (void)gnc_sql_connection_commit_transaction (be->conn);
- qof_book_mark_session_saved( be->book );
- qof_instance_mark_clean(inst);
+ qof_book_mark_session_saved (be->book);
+ qof_instance_mark_clean (inst);
- LEAVE( "" );
+ LEAVE ("");
}
/* ---------------------------------------------------------------------- */
/* Query processing */
static void
-handle_and_term( QofQueryTerm* pTerm, GString* sql )
+handle_and_term (QofQueryTerm* pTerm, GString* sql)
{
GSList* pParamPath;
QofQueryPredData* pPredData;
@@ -665,189 +666,190 @@ handle_and_term( QofQueryTerm* pTerm, GString* sql )
GSList* name;
gchar val[G_ASCII_DTOSTR_BUF_SIZE];
- g_return_if_fail( pTerm != NULL );
- g_return_if_fail( sql != NULL );
+ g_return_if_fail (pTerm != NULL);
+ g_return_if_fail (sql != NULL);
- pParamPath = qof_query_term_get_param_path( pTerm );
- pPredData = qof_query_term_get_pred_data( pTerm );
- isInverted = qof_query_term_is_inverted( pTerm );
+ pParamPath = qof_query_term_get_param_path (pTerm);
+ pPredData = qof_query_term_get_pred_data (pTerm);
+ isInverted = qof_query_term_is_inverted (pTerm);
- if ( strcmp( pPredData->type_name, QOF_TYPE_GUID ) == 0 )
+ if (strcmp (pPredData->type_name, QOF_TYPE_GUID) == 0)
{
query_guid_t guid_data = (query_guid_t)pPredData;
GList* guid_entry;
- for ( name = pParamPath; name != NULL; name = name->next )
+ for (name = pParamPath; name != NULL; name = name->next)
{
- if ( name != pParamPath ) g_string_append( sql, "." );
- g_string_append(sql, static_cast<char*>(name->data));
+ if (name != pParamPath) g_string_append (sql, ".");
+ g_string_append (sql, static_cast<char*> (name->data));
}
- if ( guid_data->options == QOF_GUID_MATCH_ANY )
+ if (guid_data->options == QOF_GUID_MATCH_ANY)
{
- if ( isInverted ) g_string_append( sql, " NOT " );
- g_string_append( sql, " IN (" );
+ if (isInverted) g_string_append (sql, " NOT ");
+ g_string_append (sql, " IN (");
}
- for ( guid_entry = guid_data->guids; guid_entry != NULL; guid_entry = guid_entry->next )
+ for (guid_entry = guid_data->guids; guid_entry != NULL;
+ guid_entry = guid_entry->next)
{
- if ( guid_entry != guid_data->guids ) g_string_append( sql, "." );
- (void)guid_to_string_buff(static_cast<GncGUID*>(guid_entry->data),
- val);
- g_string_append( sql, "'" );
- g_string_append( sql, val );
- g_string_append( sql, "'" );
+ if (guid_entry != guid_data->guids) g_string_append (sql, ".");
+ (void)guid_to_string_buff (static_cast<GncGUID*> (guid_entry->data),
+ val);
+ g_string_append (sql, "'");
+ g_string_append (sql, val);
+ g_string_append (sql, "'");
}
- if ( guid_data->options == QOF_GUID_MATCH_ANY )
+ if (guid_data->options == QOF_GUID_MATCH_ANY)
{
- g_string_append( sql, ")" );
+ g_string_append (sql, ")");
}
}
- g_string_append( sql, "(" );
- if ( isInverted )
+ g_string_append (sql, "(");
+ if (isInverted)
{
- g_string_append( sql, "!" );
+ g_string_append (sql, "!");
}
- for ( name = pParamPath; name != NULL; name = name->next )
+ for (name = pParamPath; name != NULL; name = name->next)
{
- if ( name != pParamPath ) g_string_append( sql, "." );
- g_string_append(sql, static_cast<char*>(name->data) );
+ if (name != pParamPath) g_string_append (sql, ".");
+ g_string_append (sql, static_cast<char*> (name->data));
}
- if ( pPredData->how == QOF_COMPARE_LT )
+ if (pPredData->how == QOF_COMPARE_LT)
{
- g_string_append( sql, "<" );
+ g_string_append (sql, "<");
}
- else if ( pPredData->how == QOF_COMPARE_LTE )
+ else if (pPredData->how == QOF_COMPARE_LTE)
{
- g_string_append( sql, "<=" );
+ g_string_append (sql, "<=");
}
- else if ( pPredData->how == QOF_COMPARE_EQUAL )
+ else if (pPredData->how == QOF_COMPARE_EQUAL)
{
- g_string_append( sql, "=" );
+ g_string_append (sql, "=");
}
- else if ( pPredData->how == QOF_COMPARE_GT )
+ else if (pPredData->how == QOF_COMPARE_GT)
{
- g_string_append( sql, ">" );
+ g_string_append (sql, ">");
}
- else if ( pPredData->how == QOF_COMPARE_GTE )
+ else if (pPredData->how == QOF_COMPARE_GTE)
{
- g_string_append( sql, ">=" );
+ g_string_append (sql, ">=");
}
- else if ( pPredData->how == QOF_COMPARE_NEQ )
+ else if (pPredData->how == QOF_COMPARE_NEQ)
{
- g_string_append( sql, "~=" );
+ g_string_append (sql, "~=");
}
else
{
- g_string_append( sql, "??" );
+ g_string_append (sql, "??");
}
- if ( strcmp( pPredData->type_name, "string" ) == 0 )
+ if (strcmp (pPredData->type_name, "string") == 0)
{
query_string_t pData = (query_string_t)pPredData;
- g_string_append( sql, "'" );
- g_string_append( sql, pData->matchstring );
- g_string_append( sql, "'" );
+ g_string_append (sql, "'");
+ g_string_append (sql, pData->matchstring);
+ g_string_append (sql, "'");
}
- else if ( strcmp( pPredData->type_name, "date" ) == 0 )
+ else if (strcmp (pPredData->type_name, "date") == 0)
{
query_date_t pData = (query_date_t)pPredData;
- (void)gnc_timespec_to_iso8601_buff( pData->date, val );
- g_string_append( sql, "'" );
+ (void)gnc_timespec_to_iso8601_buff (pData->date, val);
+ g_string_append (sql, "'");
//g_string_append( sql, val, 4+1+2+1+2 );
- g_string_append( sql, "'" );
+ g_string_append (sql, "'");
}
- else if ( strcmp( pPredData->type_name, "numeric" ) == 0 )
+ else if (strcmp (pPredData->type_name, "numeric") == 0)
{
/* query_numeric_t pData = (query_numeric_t)pPredData; */
- g_string_append( sql, "numeric" );
+ g_string_append (sql, "numeric");
}
- else if ( strcmp( pPredData->type_name, QOF_TYPE_GUID ) == 0 )
+ else if (strcmp (pPredData->type_name, QOF_TYPE_GUID) == 0)
{
}
- else if ( strcmp( pPredData->type_name, "gint32" ) == 0 )
+ else if (strcmp (pPredData->type_name, "gint32") == 0)
{
query_int32_t pData = (query_int32_t)pPredData;
- sprintf( val, "%d", pData->val );
- g_string_append( sql, val );
+ sprintf (val, "%d", pData->val);
+ g_string_append (sql, val);
}
- else if ( strcmp( pPredData->type_name, "gint64" ) == 0 )
+ else if (strcmp (pPredData->type_name, "gint64") == 0)
{
query_int64_t pData = (query_int64_t)pPredData;
- sprintf( val, "%" G_GINT64_FORMAT, pData->val );
- g_string_append( sql, val );
+ sprintf (val, "%" G_GINT64_FORMAT, pData->val);
+ g_string_append (sql, val);
}
- else if ( strcmp( pPredData->type_name, "double" ) == 0 )
+ else if (strcmp (pPredData->type_name, "double") == 0)
{
query_double_t pData = (query_double_t)pPredData;
- g_ascii_dtostr( val, sizeof(val), pData->val );
- g_string_append( sql, val );
+ g_ascii_dtostr (val, sizeof (val), pData->val);
+ g_string_append (sql, val);
}
- else if ( strcmp( pPredData->type_name, "boolean" ) == 0 )
+ else if (strcmp (pPredData->type_name, "boolean") == 0)
{
query_boolean_t pData = (query_boolean_t)pPredData;
- sprintf( val, "%d", pData->val );
- g_string_append( sql, val );
+ sprintf (val, "%d", pData->val);
+ g_string_append (sql, val);
}
else
{
- g_assert( FALSE );
+ g_assert (FALSE);
}
- g_string_append( sql, ")" );
+ g_string_append (sql, ")");
}
static void
-compile_query_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
+compile_query_cb (const gchar* type, gpointer data_p, gpointer be_data_p)
{
- GncSqlObjectBackend* pData = static_cast<decltype(pData)>(data_p);
- sql_backend* be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncSqlObjectBackend* pData = static_cast<decltype (pData)> (data_p);
+ sql_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
- g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
- g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
+ g_return_if_fail (type != NULL && pData != NULL && be_data != NULL);
+ g_return_if_fail (pData->version == GNC_SQL_BACKEND_VERSION);
// Is this the right item?
- if ( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
- if ( be_data->is_ok ) return;
+ if (strcmp (type, be_data->pQueryInfo->searchObj) != 0) return;
+ if (be_data->is_ok) return;
- if ( pData->compile_query != NULL )
+ if (pData->compile_query != NULL)
{
- be_data->pQueryInfo->pCompiledQuery = (pData->compile_query)(
- be_data->be,
- be_data->pQuery );
+ be_data->pQueryInfo->pCompiledQuery = (pData->compile_query) (
+ be_data->be,
+ be_data->pQuery);
be_data->is_ok = TRUE;
}
}
-gchar* gnc_sql_compile_query_to_sql( GncSqlBackend* be, QofQuery* query );
+gchar* gnc_sql_compile_query_to_sql (GncSqlBackend* be, QofQuery* query);
gpointer
-gnc_sql_compile_query( QofBackend* pBEnd, QofQuery* pQuery )
+gnc_sql_compile_query (QofBackend* pBEnd, QofQuery* pQuery)
{
- GncSqlBackend *be = (GncSqlBackend*)pBEnd;
+ GncSqlBackend* be = (GncSqlBackend*)pBEnd;
QofIdType searchObj;
sql_backend be_data;
gnc_sql_query_info* pQueryInfo;
- g_return_val_if_fail( pBEnd != NULL, NULL );
- g_return_val_if_fail( pQuery != NULL, NULL );
+ g_return_val_if_fail (pBEnd != NULL, NULL);
+ g_return_val_if_fail (pQuery != NULL, NULL);
- ENTER( " " );
+ ENTER (" ");
//gnc_sql_compile_query_to_sql( be, pQuery );
- searchObj = qof_query_get_search_for( pQuery );
+ searchObj = qof_query_get_search_for (pQuery);
- pQueryInfo = static_cast<decltype(pQueryInfo)>(
- g_malloc(sizeof(gnc_sql_query_info)));
- g_assert( pQueryInfo != NULL );
+ pQueryInfo = static_cast<decltype (pQueryInfo)> (
+ g_malloc (sizeof (gnc_sql_query_info)));
+ g_assert (pQueryInfo != NULL);
pQueryInfo->pCompiledQuery = NULL;
pQueryInfo->searchObj = searchObj;
@@ -857,99 +859,99 @@ gnc_sql_compile_query( QofBackend* pBEnd, QofQuery* pQuery )
be_data.pQuery = pQuery;
be_data.pQueryInfo = pQueryInfo;
- qof_object_foreach_backend( GNC_SQL_BACKEND, compile_query_cb, &be_data );
- if ( be_data.is_ok )
+ qof_object_foreach_backend (GNC_SQL_BACKEND, compile_query_cb, &be_data);
+ if (be_data.is_ok)
{
- LEAVE( "" );
+ LEAVE ("");
return be_data.pQueryInfo;
}
- LEAVE( "" );
+ LEAVE ("");
return pQueryInfo;
}
static const gchar*
-convert_search_obj( QofIdType objType )
+convert_search_obj (QofIdType objType)
{
return (gchar*)objType;
}
gchar*
-gnc_sql_compile_query_to_sql( GncSqlBackend* be, QofQuery* query )
+gnc_sql_compile_query_to_sql (GncSqlBackend* be, QofQuery* query)
{
QofIdType searchObj;
GString* sql;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( query != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (query != NULL, NULL);
- searchObj = qof_query_get_search_for( query );
+ searchObj = qof_query_get_search_for (query);
/* Convert search object type to table name */
- sql = g_string_new( "" );
- g_string_append( sql, "SELECT * FROM " );
- g_string_append( sql, convert_search_obj( searchObj ) );
- if ( !qof_query_has_terms( query ) )
+ sql = g_string_new ("");
+ g_string_append (sql, "SELECT * FROM ");
+ g_string_append (sql, convert_search_obj (searchObj));
+ if (!qof_query_has_terms (query))
{
- g_string_append( sql, ";" );
+ g_string_append (sql, ";");
}
else
{
- GList* orterms = qof_query_get_terms( query );
+ GList* orterms = qof_query_get_terms (query);
GList* orTerm;
- g_string_append( sql, " WHERE " );
+ g_string_append (sql, " WHERE ");
- for ( orTerm = orterms; orTerm != NULL; orTerm = orTerm->next )
+ for (orTerm = orterms; orTerm != NULL; orTerm = orTerm->next)
{
GList* andterms = (GList*)orTerm->data;
GList* andTerm;
- if ( orTerm != orterms ) g_string_append( sql, " OR " );
- g_string_append( sql, "(" );
- for ( andTerm = andterms; andTerm != NULL; andTerm = andTerm->next )
+ if (orTerm != orterms) g_string_append (sql, " OR ");
+ g_string_append (sql, "(");
+ for (andTerm = andterms; andTerm != NULL; andTerm = andTerm->next)
{
- if ( andTerm != andterms ) g_string_append( sql, " AND " );
- handle_and_term( (QofQueryTerm*)andTerm->data, sql );
+ if (andTerm != andterms) g_string_append (sql, " AND ");
+ handle_and_term ((QofQueryTerm*)andTerm->data, sql);
}
- g_string_append( sql, ")" );
+ g_string_append (sql, ")");
}
}
- DEBUG( "Compiled: %s\n", sql->str );
- return g_string_free( sql, FALSE );
+ DEBUG ("Compiled: %s\n", sql->str);
+ return g_string_free (sql, FALSE);
}
static void
-free_query_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
+free_query_cb (const gchar* type, gpointer data_p, gpointer be_data_p)
{
- GncSqlObjectBackend* pData = static_cast<decltype(pData)>(data_p);
- sql_backend* be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncSqlObjectBackend* pData = static_cast<decltype (pData)> (data_p);
+ sql_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
- g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
- g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
- if ( be_data->is_ok ) return;
- if ( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
+ g_return_if_fail (type != NULL && pData != NULL && be_data != NULL);
+ g_return_if_fail (pData->version == GNC_SQL_BACKEND_VERSION);
+ if (be_data->is_ok) return;
+ if (strcmp (type, be_data->pQueryInfo->searchObj) != 0) return;
- if ( pData->free_query != NULL )
+ if (pData->free_query != NULL)
{
- (pData->free_query)( be_data->be, be_data->pCompiledQuery );
+ (pData->free_query) (be_data->be, be_data->pCompiledQuery);
be_data->is_ok = TRUE;
}
}
void
-gnc_sql_free_query( QofBackend* pBEnd, gpointer pQuery )
+gnc_sql_free_query (QofBackend* pBEnd, gpointer pQuery)
{
- GncSqlBackend *be = (GncSqlBackend*)pBEnd;
+ GncSqlBackend* be = (GncSqlBackend*)pBEnd;
gnc_sql_query_info* pQueryInfo = (gnc_sql_query_info*)pQuery;
sql_backend be_data;
- g_return_if_fail( pBEnd != NULL );
- g_return_if_fail( pQuery != NULL );
+ g_return_if_fail (pBEnd != NULL);
+ g_return_if_fail (pQuery != NULL);
- ENTER( " " );
+ ENTER (" ");
// Try various objects first
be_data.is_ok = FALSE;
@@ -957,60 +959,60 @@ gnc_sql_free_query( QofBackend* pBEnd, gpointer pQuery )
be_data.pCompiledQuery = pQuery;
be_data.pQueryInfo = pQueryInfo;
- qof_object_foreach_backend( GNC_SQL_BACKEND, free_query_cb, &be_data );
- if ( be_data.is_ok )
+ qof_object_foreach_backend (GNC_SQL_BACKEND, free_query_cb, &be_data);
+ if (be_data.is_ok)
{
- LEAVE( "" );
+ LEAVE ("");
return;
}
- if ( pQueryInfo->pCompiledQuery != NULL )
+ if (pQueryInfo->pCompiledQuery != NULL)
{
- DEBUG( "%s\n", (gchar*)pQueryInfo->pCompiledQuery );
- g_free( pQueryInfo->pCompiledQuery );
+ DEBUG ("%s\n", (gchar*)pQueryInfo->pCompiledQuery);
+ g_free (pQueryInfo->pCompiledQuery);
}
- g_free( pQueryInfo );
+ g_free (pQueryInfo);
- LEAVE( "" );
+ LEAVE ("");
}
static void
-run_query_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
+run_query_cb (const gchar* type, gpointer data_p, gpointer be_data_p)
{
- GncSqlObjectBackend* pData = static_cast<decltype(pData)>(data_p);
- sql_backend* be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncSqlObjectBackend* pData = static_cast<decltype (pData)> (data_p);
+ sql_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
- g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
- g_return_if_fail( pData->version == GNC_SQL_BACKEND_VERSION );
- if ( be_data->is_ok ) return;
+ g_return_if_fail (type != NULL && pData != NULL && be_data != NULL);
+ g_return_if_fail (pData->version == GNC_SQL_BACKEND_VERSION);
+ if (be_data->is_ok) return;
// Is this the right item?
- if ( strcmp( type, be_data->pQueryInfo->searchObj ) != 0 ) return;
+ if (strcmp (type, be_data->pQueryInfo->searchObj) != 0) return;
- if ( pData->run_query != NULL )
+ if (pData->run_query != NULL)
{
- (pData->run_query)( be_data->be, be_data->pCompiledQuery );
+ (pData->run_query) (be_data->be, be_data->pCompiledQuery);
be_data->is_ok = TRUE;
}
}
void
-gnc_sql_run_query( QofBackend* pBEnd, gpointer pQuery )
+gnc_sql_run_query (QofBackend* pBEnd, gpointer pQuery)
{
- GncSqlBackend *be = (GncSqlBackend*)pBEnd;
+ GncSqlBackend* be = (GncSqlBackend*)pBEnd;
gnc_sql_query_info* pQueryInfo = (gnc_sql_query_info*)pQuery;
sql_backend be_data;
- g_return_if_fail( pBEnd != NULL );
- g_return_if_fail( pQuery != NULL );
- g_return_if_fail( !be->in_query );
+ g_return_if_fail (pBEnd != NULL);
+ g_return_if_fail (pQuery != NULL);
+ g_return_if_fail (!be->in_query);
- ENTER( " " );
+ ENTER (" ");
be->loading = TRUE;
be->in_query = TRUE;
- qof_event_suspend();
+ qof_event_suspend ();
// Try various objects first
be_data.is_ok = FALSE;
@@ -1018,21 +1020,21 @@ gnc_sql_run_query( QofBackend* pBEnd, gpointer pQuery )
be_data.pCompiledQuery = pQueryInfo->pCompiledQuery;
be_data.pQueryInfo = pQueryInfo;
- qof_object_foreach_backend( GNC_SQL_BACKEND, run_query_cb, &be_data );
+ qof_object_foreach_backend (GNC_SQL_BACKEND, run_query_cb, &be_data);
be->loading = FALSE;
be->in_query = FALSE;
- qof_event_resume();
+ qof_event_resume ();
// if( be_data.is_ok ) {
// LEAVE( "" );
// return;
// }
// Mark the book as clean
- qof_instance_mark_clean( QOF_INSTANCE(be->book) );
+ qof_instance_mark_clean (QOF_INSTANCE (be->book));
// DEBUG( "%s\n", (gchar*)pQueryInfo->pCompiledQuery );
- LEAVE( "" );
+ LEAVE ("");
}
/* ================================================================= */
@@ -1041,115 +1043,116 @@ static const gchar* business_fixed_load_order[] =
{ GNC_ID_BILLTERM, GNC_ID_TAXTABLE, GNC_ID_INVOICE, NULL };
static void
-business_core_sql_init(void)
+business_core_sql_init (void)
{
/* Initialize our pointers into the backend subsystem */
- gnc_address_sql_initialize();
- gnc_billterm_sql_initialize();
- gnc_customer_sql_initialize();
- gnc_employee_sql_initialize();
- gnc_entry_sql_initialize();
- gnc_invoice_sql_initialize();
- gnc_job_sql_initialize();
- gnc_order_sql_initialize();
- gnc_owner_sql_initialize();
- gnc_taxtable_sql_initialize();
- gnc_vendor_sql_initialize();
+ gnc_address_sql_initialize ();
+ gnc_billterm_sql_initialize ();
+ gnc_customer_sql_initialize ();
+ gnc_employee_sql_initialize ();
+ gnc_entry_sql_initialize ();
+ gnc_invoice_sql_initialize ();
+ gnc_job_sql_initialize ();
+ gnc_order_sql_initialize ();
+ gnc_owner_sql_initialize ();
+ gnc_taxtable_sql_initialize ();
+ gnc_vendor_sql_initialize ();
- gnc_sql_set_load_order( business_fixed_load_order );
+ gnc_sql_set_load_order (business_fixed_load_order);
}
static void
-gnc_sql_init_object_handlers( void )
-{
- gnc_sql_init_book_handler();
- gnc_sql_init_commodity_handler();
- gnc_sql_init_account_handler();
- gnc_sql_init_budget_handler();
- gnc_sql_init_price_handler();
- gnc_sql_init_transaction_handler();
- gnc_sql_init_slots_handler();
- gnc_sql_init_recurrence_handler();
- gnc_sql_init_schedxaction_handler();
- gnc_sql_init_lot_handler();
+gnc_sql_init_object_handlers (void)
+{
+ gnc_sql_init_book_handler ();
+ gnc_sql_init_commodity_handler ();
+ gnc_sql_init_account_handler ();
+ gnc_sql_init_budget_handler ();
+ gnc_sql_init_price_handler ();
+ gnc_sql_init_transaction_handler ();
+ gnc_sql_init_slots_handler ();
+ gnc_sql_init_recurrence_handler ();
+ gnc_sql_init_schedxaction_handler ();
+ gnc_sql_init_lot_handler ();
/* And the business objects */
- business_core_sql_init();
+ business_core_sql_init ();
}
/* ================================================================= */
gint64
-gnc_sql_get_integer_value( const GValue* value )
+gnc_sql_get_integer_value (const GValue* value)
{
- g_return_val_if_fail( value != NULL, 0 );
+ g_return_val_if_fail (value != NULL, 0);
- if ( G_VALUE_HOLDS_INT(value) )
+ if (G_VALUE_HOLDS_INT (value))
{
- return (gint64)g_value_get_int( value );
+ return (gint64)g_value_get_int (value);
}
- else if ( G_VALUE_HOLDS_UINT(value) )
+ else if (G_VALUE_HOLDS_UINT (value))
{
- return (gint64)g_value_get_uint( value );
+ return (gint64)g_value_get_uint (value);
}
- else if ( G_VALUE_HOLDS_LONG(value) )
+ else if (G_VALUE_HOLDS_LONG (value))
{
- return (gint64)g_value_get_long( value );
+ return (gint64)g_value_get_long (value);
}
- else if ( G_VALUE_HOLDS_ULONG(value) )
+ else if (G_VALUE_HOLDS_ULONG (value))
{
- return (gint64)g_value_get_ulong( value );
+ return (gint64)g_value_get_ulong (value);
}
- else if ( G_VALUE_HOLDS_INT64(value) )
+ else if (G_VALUE_HOLDS_INT64 (value))
{
- return g_value_get_int64( value );
+ return g_value_get_int64 (value);
}
- else if ( G_VALUE_HOLDS_UINT64(value) )
+ else if (G_VALUE_HOLDS_UINT64 (value))
{
- return (gint64)g_value_get_uint64( value );
+ return (gint64)g_value_get_uint64 (value);
}
- else if ( G_VALUE_HOLDS_STRING( value ) )
+ else if (G_VALUE_HOLDS_STRING (value))
{
- return g_ascii_strtoll( g_value_get_string( value ), NULL, 10 );
+ return g_ascii_strtoll (g_value_get_string (value), NULL, 10);
}
else
{
- PWARN( "Unknown type: %s", G_VALUE_TYPE_NAME( value ) );
+ PWARN ("Unknown type: %s", G_VALUE_TYPE_NAME (value));
}
return 0;
}
/* ----------------------------------------------------------------- */
- static gpointer
-get_autoinc_id(void *object, const QofParam* param)
+static gpointer
+get_autoinc_id (void* object, const QofParam* param)
{
// Just need a 0 to force a new autoinc value
return (gpointer)0;
}
static void
-set_autoinc_id(void* object, void *item)
+set_autoinc_id (void* object, void* item)
{
// Nowhere to put the ID
}
- QofAccessFunc
-gnc_sql_get_getter( QofIdTypeConst obj_name, const GncSqlColumnTableEntry* table_row )
+QofAccessFunc
+gnc_sql_get_getter (QofIdTypeConst obj_name,
+ const GncSqlColumnTableEntry* table_row)
{
QofAccessFunc getter;
- g_return_val_if_fail( obj_name != NULL, NULL );
- g_return_val_if_fail( table_row != NULL, NULL );
+ g_return_val_if_fail (obj_name != NULL, NULL);
+ g_return_val_if_fail (table_row != NULL, NULL);
- if ( (table_row->flags & COL_AUTOINC) != 0 )
+ if ((table_row->flags & COL_AUTOINC) != 0)
{
getter = get_autoinc_id;
}
- else if ( table_row->qof_param_name != NULL )
+ else if (table_row->qof_param_name != NULL)
{
- getter = qof_class_get_parameter_getter( obj_name,
- table_row->qof_param_name );
+ getter = qof_class_get_parameter_getter (obj_name,
+ table_row->qof_param_name);
}
else
{
@@ -1161,35 +1164,38 @@ gnc_sql_get_getter( QofIdTypeConst obj_name, const GncSqlColumnTableEntry* table
/* ----------------------------------------------------------------- */
void
-gnc_sql_add_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
+gnc_sql_add_colname_to_list (const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
- (*pList) = g_list_append( (*pList), g_strdup( table_row->col_name ) );
+ (*pList) = g_list_append ((*pList), g_strdup (table_row->col_name));
}
/* ----------------------------------------------------------------- */
void
-gnc_sql_add_subtable_colnames_to_list( const GncSqlColumnTableEntry* table_row, const GncSqlColumnTableEntry* subtable,
-GList** pList )
+gnc_sql_add_subtable_colnames_to_list (const GncSqlColumnTableEntry* table_row,
+ const GncSqlColumnTableEntry* subtable,
+ GList** pList)
{
const GncSqlColumnTableEntry* subtable_row;
gchar* buf;
- for ( subtable_row = subtable; subtable_row->col_name != NULL; subtable_row++ )
+ for (subtable_row = subtable; subtable_row->col_name != NULL; subtable_row++)
{
- buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable_row->col_name );
- (*pList) = g_list_append( (*pList), buf );
+ buf = g_strdup_printf ("%s_%s", table_row->col_name, subtable_row->col_name);
+ (*pList) = g_list_append ((*pList), buf);
}
}
static GncSqlColumnInfo*
-create_column_info( const GncSqlColumnTableEntry* table_row, GncSqlBasicColumnType type,
-gint size, gboolean is_unicode )
+create_column_info (const GncSqlColumnTableEntry* table_row,
+ GncSqlBasicColumnType type,
+ gint size, gboolean is_unicode)
{
GncSqlColumnInfo* info;
- info = g_new0( GncSqlColumnInfo, 1 );
- g_assert( info != NULL );
- info->name = g_strdup( table_row->col_name );
+ info = g_new0 (GncSqlColumnInfo, 1);
+ g_assert (info != NULL);
+ info->name = g_strdup (table_row->col_name);
info->type = type;
info->size = size;
info->is_primary_key = ((table_row->flags & COL_PKEY) != 0) ? TRUE : FALSE;
@@ -1202,92 +1208,94 @@ gint size, gboolean is_unicode )
/* ----------------------------------------------------------------- */
static void
-load_string( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
-const GncSqlColumnTableEntry* table_row )
+load_string (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
const gchar* s;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- g_return_if_fail( val != NULL );
- s = g_value_get_string( val );
- if ( table_row->gobj_param_name != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ g_return_if_fail (val != NULL);
+ s = g_value_get_string (val);
+ if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, s, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, s, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
}
else
{
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)s );
+ g_return_if_fail (setter != NULL);
+ (*setter) (pObject, (const gpointer)s);
}
}
static void
-add_string_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
-GList** pList )
+add_string_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- info = create_column_info( table_row, BCT_STRING, table_row->size, TRUE );
+ info = create_column_info (table_row, BCT_STRING, table_row->size, TRUE);
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_gvalue_string_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
-const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_string_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
QofAccessFunc getter;
gchar* s = NULL;
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- memset( value, 0, sizeof( GValue ) );
- if ( table_row->gobj_param_name != NULL )
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
+ memset (value, 0, sizeof (GValue));
+ if (table_row->gobj_param_name != NULL)
{
- g_object_get( pObject, table_row->gobj_param_name, &s, NULL );
+ g_object_get (pObject, table_row->gobj_param_name, &s, NULL);
}
else
{
- getter = gnc_sql_get_getter( obj_name, table_row );
- if ( getter != NULL )
+ getter = gnc_sql_get_getter (obj_name, table_row);
+ if (getter != NULL)
{
- s = (gchar*)(*getter)( pObject, NULL );
- if ( s != NULL )
+ s = (gchar*) (*getter) (pObject, NULL);
+ if (s != NULL)
{
- s = g_strdup( s );
+ s = g_strdup (s);
}
}
}
- (void)g_value_init( value, G_TYPE_STRING );
- if ( s )
+ (void)g_value_init (value, G_TYPE_STRING);
+ if (s)
{
- g_value_take_string( value, s );
+ g_value_take_string (value, s);
}
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
static GncSqlColumnTypeHandler string_handler
@@ -1299,98 +1307,100 @@ static GncSqlColumnTypeHandler string_handler
add_gvalue_string_to_slist
};
/* ----------------------------------------------------------------- */
-typedef gint (*IntAccessFunc)( const gpointer );
-typedef void (*IntSetterFunc)( const gpointer, gint );
+typedef gint (*IntAccessFunc) (const gpointer);
+typedef void (*IntSetterFunc) (const gpointer, gint);
static void
-load_int( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_int (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
gint int_value;
IntSetterFunc i_setter;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val == NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val == NULL)
{
int_value = 0;
}
else
{
- int_value = (gint)gnc_sql_get_integer_value( val );
+ int_value = (gint)gnc_sql_get_integer_value (val);
}
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, int_value, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, int_value, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
}
else
{
- g_return_if_fail( setter != NULL );
+ g_return_if_fail (setter != NULL);
i_setter = (IntSetterFunc)setter;
- (*i_setter)( pObject, int_value );
+ (*i_setter) (pObject, int_value);
}
}
static void
-add_int_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_int_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- info = create_column_info( table_row, BCT_INT, 0, FALSE );
+ info = create_column_info (table_row, BCT_INT, 0, FALSE);
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_gvalue_int_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_int_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
gint int_value = 0;
IntAccessFunc i_getter;
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- (void)g_value_init( value, G_TYPE_INT );
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
+ (void)g_value_init (value, G_TYPE_INT);
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- g_object_get_property(G_OBJECT(pObject), table_row->gobj_param_name,
- value );
+ g_object_get_property (G_OBJECT (pObject), table_row->gobj_param_name,
+ value);
}
else
{
- i_getter = (IntAccessFunc)gnc_sql_get_getter( obj_name, table_row );
- if ( i_getter != NULL )
+ i_getter = (IntAccessFunc)gnc_sql_get_getter (obj_name, table_row);
+ if (i_getter != NULL)
{
- int_value = (*i_getter)( pObject );
+ int_value = (*i_getter) (pObject);
}
- g_value_set_int( value, int_value );
+ g_value_set_int (value, int_value);
}
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
static GncSqlColumnTypeHandler int_handler
@@ -1402,97 +1412,99 @@ static GncSqlColumnTypeHandler int_handler
add_gvalue_int_to_slist
};
/* ----------------------------------------------------------------- */
-typedef gboolean (*BooleanAccessFunc)( const gpointer );
-typedef void (*BooleanSetterFunc)( const gpointer, gboolean );
+typedef gboolean (*BooleanAccessFunc) (const gpointer);
+typedef void (*BooleanSetterFunc) (const gpointer, gboolean);
static void
-load_boolean( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_boolean (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
gint int_value;
BooleanSetterFunc b_setter;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val == NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val == NULL)
{
int_value = 0;
}
else
{
- int_value = (gint)gnc_sql_get_integer_value( val );
+ int_value = (gint)gnc_sql_get_integer_value (val);
}
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, int_value, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, int_value, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
}
else
{
- g_return_if_fail( setter != NULL );
+ g_return_if_fail (setter != NULL);
b_setter = (BooleanSetterFunc)setter;
- (*b_setter)( pObject, (int_value != 0) ? TRUE : FALSE );
+ (*b_setter) (pObject, (int_value != 0) ? TRUE : FALSE);
}
}
static void
-add_boolean_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_boolean_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- info = create_column_info( table_row, BCT_INT, 0, FALSE );
+ info = create_column_info (table_row, BCT_INT, 0, FALSE);
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_gvalue_boolean_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_boolean_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
gint int_value = 0;
BooleanAccessFunc b_getter;
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- g_object_get( pObject, table_row->gobj_param_name, &int_value, NULL );
+ g_object_get (pObject, table_row->gobj_param_name, &int_value, NULL);
}
else
{
- b_getter = (BooleanAccessFunc)gnc_sql_get_getter( obj_name, table_row );
- if ( b_getter != NULL )
+ b_getter = (BooleanAccessFunc)gnc_sql_get_getter (obj_name, table_row);
+ if (b_getter != NULL)
{
- int_value = ((*b_getter)( pObject )) ? 1 : 0;
+ int_value = ((*b_getter) (pObject)) ? 1 : 0;
}
}
- (void)g_value_init( value, G_TYPE_INT );
- g_value_set_int( value, int_value );
+ (void)g_value_init (value, G_TYPE_INT);
+ g_value_set_int (value, int_value);
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
static GncSqlColumnTypeHandler boolean_handler
@@ -1504,89 +1516,91 @@ static GncSqlColumnTypeHandler boolean_handler
add_gvalue_boolean_to_slist
};
/* ----------------------------------------------------------------- */
-typedef gint64 (*Int64AccessFunc)( const gpointer );
-typedef void (*Int64SetterFunc)( const gpointer, gint64 );
+typedef gint64 (*Int64AccessFunc) (const gpointer);
+typedef void (*Int64SetterFunc) (const gpointer, gint64);
static void
-load_int64( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_int64 (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
gint64 i64_value = 0;
Int64SetterFunc i64_setter = (Int64SetterFunc)setter;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL)
{
- i64_value = gnc_sql_get_integer_value( val );
+ i64_value = gnc_sql_get_integer_value (val);
}
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, i64_value, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, i64_value, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
}
else
{
- (*i64_setter)( pObject, i64_value );
+ (*i64_setter) (pObject, i64_value);
}
}
static void
-add_int64_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_int64_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- info = create_column_info( table_row, BCT_INT64, 0, FALSE );
+ info = create_column_info (table_row, BCT_INT64, 0, FALSE);
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_gvalue_int64_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_int64_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
gint64 i64_value = 0;
Int64AccessFunc getter;
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- if ( table_row->gobj_param_name != NULL )
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
+ if (table_row->gobj_param_name != NULL)
{
- g_object_get( pObject, table_row->gobj_param_name, &i64_value, NULL );
+ g_object_get (pObject, table_row->gobj_param_name, &i64_value, NULL);
}
else
{
- getter = (Int64AccessFunc)gnc_sql_get_getter( obj_name, table_row );
- if ( getter != NULL )
+ getter = (Int64AccessFunc)gnc_sql_get_getter (obj_name, table_row);
+ if (getter != NULL)
{
- i64_value = (*getter)( pObject );
+ i64_value = (*getter) (pObject);
}
}
- (void)g_value_init( value, G_TYPE_INT64 );
- g_value_set_int64( value, i64_value );
+ (void)g_value_init (value, G_TYPE_INT64);
+ g_value_set_int64 (value, i64_value);
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
static GncSqlColumnTypeHandler int64_handler
@@ -1600,107 +1614,109 @@ static GncSqlColumnTypeHandler int64_handler
/* ----------------------------------------------------------------- */
static void
-load_double( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_double (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
gdouble d_value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val == NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val == NULL)
{
- (*setter)( pObject, (gpointer)NULL );
+ (*setter) (pObject, (gpointer)NULL);
}
else
{
- if ( G_VALUE_HOLDS(val, G_TYPE_INT) )
+ if (G_VALUE_HOLDS (val, G_TYPE_INT))
{
- d_value = (gdouble)g_value_get_int( val );
+ d_value = (gdouble)g_value_get_int (val);
}
- else if ( G_VALUE_HOLDS(val, G_TYPE_FLOAT) )
+ else if (G_VALUE_HOLDS (val, G_TYPE_FLOAT))
{
- d_value = g_value_get_float( val );
+ d_value = g_value_get_float (val);
}
- else if (G_VALUE_HOLDS(val, G_TYPE_DOUBLE) )
+ else if (G_VALUE_HOLDS (val, G_TYPE_DOUBLE))
{
- d_value = g_value_get_double( val );
+ d_value = g_value_get_double (val);
}
else
{
- PWARN( "Unknown float value type: %s\n", g_type_name( G_VALUE_TYPE(val) ) );
+ PWARN ("Unknown float value type: %s\n", g_type_name (G_VALUE_TYPE (val)));
d_value = 0;
}
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, d_value, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, d_value, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
}
else
{
- (*setter)( pObject, (gpointer)&d_value );
+ (*setter) (pObject, (gpointer)&d_value);
}
}
}
static void
-add_double_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_double_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- info = create_column_info( table_row, BCT_DOUBLE, 0, FALSE );
+ info = create_column_info (table_row, BCT_DOUBLE, 0, FALSE);
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_gvalue_double_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_double_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
QofAccessFunc getter;
gdouble* pDouble = NULL;
gdouble d_value;
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- getter = gnc_sql_get_getter( obj_name, table_row );
- if ( getter != NULL )
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
+ getter = gnc_sql_get_getter (obj_name, table_row);
+ if (getter != NULL)
{
- pDouble = static_cast<decltype(pDouble)>((*getter)(pObject, NULL ));
+ pDouble = static_cast<decltype (pDouble)> ((*getter) (pObject, NULL));
}
- if ( pDouble != NULL )
+ if (pDouble != NULL)
{
d_value = *pDouble;
- (void)g_value_init( value, G_TYPE_DOUBLE );
- g_value_set_double( value, d_value );
+ (void)g_value_init (value, G_TYPE_DOUBLE);
+ g_value_set_double (value, d_value);
}
else
{
- (void)g_value_init( value, G_TYPE_DOUBLE );
- g_value_set_double( value, 0.0 );
+ (void)g_value_init (value, G_TYPE_DOUBLE);
+ g_value_set_double (value, 0.0);
}
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
static GncSqlColumnTypeHandler double_handler
@@ -1714,99 +1730,101 @@ static GncSqlColumnTypeHandler double_handler
/* ----------------------------------------------------------------- */
static void
-load_guid( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_guid (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
const GncGUID* pGuid;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val == NULL || g_value_get_string( val ) == NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val == NULL || g_value_get_string (val) == NULL)
{
pGuid = NULL;
}
else
{
- (void)string_to_guid( g_value_get_string( val ), &guid );
+ (void)string_to_guid (g_value_get_string (val), &guid);
pGuid = &guid;
}
- if ( pGuid != NULL )
+ if (pGuid != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, pGuid, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, pGuid, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
}
else
{
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)pGuid );
+ g_return_if_fail (setter != NULL);
+ (*setter) (pObject, (const gpointer)pGuid);
}
}
}
static void
-add_guid_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_guid_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- info = create_column_info( table_row, BCT_STRING, GUID_ENCODING_LENGTH, FALSE );
+ info = create_column_info (table_row, BCT_STRING, GUID_ENCODING_LENGTH, FALSE);
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_gvalue_guid_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_guid_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
QofAccessFunc getter;
GncGUID* guid = NULL;
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- if ( table_row->gobj_param_name != NULL )
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
+ if (table_row->gobj_param_name != NULL)
{
- g_object_get( pObject, table_row->gobj_param_name, &guid, NULL );
+ g_object_get (pObject, table_row->gobj_param_name, &guid, NULL);
}
else
{
- getter = gnc_sql_get_getter( obj_name, table_row );
- if ( getter != NULL )
+ getter = gnc_sql_get_getter (obj_name, table_row);
+ if (getter != NULL)
{
- guid = static_cast<decltype(guid)>((*getter)( pObject, NULL ));
+ guid = static_cast<decltype (guid)> ((*getter) (pObject, NULL));
}
}
- (void)g_value_init( value, G_TYPE_STRING );
- if ( guid != NULL )
+ (void)g_value_init (value, G_TYPE_STRING);
+ if (guid != NULL)
{
- (void)guid_to_string_buff( guid, guid_buf );
- g_value_set_string( value, guid_buf );
+ (void)guid_to_string_buff (guid, guid_buf);
+ g_value_set_string (value, guid_buf);
}
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
@@ -1821,59 +1839,61 @@ static GncSqlColumnTypeHandler guid_handler
/* ----------------------------------------------------------------- */
void
-gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+gnc_sql_add_gvalue_objectref_guid_to_slist (const GncSqlBackend* be,
+ QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
QofAccessFunc getter;
const GncGUID* guid = NULL;
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
QofInstance* inst = NULL;
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- if ( table_row->gobj_param_name != NULL )
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
+ if (table_row->gobj_param_name != NULL)
{
- g_object_get( pObject, table_row->gobj_param_name, &inst, NULL );
+ g_object_get (pObject, table_row->gobj_param_name, &inst, NULL);
}
else
{
- getter = gnc_sql_get_getter( obj_name, table_row );
- if ( getter != NULL )
+ getter = gnc_sql_get_getter (obj_name, table_row);
+ if (getter != NULL)
{
- inst = static_cast<decltype(inst)>((*getter)( pObject, NULL ));
+ inst = static_cast<decltype (inst)> ((*getter) (pObject, NULL));
}
}
- if ( inst != NULL )
+ if (inst != NULL)
{
- guid = qof_instance_get_guid( inst );
+ guid = qof_instance_get_guid (inst);
}
- (void)g_value_init( value, G_TYPE_STRING );
- if ( guid != NULL )
+ (void)g_value_init (value, G_TYPE_STRING);
+ if (guid != NULL)
{
- (void)guid_to_string_buff( guid, guid_buf );
- g_value_set_string( value, guid_buf );
+ (void)guid_to_string_buff (guid, guid_buf);
+ g_value_set_string (value, guid_buf);
}
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
void
-gnc_sql_add_objectref_guid_col_info_to_list( const GncSqlBackend* be,
- const GncSqlColumnTableEntry* table_row,
- GList** pList )
+gnc_sql_add_objectref_guid_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
- add_guid_col_info_to_list( be, table_row, pList );
+ add_guid_col_info_to_list (be, table_row, pList);
}
/* ----------------------------------------------------------------- */
-typedef Timespec (*TimespecAccessFunc)( const gpointer );
-typedef void (*TimespecSetterFunc)( const gpointer, Timespec );
+typedef Timespec (*TimespecAccessFunc) (const gpointer);
+typedef void (*TimespecSetterFunc) (const gpointer, Timespec);
#define TIMESPEC_STR_FORMAT "%04d%02d%02d%02d%02d%02d"
#define TIMESPEC_COL_SIZE (4+2+2+2+2+2)
@@ -1883,147 +1903,149 @@ typedef void (*TimespecSetterFunc)( const gpointer, Timespec );
*/
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
gchar*
-gnc_sql_convert_timespec_to_string( const GncSqlBackend* be, Timespec ts )
+gnc_sql_convert_timespec_to_string (const GncSqlBackend* be, Timespec ts)
{
time64 time;
struct tm* tm;
gint year;
gchar* datebuf;
- time = timespecToTime64( ts );
- tm = gnc_gmtime( &time );
+ time = timespecToTime64 (ts);
+ tm = gnc_gmtime (&time);
year = tm->tm_year + 1900;
- datebuf = g_strdup_printf( be->timespec_format,
- year, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec );
+ datebuf = g_strdup_printf (be->timespec_format,
+ year, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
gnc_tm_free (tm);
return datebuf;
}
#pragma GCC diagnostic warning "-Wformat-nonliteral"
static void
-load_timespec( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_timespec (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
Timespec ts = {0, 0};
TimespecSetterFunc ts_setter;
gboolean isOK = FALSE;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
ts_setter = (TimespecSetterFunc)setter;
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val == NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val == NULL)
{
isOK = TRUE;
}
else
{
- if ( G_VALUE_HOLDS_INT64( val ) )
+ if (G_VALUE_HOLDS_INT64 (val))
+ {
+ timespecFromTime64 (&ts, (time64) (g_value_get_int64 (val)));
+ isOK = TRUE;
+ }
+ else if (G_VALUE_HOLDS_STRING (val))
{
- timespecFromTime64 (&ts, (time64)(g_value_get_int64 (val)));
- isOK = TRUE;
- }
- else if (G_VALUE_HOLDS_STRING (val))
- {
- const gchar* s = g_value_get_string( val );
- if ( s != NULL )
+ const gchar* s = g_value_get_string (val);
+ if (s != NULL)
{
gchar* buf;
- buf = g_strdup_printf( "%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c",
+ buf = g_strdup_printf ("%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c",
s[0], s[1], s[2], s[3],
s[4], s[5],
s[6], s[7],
s[8], s[9],
s[10], s[11],
- s[12], s[13] );
- ts = gnc_iso8601_to_timespec_gmt( buf );
- g_free( buf );
+ s[12], s[13]);
+ ts = gnc_iso8601_to_timespec_gmt (buf);
+ g_free (buf);
isOK = TRUE;
}
}
else
{
- PWARN( "Unknown timespec type: %s", G_VALUE_TYPE_NAME( val ) );
+ PWARN ("Unknown timespec type: %s", G_VALUE_TYPE_NAME (val));
}
}
- if ( isOK )
+ if (isOK)
{
if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, &ts, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, &ts, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_decrease_editlevel (QOF_INSTANCE (pObject));
}
else
{
- (*ts_setter)( pObject, ts );
+ (*ts_setter) (pObject, ts);
}
}
}
static void
-add_timespec_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_timespec_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- info = create_column_info( table_row, BCT_DATETIME, TIMESPEC_COL_SIZE, FALSE );
+ info = create_column_info (table_row, BCT_DATETIME, TIMESPEC_COL_SIZE, FALSE);
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_gvalue_timespec_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_timespec_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
TimespecAccessFunc ts_getter;
Timespec ts;
gchar* datebuf;
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
Timespec* pts;
- g_object_get( pObject, table_row->gobj_param_name, &pts, NULL );
+ g_object_get (pObject, table_row->gobj_param_name, &pts, NULL);
ts = *pts;
}
else
{
- ts_getter = (TimespecAccessFunc)gnc_sql_get_getter( obj_name, table_row );
- g_return_if_fail( ts_getter != NULL );
- ts = (*ts_getter)( pObject );
+ ts_getter = (TimespecAccessFunc)gnc_sql_get_getter (obj_name, table_row);
+ g_return_if_fail (ts_getter != NULL);
+ ts = (*ts_getter) (pObject);
}
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- (void)g_value_init( value, G_TYPE_STRING );
- if ( ts.tv_sec != 0 || ts.tv_nsec != 0 )
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
+ (void)g_value_init (value, G_TYPE_STRING);
+ if (ts.tv_sec != 0 || ts.tv_nsec != 0)
{
- datebuf = gnc_sql_convert_timespec_to_string( be, ts );
- g_value_take_string( value, datebuf );
+ datebuf = gnc_sql_convert_timespec_to_string (be, ts);
+ g_value_take_string (value, datebuf);
}
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
static GncSqlColumnTypeHandler timespec_handler
@@ -2038,142 +2060,143 @@ static GncSqlColumnTypeHandler timespec_handler
#define DATE_COL_SIZE 8
static void
-load_date( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_date (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
-
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL )
- {
- if (G_VALUE_HOLDS_INT64 (val))
- {
- gint64 time = g_value_get_int64 (val);
- Timespec ts = {time, 0};
- struct tm tm;
- gint day, month, year;
- GDate date = timespec_to_gdate(ts);
- if ( table_row->gobj_param_name != NULL )
- {
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, date, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- }
- else
- {
- (*setter)( pObject, &date );
- }
- }
- else if ( G_VALUE_HOLDS_STRING( val ) )
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
+
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL)
+ {
+ if (G_VALUE_HOLDS_INT64 (val))
+ {
+ gint64 time = g_value_get_int64 (val);
+ Timespec ts = {time, 0};
+ struct tm tm;
+ gint day, month, year;
+ GDate date = timespec_to_gdate (ts);
+ if (table_row->gobj_param_name != NULL)
+ {
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, date, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ }
+ else
+ {
+ (*setter) (pObject, &date);
+ }
+ }
+ else if (G_VALUE_HOLDS_STRING (val))
{
// Format of date is YYYYMMDD
- const gchar* s = g_value_get_string( val );
- GDate *date;
- if ( s != NULL )
+ const gchar* s = g_value_get_string (val);
+ GDate* date;
+ if (s != NULL)
{
gchar buf[5];
GDateDay day;
GDateMonth month;
GDateYear year;
- strncpy( buf, &s[0], 4 );
+ strncpy (buf, &s[0], 4);
buf[4] = '\0';
- year = (GDateYear)atoi( buf );
- strncpy( buf, &s[4], 2 );
+ year = (GDateYear)atoi (buf);
+ strncpy (buf, &s[4], 2);
buf[2] = '\0';
- month = static_cast<decltype(month)>(atoi( buf ));
- strncpy( buf, &s[6], 2 );
- day = (GDateDay)atoi( buf );
+ month = static_cast<decltype (month)> (atoi (buf));
+ strncpy (buf, &s[6], 2);
+ day = (GDateDay)atoi (buf);
- if ( year != 0 || month != 0 || day != (GDateDay)0 )
+ if (year != 0 || month != 0 || day != (GDateDay)0)
{
- date = g_date_new_dmy( day, month, year );
- if ( table_row->gobj_param_name != NULL )
+ date = g_date_new_dmy (day, month, year);
+ if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
g_object_set (pObject, table_row->gobj_param_name,
- date, NULL);
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ date, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
}
else
{
- (*setter)( pObject, date );
+ (*setter) (pObject, date);
}
- g_date_free( date );
+ g_date_free (date);
}
}
}
else
{
- PWARN( "Unknown date type: %s", G_VALUE_TYPE_NAME( val ) );
+ PWARN ("Unknown date type: %s", G_VALUE_TYPE_NAME (val));
}
}
}
static void
-add_date_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_date_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- info = create_column_info( table_row, BCT_DATE, DATE_COL_SIZE, FALSE );
+ info = create_column_info (table_row, BCT_DATE, DATE_COL_SIZE, FALSE);
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_gvalue_date_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
+add_gvalue_date_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
const gpointer pObject,
- const GncSqlColumnTableEntry* table_row, GSList** pList )
+ const GncSqlColumnTableEntry* table_row, GSList** pList)
{
GDate* date = NULL;
QofAccessFunc getter;
gchar* buf;
GValue* value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- value = g_new0( GValue, 1 );
- g_assert( value != NULL );
- (void)g_value_init( value, G_TYPE_STRING );
- if ( table_row->gobj_param_name != NULL )
+ value = g_new0 (GValue, 1);
+ g_assert (value != NULL);
+ (void)g_value_init (value, G_TYPE_STRING);
+ if (table_row->gobj_param_name != NULL)
{
- g_object_get( pObject, table_row->gobj_param_name, &date, NULL );
+ g_object_get (pObject, table_row->gobj_param_name, &date, NULL);
}
else
{
- getter = gnc_sql_get_getter( obj_name, table_row );
- if ( getter != NULL )
+ getter = gnc_sql_get_getter (obj_name, table_row);
+ if (getter != NULL)
{
- date = (GDate*)(*getter)( pObject, NULL );
+ date = (GDate*) (*getter) (pObject, NULL);
}
}
- if ( date && g_date_valid( date ) )
+ if (date && g_date_valid (date))
{
- buf = g_strdup_printf( "%04d%02d%02d",
- g_date_get_year( date ), g_date_get_month( date ), g_date_get_day( date ) );
- g_value_take_string( value, buf );
+ buf = g_strdup_printf ("%04d%02d%02d",
+ g_date_get_year (date), g_date_get_month (date), g_date_get_day (date));
+ g_value_take_string (value, buf);
}
- (*pList) = g_slist_append( (*pList), value );
+ (*pList) = g_slist_append ((*pList), value);
}
static GncSqlColumnTypeHandler date_handler
@@ -2185,8 +2208,8 @@ static GncSqlColumnTypeHandler date_handler
add_gvalue_date_to_slist
};
/* ----------------------------------------------------------------- */
-typedef gnc_numeric (*NumericGetterFunc)( const gpointer );
-typedef void (*NumericSetterFunc)( gpointer, gnc_numeric );
+typedef gnc_numeric (*NumericGetterFunc) (const gpointer);
+typedef void (*NumericSetterFunc) (gpointer, gnc_numeric);
static const GncSqlColumnTableEntry numeric_col_table[] =
{
@@ -2196,9 +2219,9 @@ static const GncSqlColumnTableEntry numeric_col_table[] =
};
static void
-load_numeric( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_numeric (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
gchar* buf;
@@ -2206,131 +2229,135 @@ load_numeric( const GncSqlBackend* be, GncSqlRow* row,
gnc_numeric n;
gboolean isNull = FALSE;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( table_row->gobj_param_name != NULL || setter != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (table_row->gobj_param_name != NULL || setter != NULL);
- buf = g_strdup_printf( "%s_num", table_row->col_name );
- val = gnc_sql_row_get_value_at_col_name( row, buf );
- g_free( buf );
- if ( val == NULL )
+ buf = g_strdup_printf ("%s_num", table_row->col_name);
+ val = gnc_sql_row_get_value_at_col_name (row, buf);
+ g_free (buf);
+ if (val == NULL)
{
isNull = TRUE;
num = 0;
}
else
{
- num = gnc_sql_get_integer_value( val );
+ num = gnc_sql_get_integer_value (val);
}
- buf = g_strdup_printf( "%s_denom", table_row->col_name );
- val = gnc_sql_row_get_value_at_col_name( row, buf );
- g_free( buf );
- if ( val == NULL )
+ buf = g_strdup_printf ("%s_denom", table_row->col_name);
+ val = gnc_sql_row_get_value_at_col_name (row, buf);
+ g_free (buf);
+ if (val == NULL)
{
isNull = TRUE;
denom = 1;
}
else
{
- denom = gnc_sql_get_integer_value( val );
+ denom = gnc_sql_get_integer_value (val);
}
- n = gnc_numeric_create( num, denom );
- if ( !isNull )
+ n = gnc_numeric_create (num, denom);
+ if (!isNull)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
- g_object_set( pObject, table_row->gobj_param_name, &n, NULL );
- if (QOF_IS_INSTANCE (pObject))
- qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
+ g_object_set (pObject, table_row->gobj_param_name, &n, NULL);
+ if (QOF_IS_INSTANCE (pObject))
+ qof_instance_increase_editlevel (QOF_INSTANCE (pObject));
}
else
{
NumericSetterFunc n_setter = (NumericSetterFunc)setter;
- (*n_setter)( pObject, n );
+ (*n_setter) (pObject, n);
}
}
}
static void
-add_numeric_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_numeric_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
gchar* buf;
const GncSqlColumnTableEntry* subtable_row;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- for ( subtable_row = numeric_col_table; subtable_row->col_name != NULL; subtable_row++ )
+ for (subtable_row = numeric_col_table; subtable_row->col_name != NULL;
+ subtable_row++)
{
- buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable_row->col_name );
- info = g_new0( GncSqlColumnInfo, 1 );
- g_assert( info != NULL );
+ buf = g_strdup_printf ("%s_%s", table_row->col_name, subtable_row->col_name);
+ info = g_new0 (GncSqlColumnInfo, 1);
+ g_assert (info != NULL);
info->name = buf;
info->type = BCT_INT64;
info->is_primary_key = ((table_row->flags & COL_PKEY) != 0) ? TRUE : FALSE;
info->null_allowed = ((table_row->flags & COL_NNUL) != 0) ? FALSE : TRUE;
info->is_unicode = FALSE;
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
}
static void
-add_numeric_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
+add_numeric_colname_to_list (const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
- gnc_sql_add_subtable_colnames_to_list( table_row, numeric_col_table, pList );
+ gnc_sql_add_subtable_colnames_to_list (table_row, numeric_col_table, pList);
}
static void
-add_gvalue_numeric_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_numeric_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
NumericGetterFunc getter;
gnc_numeric n;
GValue* num_value;
GValue* denom_value;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- gnc_numeric *s;
- g_object_get( pObject, table_row->gobj_param_name, &s, NULL );
+ gnc_numeric* s;
+ g_object_get (pObject, table_row->gobj_param_name, &s, NULL);
n = *s;
}
else
{
- getter = (NumericGetterFunc)gnc_sql_get_getter( obj_name, table_row );
- if ( getter != NULL )
+ getter = (NumericGetterFunc)gnc_sql_get_getter (obj_name, table_row);
+ if (getter != NULL)
{
- n = (*getter)( pObject );
+ n = (*getter) (pObject);
}
else
{
- n = gnc_numeric_zero();
+ n = gnc_numeric_zero ();
}
}
- num_value = g_new0( GValue, 1 );
- g_assert( num_value != NULL );
- (void)g_value_init( num_value, G_TYPE_INT64 );
- g_value_set_int64( num_value, gnc_numeric_num( n ) );
- denom_value = g_new0( GValue, 1 );
- g_assert( denom_value != NULL );
- (void)g_value_init( denom_value, G_TYPE_INT64 );
- g_value_set_int64( denom_value, gnc_numeric_denom( n ) );
+ num_value = g_new0 (GValue, 1);
+ g_assert (num_value != NULL);
+ (void)g_value_init (num_value, G_TYPE_INT64);
+ g_value_set_int64 (num_value, gnc_numeric_num (n));
+ denom_value = g_new0 (GValue, 1);
+ g_assert (denom_value != NULL);
+ (void)g_value_init (denom_value, G_TYPE_INT64);
+ g_value_set_int64 (denom_value, gnc_numeric_denom (n));
- (*pList) = g_slist_append( (*pList), num_value );
- (*pList) = g_slist_append( (*pList), denom_value );
+ (*pList) = g_slist_append ((*pList), num_value);
+ (*pList) = g_slist_append ((*pList), denom_value);
}
static GncSqlColumnTypeHandler numeric_handler
@@ -2344,34 +2371,35 @@ static GncSqlColumnTypeHandler numeric_handler
static GHashTable* g_columnTypeHash = NULL;
void
-gnc_sql_register_col_type_handler( const gchar* colType, const GncSqlColumnTypeHandler* handler )
+gnc_sql_register_col_type_handler (const gchar* colType,
+ const GncSqlColumnTypeHandler* handler)
{
- g_return_if_fail( colType != NULL );
- g_return_if_fail( handler != NULL );
+ g_return_if_fail (colType != NULL);
+ g_return_if_fail (handler != NULL);
- if ( g_columnTypeHash == NULL )
+ if (g_columnTypeHash == NULL)
{
- g_columnTypeHash = g_hash_table_new( g_str_hash, g_str_equal );
- g_assert( g_columnTypeHash != NULL );
+ g_columnTypeHash = g_hash_table_new (g_str_hash, g_str_equal);
+ g_assert (g_columnTypeHash != NULL);
}
- DEBUG( "Col type %s registered\n", colType );
- g_hash_table_insert( g_columnTypeHash, (gpointer)colType, (gpointer)handler );
+ DEBUG ("Col type %s registered\n", colType);
+ g_hash_table_insert (g_columnTypeHash, (gpointer)colType, (gpointer)handler);
}
- static GncSqlColumnTypeHandler*
-get_handler( const GncSqlColumnTableEntry* table_row )
+static GncSqlColumnTypeHandler*
+get_handler (const GncSqlColumnTableEntry* table_row)
{
GncSqlColumnTypeHandler* pHandler;
- g_return_val_if_fail( table_row != NULL, NULL );
- g_return_val_if_fail( table_row->col_type != NULL, NULL );
+ g_return_val_if_fail (table_row != NULL, NULL);
+ g_return_val_if_fail (table_row->col_type != NULL, NULL);
- if ( g_columnTypeHash != NULL )
+ if (g_columnTypeHash != NULL)
{
- pHandler = static_cast<decltype(pHandler)>(
- g_hash_table_lookup(g_columnTypeHash, table_row->col_type));
- g_assert( pHandler != NULL );
+ pHandler = static_cast<decltype (pHandler)> (
+ g_hash_table_lookup (g_columnTypeHash, table_row->col_type));
+ g_assert (pHandler != NULL);
}
else
{
@@ -2382,29 +2410,29 @@ get_handler( const GncSqlColumnTableEntry* table_row )
}
static void
-register_standard_col_type_handlers( void )
+register_standard_col_type_handlers (void)
{
- gnc_sql_register_col_type_handler( CT_STRING, &string_handler );
- gnc_sql_register_col_type_handler( CT_BOOLEAN, &boolean_handler );
- gnc_sql_register_col_type_handler( CT_INT, &int_handler );
- gnc_sql_register_col_type_handler( CT_INT64, &int64_handler );
- gnc_sql_register_col_type_handler( CT_DOUBLE, &double_handler );
- gnc_sql_register_col_type_handler( CT_GUID, &guid_handler );
- gnc_sql_register_col_type_handler( CT_TIMESPEC, ×pec_handler );
- gnc_sql_register_col_type_handler( CT_GDATE, &date_handler );
- gnc_sql_register_col_type_handler( CT_NUMERIC, &numeric_handler );
+ gnc_sql_register_col_type_handler (CT_STRING, &string_handler);
+ gnc_sql_register_col_type_handler (CT_BOOLEAN, &boolean_handler);
+ gnc_sql_register_col_type_handler (CT_INT, &int_handler);
+ gnc_sql_register_col_type_handler (CT_INT64, &int64_handler);
+ gnc_sql_register_col_type_handler (CT_DOUBLE, &double_handler);
+ gnc_sql_register_col_type_handler (CT_GUID, &guid_handler);
+ gnc_sql_register_col_type_handler (CT_TIMESPEC, ×pec_handler);
+ gnc_sql_register_col_type_handler (CT_GDATE, &date_handler);
+ gnc_sql_register_col_type_handler (CT_NUMERIC, &numeric_handler);
}
void
-_retrieve_guid_( gpointer pObject, gpointer pValue )
+_retrieve_guid_ (gpointer pObject, gpointer pValue)
{
GncGUID* pGuid = (GncGUID*)pObject;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pValue != NULL);
- memcpy( pGuid, guid, sizeof( GncGUID ) );
+ memcpy (pGuid, guid, sizeof (GncGUID));
}
@@ -2416,14 +2444,14 @@ static GncSqlColumnTableEntry guid_table[] =
};
const GncGUID*
-gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row )
+gnc_sql_load_guid (const GncSqlBackend* be, GncSqlRow* row)
{
static GncGUID guid;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- gnc_sql_load_object( be, row, NULL, &guid, guid_table );
+ gnc_sql_load_object (be, row, NULL, &guid, guid_table);
return &guid;
}
@@ -2437,212 +2465,212 @@ static GncSqlColumnTableEntry tx_guid_table[] =
const GncGUID*
-gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row )
+gnc_sql_load_tx_guid (const GncSqlBackend* be, GncSqlRow* row)
{
static GncGUID guid;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- gnc_sql_load_object( be, row, NULL, &guid, tx_guid_table );
+ gnc_sql_load_object (be, row, NULL, &guid, tx_guid_table);
return &guid;
}
void
-gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+gnc_sql_load_object (const GncSqlBackend* be, GncSqlRow* row,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table)
{
QofSetterFunc setter;
GncSqlColumnTypeHandler* pHandler;
const GncSqlColumnTableEntry* table_row;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table != NULL);
- for ( table_row = table; table_row->col_name != NULL; table_row++ )
+ for (table_row = table; table_row->col_name != NULL; table_row++)
{
- if ( (table_row->flags & COL_AUTOINC) != 0 )
+ if ((table_row->flags & COL_AUTOINC) != 0)
{
setter = set_autoinc_id;
}
- else if ( table_row->qof_param_name != NULL )
+ else if (table_row->qof_param_name != NULL)
{
- g_assert( obj_name != NULL );
- setter = qof_class_get_parameter_setter( obj_name,
- table_row->qof_param_name );
+ g_assert (obj_name != NULL);
+ setter = qof_class_get_parameter_setter (obj_name,
+ table_row->qof_param_name);
}
else
{
setter = table_row->setter;
}
- pHandler = get_handler( table_row );
- g_assert( pHandler != NULL );
- pHandler->load_fn( be, row, setter, pObject, table_row );
+ pHandler = get_handler (table_row);
+ g_assert (pHandler != NULL);
+ pHandler->load_fn (be, row, setter, pObject, table_row);
}
}
/* ================================================================= */
- GncSqlStatement*
-gnc_sql_create_select_statement( GncSqlBackend* be, const gchar* table_name )
+GncSqlStatement*
+gnc_sql_create_select_statement (GncSqlBackend* be, const gchar* table_name)
{
gchar* sql;
GncSqlStatement* stmt;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
- sql = g_strdup_printf( "SELECT * FROM %s", table_name );
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- g_free( sql );
+ sql = g_strdup_printf ("SELECT * FROM %s", table_name);
+ stmt = gnc_sql_create_statement_from_sql (be, sql);
+ g_free (sql);
return stmt;
}
- static GncSqlStatement*
-create_single_col_select_statement( GncSqlBackend* be,
+static GncSqlStatement*
+create_single_col_select_statement (GncSqlBackend* be,
const gchar* table_name,
- const GncSqlColumnTableEntry* table_row )
+ const GncSqlColumnTableEntry* table_row)
{
gchar* sql;
GncSqlStatement* stmt;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( table_row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (table_row != NULL, NULL);
- sql = g_strdup_printf( "SELECT %s FROM %s", table_row->col_name, table_name );
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- g_free( sql );
+ sql = g_strdup_printf ("SELECT %s FROM %s", table_row->col_name, table_name);
+ stmt = gnc_sql_create_statement_from_sql (be, sql);
+ g_free (sql);
return stmt;
}
/* ================================================================= */
- GncSqlResult*
-gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStatement* stmt )
+GncSqlResult*
+gnc_sql_execute_select_statement (GncSqlBackend* be, GncSqlStatement* stmt)
{
GncSqlResult* result;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( stmt != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (stmt != NULL, NULL);
- result = gnc_sql_connection_execute_select_statement( be->conn, stmt );
- if ( result == NULL )
+ result = gnc_sql_connection_execute_select_statement (be->conn, stmt);
+ if (result == NULL)
{
- PERR( "SQL error: %s\n", gnc_sql_statement_to_sql( stmt ) );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ PERR ("SQL error: %s\n", gnc_sql_statement_to_sql (stmt));
+ qof_backend_set_error (&be->be, ERR_BACKEND_SERVER_ERR);
}
return result;
}
- GncSqlStatement*
-gnc_sql_create_statement_from_sql( GncSqlBackend* be, const gchar* sql )
+GncSqlStatement*
+gnc_sql_create_statement_from_sql (GncSqlBackend* be, const gchar* sql)
{
GncSqlStatement* stmt;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( sql != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (sql != NULL, NULL);
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql );
- if ( stmt == NULL )
+ stmt = gnc_sql_connection_create_statement_from_sql (be->conn, sql);
+ if (stmt == NULL)
{
- PERR( "SQL error: %s\n", sql );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ PERR ("SQL error: %s\n", sql);
+ qof_backend_set_error (&be->be, ERR_BACKEND_SERVER_ERR);
}
return stmt;
}
- GncSqlResult*
-gnc_sql_execute_select_sql( GncSqlBackend* be, const gchar* sql )
+GncSqlResult*
+gnc_sql_execute_select_sql (GncSqlBackend* be, const gchar* sql)
{
GncSqlStatement* stmt;
GncSqlResult* result = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( sql != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (sql != NULL, NULL);
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- if ( stmt == NULL )
+ stmt = gnc_sql_create_statement_from_sql (be, sql);
+ if (stmt == NULL)
{
return NULL;
}
- result = gnc_sql_connection_execute_select_statement( be->conn, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result == NULL )
+ result = gnc_sql_connection_execute_select_statement (be->conn, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result == NULL)
{
- PERR( "SQL error: %s\n", sql );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ PERR ("SQL error: %s\n", sql);
+ qof_backend_set_error (&be->be, ERR_BACKEND_SERVER_ERR);
}
return result;
}
gint
-gnc_sql_execute_nonselect_sql( GncSqlBackend* be, const gchar* sql )
+gnc_sql_execute_nonselect_sql (GncSqlBackend* be, const gchar* sql)
{
GncSqlStatement* stmt;
gint result;
- g_return_val_if_fail( be != NULL, 0 );
- g_return_val_if_fail( sql != NULL, 0 );
+ g_return_val_if_fail (be != NULL, 0);
+ g_return_val_if_fail (sql != NULL, 0);
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- if ( stmt == NULL )
+ stmt = gnc_sql_create_statement_from_sql (be, sql);
+ if (stmt == NULL)
{
return -1;
}
- result = gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
- gnc_sql_statement_dispose( stmt );
+ result = gnc_sql_connection_execute_nonselect_statement (be->conn, stmt);
+ gnc_sql_statement_dispose (stmt);
return result;
}
static guint
-execute_statement_get_count( GncSqlBackend* be, GncSqlStatement* stmt )
+execute_statement_get_count (GncSqlBackend* be, GncSqlStatement* stmt)
{
GncSqlResult* result;
guint count = 0;
- g_return_val_if_fail( be != NULL, 0 );
- g_return_val_if_fail( stmt != NULL, 0 );
+ g_return_val_if_fail (be != NULL, 0);
+ g_return_val_if_fail (stmt != NULL, 0);
- result = gnc_sql_execute_select_statement( be, stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ if (result != NULL)
{
- count = gnc_sql_result_get_num_rows( result );
- gnc_sql_result_dispose( result );
+ count = gnc_sql_result_get_num_rows (result);
+ gnc_sql_result_dispose (result);
}
return count;
}
guint
-gnc_sql_append_guid_list_to_sql( GString* sql, GList* list, guint maxCount )
+gnc_sql_append_guid_list_to_sql (GString* sql, GList* list, guint maxCount)
{
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
gboolean first_guid = TRUE;
guint count;
- g_return_val_if_fail( sql != NULL, 0 );
+ g_return_val_if_fail (sql != NULL, 0);
- if ( list == NULL ) return 0;
+ if (list == NULL) return 0;
- for ( count = 0; list != NULL && count < maxCount; list = list->next, count++ )
+ for (count = 0; list != NULL && count < maxCount; list = list->next, count++)
{
- QofInstance* inst = QOF_INSTANCE(list->data);
- (void)guid_to_string_buff( qof_instance_get_guid( inst ), guid_buf );
+ QofInstance* inst = QOF_INSTANCE (list->data);
+ (void)guid_to_string_buff (qof_instance_get_guid (inst), guid_buf);
- if ( !first_guid )
+ if (!first_guid)
{
- (void)g_string_append( sql, "," );
+ (void)g_string_append (sql, ",");
}
- (void)g_string_append( sql, "'" );
- (void)g_string_append( sql, guid_buf );
- (void)g_string_append( sql, "'" );
+ (void)g_string_append (sql, "'");
+ (void)g_string_append (sql, guid_buf);
+ (void)g_string_append (sql, "'");
first_guid = FALSE;
}
@@ -2651,35 +2679,36 @@ gnc_sql_append_guid_list_to_sql( GString* sql, GList* list, guint maxCount )
/* ================================================================= */
gboolean
-gnc_sql_object_is_it_in_db( GncSqlBackend* be, const gchar* table_name,
+gnc_sql_object_is_it_in_db (GncSqlBackend* be, const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ const GncSqlColumnTableEntry* table)
{
GncSqlStatement* sqlStmt;
guint count;
GncSqlColumnTypeHandler* pHandler;
GSList* list = NULL;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( obj_name != NULL, FALSE );
- g_return_val_if_fail( pObject != NULL, FALSE );
- g_return_val_if_fail( table != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (obj_name != NULL, FALSE);
+ g_return_val_if_fail (pObject != NULL, FALSE);
+ g_return_val_if_fail (table != NULL, FALSE);
/* SELECT * FROM */
- sqlStmt = create_single_col_select_statement( be, table_name, table );
- g_assert( sqlStmt != NULL );
+ sqlStmt = create_single_col_select_statement (be, table_name, table);
+ g_assert (sqlStmt != NULL);
/* WHERE */
- pHandler = get_handler( table );
- g_assert( pHandler != NULL );
- pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table, &list );
- g_assert( list != NULL );
- gnc_sql_statement_add_where_cond( sqlStmt, obj_name, pObject, &table[0], (GValue*)(list->data) );
+ pHandler = get_handler (table);
+ g_assert (pHandler != NULL);
+ pHandler->add_gvalue_to_slist_fn (be, obj_name, pObject, table, &list);
+ g_assert (list != NULL);
+ gnc_sql_statement_add_where_cond (sqlStmt, obj_name, pObject, &table[0],
+ (GValue*) (list->data));
- count = execute_statement_get_count( be, sqlStmt );
- gnc_sql_statement_dispose( sqlStmt );
- if ( count == 0 )
+ count = execute_statement_get_count (be, sqlStmt);
+ gnc_sql_statement_dispose (sqlStmt);
+ if (count == 0)
{
return FALSE;
}
@@ -2690,170 +2719,170 @@ gnc_sql_object_is_it_in_db( GncSqlBackend* be, const gchar* table_name,
}
gboolean
-gnc_sql_do_db_operation( GncSqlBackend* be,
+gnc_sql_do_db_operation (GncSqlBackend* be,
E_DB_OPERATION op,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ const GncSqlColumnTableEntry* table)
{
GncSqlStatement* stmt = NULL;
gboolean ok = FALSE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( obj_name != NULL, FALSE );
- g_return_val_if_fail( pObject != NULL, FALSE );
- g_return_val_if_fail( table != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (obj_name != NULL, FALSE);
+ g_return_val_if_fail (pObject != NULL, FALSE);
+ g_return_val_if_fail (table != NULL, FALSE);
- if ( op == OP_DB_INSERT )
+ if (op == OP_DB_INSERT)
{
- stmt = build_insert_statement( be, table_name, obj_name, pObject, table );
+ stmt = build_insert_statement (be, table_name, obj_name, pObject, table);
}
- else if ( op == OP_DB_UPDATE )
+ else if (op == OP_DB_UPDATE)
{
- stmt = build_update_statement( be, table_name, obj_name, pObject, table );
+ stmt = build_update_statement (be, table_name, obj_name, pObject, table);
}
- else if ( op == OP_DB_DELETE )
+ else if (op == OP_DB_DELETE)
{
- stmt = build_delete_statement( be, table_name, obj_name, pObject, table );
+ stmt = build_delete_statement (be, table_name, obj_name, pObject, table);
}
else
{
- g_assert( FALSE );
+ g_assert (FALSE);
}
- if ( stmt != NULL )
+ if (stmt != NULL)
{
gint result;
- result = gnc_sql_connection_execute_nonselect_statement( be->conn, stmt );
- if ( result == -1 )
+ result = gnc_sql_connection_execute_nonselect_statement (be->conn, stmt);
+ if (result == -1)
{
- PERR( "SQL error: %s\n", gnc_sql_statement_to_sql( stmt ) );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ PERR ("SQL error: %s\n", gnc_sql_statement_to_sql (stmt));
+ qof_backend_set_error (&be->be, ERR_BACKEND_SERVER_ERR);
}
else
{
ok = TRUE;
}
- gnc_sql_statement_dispose( stmt );
+ gnc_sql_statement_dispose (stmt);
}
return ok;
}
static GSList*
-create_gslist_from_values( GncSqlBackend* be,
+create_gslist_from_values (GncSqlBackend* be,
QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ const GncSqlColumnTableEntry* table)
{
GSList* list = NULL;
GncSqlColumnTypeHandler* pHandler;
const GncSqlColumnTableEntry* table_row;
- for ( table_row = table; table_row->col_name != NULL; table_row++ )
+ for (table_row = table; table_row->col_name != NULL; table_row++)
{
- if (( table_row->flags & COL_AUTOINC ) == 0 )
+ if ((table_row->flags & COL_AUTOINC) == 0)
{
- pHandler = get_handler( table_row );
- g_assert( pHandler != NULL );
- pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table_row, &list );
+ pHandler = get_handler (table_row);
+ g_assert (pHandler != NULL);
+ pHandler->add_gvalue_to_slist_fn (be, obj_name, pObject, table_row, &list);
}
}
- g_assert( list != NULL );
+ g_assert (list != NULL);
return list;
}
gchar*
-gnc_sql_get_sql_value( const GncSqlConnection* conn, const GValue* value )
+gnc_sql_get_sql_value (const GncSqlConnection* conn, const GValue* value)
{
- if ( value != NULL && G_IS_VALUE( value ) )
+ if (value != NULL && G_IS_VALUE (value))
{
- GType type = G_VALUE_TYPE(value);
+ GType type = G_VALUE_TYPE (value);
- if ( G_VALUE_HOLDS_STRING(value) )
+ if (G_VALUE_HOLDS_STRING (value))
{
- if ( g_value_get_string( value ) != NULL )
+ if (g_value_get_string (value) != NULL)
{
gchar* before_str;
gchar* after_str;
- before_str = g_value_dup_string( value );
- after_str = gnc_sql_connection_quote_string( conn, before_str );
- g_free( before_str );
+ before_str = g_value_dup_string (value);
+ after_str = gnc_sql_connection_quote_string (conn, before_str);
+ g_free (before_str);
return after_str;
}
else
{
- return g_strdup( "NULL" );
+ return g_strdup ("NULL");
}
}
- else if ( type == G_TYPE_INT64 )
+ else if (type == G_TYPE_INT64)
{
- return g_strdup_printf( "%" G_GINT64_FORMAT, g_value_get_int64( value ) );
+ return g_strdup_printf ("%" G_GINT64_FORMAT, g_value_get_int64 (value));
}
- else if ( type == G_TYPE_INT )
+ else if (type == G_TYPE_INT)
{
- return g_strdup_printf( "%d", g_value_get_int( value ) );
+ return g_strdup_printf ("%d", g_value_get_int (value));
}
- else if ( type == G_TYPE_DOUBLE )
+ else if (type == G_TYPE_DOUBLE)
{
gchar doublestr[G_ASCII_DTOSTR_BUF_SIZE];
- g_ascii_dtostr( doublestr, sizeof(doublestr),
- g_value_get_double( value ));
- return g_strdup( doublestr );
+ g_ascii_dtostr (doublestr, sizeof (doublestr),
+ g_value_get_double (value));
+ return g_strdup (doublestr);
}
- else if ( g_value_type_transformable( type, G_TYPE_STRING ) )
+ else if (g_value_type_transformable (type, G_TYPE_STRING))
{
GValue* string;
gchar* str;
- string = g_new0( GValue, 1 );
- g_assert( string != NULL );
- (void)g_value_init( string, G_TYPE_STRING );
- (void)g_value_transform( value, string );
- str = g_value_dup_string( string );
- g_value_unset( string );
- g_free( string );
- PWARN( "using g_value_transform(), gtype = '%s'\n", g_type_name( type ) );
+ string = g_new0 (GValue, 1);
+ g_assert (string != NULL);
+ (void)g_value_init (string, G_TYPE_STRING);
+ (void)g_value_transform (value, string);
+ str = g_value_dup_string (string);
+ g_value_unset (string);
+ g_free (string);
+ PWARN ("using g_value_transform(), gtype = '%s'\n", g_type_name (type));
return str;
}
else
{
- PWARN( "not transformable, gtype = '%s'\n", g_type_name( type ) );
- return g_strdup( "$$$" );
+ PWARN ("not transformable, gtype = '%s'\n", g_type_name (type));
+ return g_strdup ("$$$");
}
}
else
{
- PWARN( "value is NULL or not G_IS_VALUE()\n" );
- return g_strdup( "" );
+ PWARN ("value is NULL or not G_IS_VALUE()\n");
+ return g_strdup ("");
}
}
static void
-free_gvalue_list( GSList* list )
+free_gvalue_list (GSList* list)
{
GSList* node;
GValue* value;
- for ( node = list; node != NULL; node = node->next )
+ for (node = list; node != NULL; node = node->next)
{
value = (GValue*)node->data;
- g_value_unset( value );
- g_free( value );
+ g_value_unset (value);
+ g_free (value);
}
- g_slist_free( list );
+ g_slist_free (list);
}
- static GncSqlStatement*
-build_insert_statement( GncSqlBackend* be,
+static GncSqlStatement*
+build_insert_statement (GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ const GncSqlColumnTableEntry* table)
{
GncSqlStatement* stmt;
GString* sql;
@@ -2864,71 +2893,71 @@ build_insert_statement( GncSqlBackend* be,
GList* colname;
const GncSqlColumnTableEntry* table_row;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( obj_name != NULL, NULL );
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( table != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (obj_name != NULL, NULL);
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (table != NULL, NULL);
- sqlbuf = g_strdup_printf( "INSERT INTO %s(", table_name );
- sql = g_string_new( sqlbuf );
- g_free( sqlbuf );
+ sqlbuf = g_strdup_printf ("INSERT INTO %s(", table_name);
+ sql = g_string_new (sqlbuf);
+ g_free (sqlbuf);
// Get all col names and all values
- for ( table_row = table; table_row->col_name != NULL; table_row++ )
+ for (table_row = table; table_row->col_name != NULL; table_row++)
{
- if (( table_row->flags & COL_AUTOINC ) == 0 )
+ if ((table_row->flags & COL_AUTOINC) == 0)
{
GncSqlColumnTypeHandler* pHandler;
// Add col names to the list
- pHandler = get_handler( table_row );
- g_assert( pHandler != NULL );
- pHandler->add_colname_to_list_fn( table_row, &colnames );
+ pHandler = get_handler (table_row);
+ g_assert (pHandler != NULL);
+ pHandler->add_colname_to_list_fn (table_row, &colnames);
}
}
- g_assert( colnames != NULL );
+ g_assert (colnames != NULL);
- for ( colname = colnames; colname != NULL; colname = colname->next )
+ for (colname = colnames; colname != NULL; colname = colname->next)
{
- if ( colname != colnames )
+ if (colname != colnames)
{
- g_string_append( sql, "," );
+ g_string_append (sql, ",");
}
- g_string_append( sql, (gchar*)colname->data );
- g_free( colname->data );
+ g_string_append (sql, (gchar*)colname->data);
+ g_free (colname->data);
}
- g_list_free( colnames );
+ g_list_free (colnames);
- g_string_append( sql, ") VALUES(" );
- values = create_gslist_from_values( be, obj_name, pObject, table );
- for ( node = values; node != NULL; node = node->next )
+ g_string_append (sql, ") VALUES(");
+ values = create_gslist_from_values (be, obj_name, pObject, table);
+ for (node = values; node != NULL; node = node->next)
{
GValue* value = (GValue*)node->data;
gchar* value_str;
- if ( node != values )
+ if (node != values)
{
- (void)g_string_append( sql, "," );
+ (void)g_string_append (sql, ",");
}
- value_str = gnc_sql_get_sql_value( be->conn, value );
- (void)g_string_append( sql, value_str );
- g_free( value_str );
- (void)g_value_reset( value );
+ value_str = gnc_sql_get_sql_value (be->conn, value);
+ (void)g_string_append (sql, value_str);
+ g_free (value_str);
+ (void)g_value_reset (value);
}
- free_gvalue_list( values );
- (void)g_string_append( sql, ")" );
+ free_gvalue_list (values);
+ (void)g_string_append (sql, ")");
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql->str );
- (void)g_string_free( sql, TRUE );
+ stmt = gnc_sql_connection_create_statement_from_sql (be->conn, sql->str);
+ (void)g_string_free (sql, TRUE);
return stmt;
}
- static GncSqlStatement*
-build_update_statement( GncSqlBackend* be,
+static GncSqlStatement*
+build_update_statement (GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ const GncSqlColumnTableEntry* table)
{
GncSqlStatement* stmt;
GString* sql;
@@ -2940,116 +2969,119 @@ build_update_statement( GncSqlBackend* be,
const GncSqlColumnTableEntry* table_row;
gchar* sqlbuf;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( obj_name != NULL, NULL );
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( table != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (obj_name != NULL, NULL);
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (table != NULL, NULL);
// Get all col names and all values
- for ( table_row = table; table_row->col_name != NULL; table_row++ )
+ for (table_row = table; table_row->col_name != NULL; table_row++)
{
- if (( table_row->flags & COL_AUTOINC ) == 0 )
+ if ((table_row->flags & COL_AUTOINC) == 0)
{
GncSqlColumnTypeHandler* pHandler;
// Add col names to the list
- pHandler = get_handler( table_row );
- g_assert( pHandler != NULL );
- pHandler->add_colname_to_list_fn( table_row, &colnames );
+ pHandler = get_handler (table_row);
+ g_assert (pHandler != NULL);
+ pHandler->add_colname_to_list_fn (table_row, &colnames);
}
}
- g_assert( colnames != NULL );
- values = create_gslist_from_values( be, obj_name, pObject, table );
+ g_assert (colnames != NULL);
+ values = create_gslist_from_values (be, obj_name, pObject, table);
// Create the SQL statement
- sqlbuf = g_strdup_printf( "UPDATE %s SET ", table_name );
- sql = g_string_new( sqlbuf );
- g_free( sqlbuf );
+ sqlbuf = g_strdup_printf ("UPDATE %s SET ", table_name);
+ sql = g_string_new (sqlbuf);
+ g_free (sqlbuf);
firstCol = TRUE;
- for ( colname = colnames->next, value = values->next;
- colname != NULL && value != NULL;
- colname = colname->next, value = value->next )
+ for (colname = colnames->next, value = values->next;
+ colname != NULL && value != NULL;
+ colname = colname->next, value = value->next)
{
gchar* value_str;
- if ( !firstCol )
+ if (!firstCol)
{
- (void)g_string_append( sql, "," );
+ (void)g_string_append (sql, ",");
}
- (void)g_string_append( sql, (gchar*)colname->data );
- (void)g_string_append( sql, "=" );
- value_str = gnc_sql_get_sql_value( be->conn, (GValue*)(value->data) );
- (void)g_string_append( sql, value_str );
- g_free( value_str );
+ (void)g_string_append (sql, (gchar*)colname->data);
+ (void)g_string_append (sql, "=");
+ value_str = gnc_sql_get_sql_value (be->conn, (GValue*) (value->data));
+ (void)g_string_append (sql, value_str);
+ g_free (value_str);
firstCol = FALSE;
}
- for ( colname = colnames; colname != NULL; colname = colname->next )
+ for (colname = colnames; colname != NULL; colname = colname->next)
{
- g_free( colname->data );
+ g_free (colname->data);
}
- g_list_free( colnames );
- if ( value != NULL || colname != NULL )
+ g_list_free (colnames);
+ if (value != NULL || colname != NULL)
{
- PERR( "Mismatch in number of column names and values" );
+ PERR ("Mismatch in number of column names and values");
}
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sql->str );
- gnc_sql_statement_add_where_cond( stmt, obj_name, pObject, &table[0], (GValue*)(values->data) );
- free_gvalue_list( values );
- (void)g_string_free( sql, TRUE );
+ stmt = gnc_sql_connection_create_statement_from_sql (be->conn, sql->str);
+ gnc_sql_statement_add_where_cond (stmt, obj_name, pObject, &table[0],
+ (GValue*) (values->data));
+ free_gvalue_list (values);
+ (void)g_string_free (sql, TRUE);
return stmt;
}
- static GncSqlStatement*
-build_delete_statement( GncSqlBackend* be,
+static GncSqlStatement*
+build_delete_statement (GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table )
+ const GncSqlColumnTableEntry* table)
{
GncSqlStatement* stmt;
GncSqlColumnTypeHandler* pHandler;
GSList* list = NULL;
gchar* sqlbuf;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( table_name != NULL, NULL );
- g_return_val_if_fail( obj_name != NULL, NULL );
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( table != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (table_name != NULL, NULL);
+ g_return_val_if_fail (obj_name != NULL, NULL);
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (table != NULL, NULL);
- sqlbuf = g_strdup_printf( "DELETE FROM %s ", table_name );
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, sqlbuf );
- g_free( sqlbuf );
+ sqlbuf = g_strdup_printf ("DELETE FROM %s ", table_name);
+ stmt = gnc_sql_connection_create_statement_from_sql (be->conn, sqlbuf);
+ g_free (sqlbuf);
/* WHERE */
- pHandler = get_handler( table );
- g_assert( pHandler != NULL );
- pHandler->add_gvalue_to_slist_fn( be, obj_name, pObject, table, &list );
- g_assert( list != NULL );
- gnc_sql_statement_add_where_cond( stmt, obj_name, pObject, &table[0], (GValue*)(list->data) );
- free_gvalue_list( list );
+ pHandler = get_handler (table);
+ g_assert (pHandler != NULL);
+ pHandler->add_gvalue_to_slist_fn (be, obj_name, pObject, table, &list);
+ g_assert (list != NULL);
+ gnc_sql_statement_add_where_cond (stmt, obj_name, pObject, &table[0],
+ (GValue*) (list->data));
+ free_gvalue_list (list);
return stmt;
}
/* ================================================================= */
gboolean
-gnc_sql_commit_standard_item( GncSqlBackend* be, QofInstance* inst, const gchar* tableName,
- QofIdTypeConst obj_name, const GncSqlColumnTableEntry* col_table )
+gnc_sql_commit_standard_item (GncSqlBackend* be, QofInstance* inst,
+ const gchar* tableName,
+ QofIdTypeConst obj_name, const GncSqlColumnTableEntry* col_table)
{
const GncGUID* guid;
gboolean is_infant;
E_DB_OPERATION op;
gboolean is_ok;
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -3057,19 +3089,19 @@ gnc_sql_commit_standard_item( GncSqlBackend* be, QofInstance* inst, const gchar*
{
op = OP_DB_UPDATE;
}
- is_ok = gnc_sql_do_db_operation( be, op, tableName, obj_name, inst, col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, tableName, obj_name, inst, col_table);
- if ( is_ok )
+ if (is_ok)
{
// Now, commit any slots
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
+ is_ok = gnc_sql_slots_delete (be, guid);
}
}
@@ -3079,145 +3111,148 @@ gnc_sql_commit_standard_item( GncSqlBackend* be, QofInstance* inst, const gchar*
/* ================================================================= */
static gboolean
-do_create_table( const GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+do_create_table (const GncSqlBackend* be, const gchar* table_name,
+ const GncSqlColumnTableEntry* col_table)
{
GList* col_info_list = NULL;
gboolean ok = FALSE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( col_table != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (col_table != NULL, FALSE);
- for ( ; col_table->col_name != NULL; col_table++ )
+ for (; col_table->col_name != NULL; col_table++)
{
GncSqlColumnTypeHandler* pHandler;
- pHandler = get_handler( col_table );
- g_assert( pHandler != NULL );
- pHandler->add_col_info_to_list_fn( be, col_table, &col_info_list );
+ pHandler = get_handler (col_table);
+ g_assert (pHandler != NULL);
+ pHandler->add_col_info_to_list_fn (be, col_table, &col_info_list);
}
- g_assert( col_info_list != NULL );
- ok = gnc_sql_connection_create_table( be->conn, table_name, col_info_list );
+ g_assert (col_info_list != NULL);
+ ok = gnc_sql_connection_create_table (be->conn, table_name, col_info_list);
return ok;
}
gboolean
-gnc_sql_create_table( GncSqlBackend* be, const gchar* table_name,
- gint table_version, const GncSqlColumnTableEntry* col_table )
+gnc_sql_create_table (GncSqlBackend* be, const gchar* table_name,
+ gint table_version, const GncSqlColumnTableEntry* col_table)
{
gboolean ok;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( col_table != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (col_table != NULL, FALSE);
- DEBUG( "Creating %s table\n", table_name );
+ DEBUG ("Creating %s table\n", table_name);
- ok = do_create_table( be, table_name, col_table );
- if ( ok )
+ ok = do_create_table (be, table_name, col_table);
+ if (ok)
{
- ok = gnc_sql_set_table_version( be, table_name, table_version );
+ ok = gnc_sql_set_table_version (be, table_name, table_version);
}
return ok;
}
gboolean
-gnc_sql_create_temp_table( const GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+gnc_sql_create_temp_table (const GncSqlBackend* be, const gchar* table_name,
+ const GncSqlColumnTableEntry* col_table)
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( col_table != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (col_table != NULL, FALSE);
- return do_create_table( be, table_name, col_table );
+ return do_create_table (be, table_name, col_table);
}
gboolean
-gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
+gnc_sql_create_index (const GncSqlBackend* be, const gchar* index_name,
const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+ const GncSqlColumnTableEntry* col_table)
{
gboolean ok;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( index_name != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( col_table != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (index_name != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (col_table != NULL, FALSE);
- ok = gnc_sql_connection_create_index( be->conn, index_name, table_name,
- col_table );
+ ok = gnc_sql_connection_create_index (be->conn, index_name, table_name,
+ col_table);
return ok;
}
gint
-gnc_sql_get_table_version( const GncSqlBackend* be, const gchar* table_name )
+gnc_sql_get_table_version (const GncSqlBackend* be, const gchar* table_name)
{
- g_return_val_if_fail( be != NULL, 0 );
- g_return_val_if_fail( table_name != NULL, 0 );
+ g_return_val_if_fail (be != NULL, 0);
+ g_return_val_if_fail (table_name != NULL, 0);
/* If the db is pristine because it's being saved, the table does not exist. */
- if ( be->is_pristine_db )
+ if (be->is_pristine_db)
{
return 0;
}
- return GPOINTER_TO_INT(g_hash_table_lookup( be->versions, table_name ));
+ return GPOINTER_TO_INT (g_hash_table_lookup (be->versions, table_name));
}
/* Create a temporary table, copy the data from the old table, delete the
old table, then rename the new one. */
void
-gnc_sql_upgrade_table( GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* col_table )
+gnc_sql_upgrade_table (GncSqlBackend* be, const gchar* table_name,
+ const GncSqlColumnTableEntry* col_table)
{
gchar* sql;
gchar* temp_table_name;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_name != NULL );
- g_return_if_fail( col_table != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_name != NULL);
+ g_return_if_fail (col_table != NULL);
- DEBUG( "Upgrading %s table\n", table_name );
+ DEBUG ("Upgrading %s table\n", table_name);
- temp_table_name = g_strdup_printf( "%s_new", table_name );
- (void)gnc_sql_create_temp_table( be, temp_table_name, col_table );
- sql = g_strdup_printf( "INSERT INTO %s SELECT * FROM %s",
- temp_table_name, table_name );
- (void)gnc_sql_execute_nonselect_sql( be, sql );
- g_free( sql );
+ temp_table_name = g_strdup_printf ("%s_new", table_name);
+ (void)gnc_sql_create_temp_table (be, temp_table_name, col_table);
+ sql = g_strdup_printf ("INSERT INTO %s SELECT * FROM %s",
+ temp_table_name, table_name);
+ (void)gnc_sql_execute_nonselect_sql (be, sql);
+ g_free (sql);
- sql = g_strdup_printf( "DROP TABLE %s", table_name );
- (void)gnc_sql_execute_nonselect_sql( be, sql );
- g_free( sql );
+ sql = g_strdup_printf ("DROP TABLE %s", table_name);
+ (void)gnc_sql_execute_nonselect_sql (be, sql);
+ g_free (sql);
- sql = g_strdup_printf( "ALTER TABLE %s RENAME TO %s", temp_table_name, table_name );
- (void)gnc_sql_execute_nonselect_sql( be, sql );
- g_free( sql );
- g_free( temp_table_name );
+ sql = g_strdup_printf ("ALTER TABLE %s RENAME TO %s", temp_table_name,
+ table_name);
+ (void)gnc_sql_execute_nonselect_sql (be, sql);
+ g_free (sql);
+ g_free (temp_table_name);
}
/* Adds one or more columns to an existing table. */
-gboolean gnc_sql_add_columns_to_table( GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* new_col_table )
+gboolean gnc_sql_add_columns_to_table (GncSqlBackend* be,
+ const gchar* table_name,
+ const GncSqlColumnTableEntry* new_col_table)
{
GList* col_info_list = NULL;
gboolean ok = FALSE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( new_col_table != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (new_col_table != NULL, FALSE);
- for ( ; new_col_table->col_name != NULL; new_col_table++ )
+ for (; new_col_table->col_name != NULL; new_col_table++)
{
GncSqlColumnTypeHandler* pHandler;
- pHandler = get_handler( new_col_table );
- g_assert( pHandler != NULL );
- pHandler->add_col_info_to_list_fn( be, new_col_table, &col_info_list );
+ pHandler = get_handler (new_col_table);
+ g_assert (pHandler != NULL);
+ pHandler->add_col_info_to_list_fn (be, new_col_table, &col_info_list);
}
- g_assert( col_info_list != NULL );
- ok = gnc_sql_connection_add_columns_to_table( be->conn, table_name, col_info_list );
+ g_assert (col_info_list != NULL);
+ ok = gnc_sql_connection_add_columns_to_table (be->conn, table_name,
+ col_info_list);
return ok;
}
@@ -3241,50 +3276,50 @@ static GncSqlColumnTableEntry version_table[] =
* @param be Backend struct
*/
void
-gnc_sql_init_version_info( GncSqlBackend* be )
+gnc_sql_init_version_info (GncSqlBackend* be)
{
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- if ( be->versions != NULL )
+ if (be->versions != NULL)
{
- g_hash_table_destroy( be->versions );
+ g_hash_table_destroy (be->versions);
}
- be->versions = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, NULL );
+ be->versions = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
- if ( gnc_sql_connection_does_table_exist( be->conn, VERSION_TABLE_NAME ) )
+ if (gnc_sql_connection_does_table_exist (be->conn, VERSION_TABLE_NAME))
{
GncSqlResult* result;
gchar* sql;
- sql = g_strdup_printf( "SELECT * FROM %s", VERSION_TABLE_NAME );
- result = gnc_sql_execute_select_sql( be, sql );
- g_free( sql );
- if ( result != NULL )
+ sql = g_strdup_printf ("SELECT * FROM %s", VERSION_TABLE_NAME);
+ result = gnc_sql_execute_select_sql (be, sql);
+ g_free (sql);
+ if (result != NULL)
{
const GValue* name;
const GValue* version;
GncSqlRow* row;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- name = gnc_sql_row_get_value_at_col_name( row, TABLE_COL_NAME );
- version = gnc_sql_row_get_value_at_col_name( row, VERSION_COL_NAME );
- g_hash_table_insert( be->versions,
- g_strdup( g_value_get_string( name ) ),
- GINT_TO_POINTER((gint)g_value_get_int64( version )) );
- row = gnc_sql_result_get_next_row( result );
+ name = gnc_sql_row_get_value_at_col_name (row, TABLE_COL_NAME);
+ version = gnc_sql_row_get_value_at_col_name (row, VERSION_COL_NAME);
+ g_hash_table_insert (be->versions,
+ g_strdup (g_value_get_string (name)),
+ GINT_TO_POINTER ((gint)g_value_get_int64 (version)));
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
}
else
{
- do_create_table( be, VERSION_TABLE_NAME, version_table );
- gnc_sql_set_table_version( be, "Gnucash",
- gnc_prefs_get_long_version() );
- gnc_sql_set_table_version( be, "Gnucash-Resave",
- GNUCASH_RESAVE_VERSION );
+ do_create_table (be, VERSION_TABLE_NAME, version_table);
+ gnc_sql_set_table_version (be, "Gnucash",
+ gnc_prefs_get_long_version ());
+ gnc_sql_set_table_version (be, "Gnucash-Resave",
+ GNUCASH_RESAVE_VERSION);
}
}
@@ -3296,24 +3331,24 @@ gnc_sql_init_version_info( GncSqlBackend* be )
* @return TRUE if successful, FALSE if error
*/
static gboolean
-reset_version_info( GncSqlBackend* be )
+reset_version_info (GncSqlBackend* be)
{
gboolean ok;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
- ok = do_create_table( be, VERSION_TABLE_NAME, version_table );
- if ( be->versions == NULL )
+ ok = do_create_table (be, VERSION_TABLE_NAME, version_table);
+ if (be->versions == NULL)
{
- be->versions = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, NULL );
+ be->versions = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
}
else
{
- g_hash_table_remove_all( be->versions );
+ g_hash_table_remove_all (be->versions);
}
- gnc_sql_set_table_version( be, "Gnucash", gnc_prefs_get_long_version() );
- gnc_sql_set_table_version( be, "Gnucash-Resave", GNUCASH_RESAVE_VERSION );
+ gnc_sql_set_table_version (be, "Gnucash", gnc_prefs_get_long_version ());
+ gnc_sql_set_table_version (be, "Gnucash-Resave", GNUCASH_RESAVE_VERSION);
return ok;
}
@@ -3323,13 +3358,13 @@ reset_version_info( GncSqlBackend* be )
* @param be Backend struct
*/
void
-gnc_sql_finalize_version_info( GncSqlBackend* be )
+gnc_sql_finalize_version_info (GncSqlBackend* be)
{
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- if ( be->versions != NULL )
+ if (be->versions != NULL)
{
- g_hash_table_destroy( be->versions );
+ g_hash_table_destroy (be->versions);
be->versions = NULL;
}
}
@@ -3344,40 +3379,42 @@ gnc_sql_finalize_version_info( GncSqlBackend* be )
* @return TRUE if successful, FALSE if unsuccessful
*/
gboolean
-gnc_sql_set_table_version( GncSqlBackend* be, const gchar* table_name, gint version )
+gnc_sql_set_table_version (GncSqlBackend* be, const gchar* table_name,
+ gint version)
{
gchar* sql;
gint cur_version;
gint status;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( table_name != NULL, FALSE );
- g_return_val_if_fail( version > 0, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (table_name != NULL, FALSE);
+ g_return_val_if_fail (version > 0, FALSE);
- cur_version = gnc_sql_get_table_version( be, table_name );
- if ( cur_version != version )
+ cur_version = gnc_sql_get_table_version (be, table_name);
+ if (cur_version != version)
{
- if ( cur_version == 0 )
+ if (cur_version == 0)
{
- sql = g_strdup_printf( "INSERT INTO %s VALUES('%s',%d)", VERSION_TABLE_NAME,
- table_name, version );
+ sql = g_strdup_printf ("INSERT INTO %s VALUES('%s',%d)", VERSION_TABLE_NAME,
+ table_name, version);
}
else
{
- sql = g_strdup_printf( "UPDATE %s SET %s=%d WHERE %s='%s'", VERSION_TABLE_NAME,
+ sql = g_strdup_printf ("UPDATE %s SET %s=%d WHERE %s='%s'", VERSION_TABLE_NAME,
VERSION_COL_NAME, version,
- TABLE_COL_NAME, table_name );
+ TABLE_COL_NAME, table_name);
}
- status = gnc_sql_execute_nonselect_sql( be, sql );
- if ( status == -1 )
+ status = gnc_sql_execute_nonselect_sql (be, sql);
+ if (status == -1)
{
- PERR( "SQL error: %s\n", sql );
- qof_backend_set_error( &be->be, ERR_BACKEND_SERVER_ERR );
+ PERR ("SQL error: %s\n", sql);
+ qof_backend_set_error (&be->be, ERR_BACKEND_SERVER_ERR);
}
- g_free( sql );
+ g_free (sql);
}
- g_hash_table_insert( be->versions, g_strdup( table_name ), GINT_TO_POINTER(version) );
+ g_hash_table_insert (be->versions, g_strdup (table_name),
+ GINT_TO_POINTER (version));
return TRUE;
}
diff --git a/src/backend/sql/gnc-backend-sql.h b/src/backend/sql/gnc-backend-sql.h
index f593757..e4a2be8 100644
--- a/src/backend/sql/gnc-backend-sql.h
+++ b/src/backend/sql/gnc-backend-sql.h
@@ -53,16 +53,16 @@ typedef struct GncSqlConnection GncSqlConnection;
*/
struct GncSqlBackend
{
- QofBackend be; /**< QOF backend */
- GncSqlConnection* conn; /**< SQL connection */
- QofBook *book; /**< The primary, main open book */
- gboolean loading; /**< We are performing an initial load */
- gboolean in_query; /**< We are processing a query */
- gboolean is_pristine_db; /**< Are we saving to a new pristine db? */
- gint obj_total; /**< Total # of objects (for percentage calculation) */
- gint operations_done; /**< Number of operations (save/load) done */
- GHashTable* versions; /**< Version number for each table */
- const gchar* timespec_format; /**< Format string for SQL for timespec values */
+ QofBackend be; /**< QOF backend */
+ GncSqlConnection* conn; /**< SQL connection */
+ QofBook* book; /**< The primary, main open book */
+ gboolean loading; /**< We are performing an initial load */
+ gboolean in_query; /**< We are processing a query */
+ gboolean is_pristine_db; /**< Are we saving to a new pristine db? */
+ gint obj_total; /**< Total # of objects (for percentage calculation) */
+ gint operations_done; /**< Number of operations (save/load) done */
+ GHashTable* versions; /**< Version number for each table */
+ const gchar* timespec_format; /**< Format string for SQL for timespec values */
};
typedef struct GncSqlBackend GncSqlBackend;
@@ -71,7 +71,7 @@ typedef struct GncSqlBackend GncSqlBackend;
*
* @param be SQL backend
*/
-void gnc_sql_init( GncSqlBackend* be );
+void gnc_sql_init (GncSqlBackend* be);
/**
* Load the contents of an SQL database into a book.
@@ -79,7 +79,8 @@ void gnc_sql_init( GncSqlBackend* be );
* @param be SQL backend
* @param book Book to be loaded
*/
-void gnc_sql_load( GncSqlBackend* be, QofBook *book, QofBackendLoadType loadType );
+void gnc_sql_load (GncSqlBackend* be, QofBook* book,
+ QofBackendLoadType loadType);
/**
* Register a commodity to be committed after loading is complete.
@@ -88,8 +89,8 @@ void gnc_sql_load( GncSqlBackend* be, QofBook *book, QofBackendLoadType loadTyp
* @param be SQL backend
* @param comm The commodity item to be committed.
*/
-void gnc_sql_push_commodity_for_postload_processing (GncSqlBackend *be,
- gpointer comm);
+void gnc_sql_push_commodity_for_postload_processing (GncSqlBackend* be,
+ gpointer comm);
/**
* Save the contents of a book to an SQL database.
@@ -97,7 +98,7 @@ void gnc_sql_push_commodity_for_postload_processing (GncSqlBackend *be,
* @param be SQL backend
* @param book Book to be saved
*/
-void gnc_sql_sync_all( GncSqlBackend* be, QofBook *book );
+void gnc_sql_sync_all (GncSqlBackend* be, QofBook* book);
/**
* An object is about to be edited.
@@ -105,7 +106,7 @@ void gnc_sql_sync_all( GncSqlBackend* be, QofBook *book );
* @param be SQL backend
* @param inst Object being edited
*/
-void gnc_sql_begin_edit( GncSqlBackend* be, QofInstance *inst );
+void gnc_sql_begin_edit (GncSqlBackend* be, QofInstance* inst);
/**
* Object editing has been cancelled.
@@ -113,7 +114,7 @@ void gnc_sql_begin_edit( GncSqlBackend* be, QofInstance *inst );
* @param qbe SQL backend
* @param inst Object being edited
*/
-void gnc_sql_rollback_edit( GncSqlBackend* qbe, QofInstance *inst );
+void gnc_sql_rollback_edit (GncSqlBackend* qbe, QofInstance* inst);
/**
* Object editting is complete and the object should be saved.
@@ -121,7 +122,7 @@ void gnc_sql_rollback_edit( GncSqlBackend* qbe, QofInstance *inst );
* @param qbe SQL backend
* @param inst Object being edited
*/
-void gnc_sql_commit_edit( GncSqlBackend* qbe, QofInstance *inst );
+void gnc_sql_commit_edit (GncSqlBackend* qbe, QofInstance* inst);
/**
*/
@@ -138,16 +139,17 @@ typedef struct GncSqlRow GncSqlRow;
*/
struct GncSqlStatement
{
- void (*dispose)( GncSqlStatement* );
- gchar* (*toSql)( GncSqlStatement* );
- void (*addWhereCond)( GncSqlStatement*, QofIdTypeConst, gpointer, const GncSqlColumnTableEntry*, GValue* );
+ void (*dispose) (GncSqlStatement*);
+ gchar* (*toSql) (GncSqlStatement*);
+ void (*addWhereCond) (GncSqlStatement*, QofIdTypeConst, gpointer,
+ const GncSqlColumnTableEntry*, GValue*);
};
#define gnc_sql_statement_dispose(STMT) \
- (STMT)->dispose(STMT)
+ (STMT)->dispose(STMT)
#define gnc_sql_statement_to_sql(STMT) \
- (STMT)->toSql(STMT)
+ (STMT)->toSql(STMT)
#define gnc_sql_statement_add_where_cond(STMT,TYPENAME,OBJ,COLDESC,VALUE) \
- (STMT)->addWhereCond(STMT, TYPENAME, OBJ, COLDESC, VALUE)
+ (STMT)->addWhereCond(STMT, TYPENAME, OBJ, COLDESC, VALUE)
/**
* @struct GncSqlConnection
@@ -157,42 +159,51 @@ struct GncSqlStatement
*/
struct GncSqlConnection
{
- void (*dispose)( GncSqlConnection* );
- GncSqlResult* (*executeSelectStatement)( GncSqlConnection*, GncSqlStatement* ); /**< Returns NULL if error */
- gint (*executeNonSelectStatement)( GncSqlConnection*, GncSqlStatement* ); /**< Returns -1 if error */
- GncSqlStatement* (*createStatementFromSql)( GncSqlConnection*, const gchar* );
- gboolean (*doesTableExist)( GncSqlConnection*, const gchar* ); /**< Returns true if successful */
- gboolean (*beginTransaction)( GncSqlConnection* ); /**< Returns TRUE if successful, FALSE if error */
- gboolean (*rollbackTransaction)( GncSqlConnection* ); /**< Returns TRUE if successful, FALSE if error */
- gboolean (*commitTransaction)( GncSqlConnection* ); /**< Returns TRUE if successful, FALSE if error */
- gboolean (*createTable)( GncSqlConnection*, const gchar*, GList* ); /**< Returns TRUE if successful, FALSE if error */
- gboolean (*createIndex)( GncSqlConnection*, const gchar*, const gchar*, const GncSqlColumnTableEntry* ); /**< Returns TRUE if successful, FALSE if error */
- gboolean (*addColumnsToTable)( GncSqlConnection*, const gchar* table, GList* ); /**< Returns TRUE if successful, FALSE if error */
- gchar* (*quoteString)( const GncSqlConnection*, gchar* );
+ void (*dispose) (GncSqlConnection*);
+ GncSqlResult* (*executeSelectStatement) (GncSqlConnection*,
+ GncSqlStatement*); /**< Returns NULL if error */
+ gint (*executeNonSelectStatement) (GncSqlConnection*,
+ GncSqlStatement*); /**< Returns -1 if error */
+ GncSqlStatement* (*createStatementFromSql) (GncSqlConnection*, const gchar*);
+ gboolean (*doesTableExist) (GncSqlConnection*,
+ const gchar*); /**< Returns true if successful */
+ gboolean (*beginTransaction) (
+ GncSqlConnection*); /**< Returns TRUE if successful, FALSE if error */
+ gboolean (*rollbackTransaction) (
+ GncSqlConnection*); /**< Returns TRUE if successful, FALSE if error */
+ gboolean (*commitTransaction) (
+ GncSqlConnection*); /**< Returns TRUE if successful, FALSE if error */
+ gboolean (*createTable) (GncSqlConnection*, const gchar*,
+ GList*); /**< Returns TRUE if successful, FALSE if error */
+ gboolean (*createIndex) (GncSqlConnection*, const gchar*, const gchar*,
+ const GncSqlColumnTableEntry*); /**< Returns TRUE if successful, FALSE if error */
+ gboolean (*addColumnsToTable) (GncSqlConnection*, const gchar* table,
+ GList*); /**< Returns TRUE if successful, FALSE if error */
+ gchar* (*quoteString) (const GncSqlConnection*, gchar*);
};
#define gnc_sql_connection_dispose(CONN) (CONN)->dispose(CONN)
#define gnc_sql_connection_execute_select_statement(CONN,STMT) \
- (CONN)->executeSelectStatement(CONN,STMT)
+ (CONN)->executeSelectStatement(CONN,STMT)
#define gnc_sql_connection_execute_nonselect_statement(CONN,STMT) \
- (CONN)->executeNonSelectStatement(CONN,STMT)
+ (CONN)->executeNonSelectStatement(CONN,STMT)
#define gnc_sql_connection_create_statement_from_sql(CONN,SQL) \
- (CONN)->createStatementFromSql(CONN,SQL)
+ (CONN)->createStatementFromSql(CONN,SQL)
#define gnc_sql_connection_does_table_exist(CONN,NAME) \
- (CONN)->doesTableExist(CONN,NAME)
+ (CONN)->doesTableExist(CONN,NAME)
#define gnc_sql_connection_begin_transaction(CONN) \
- (CONN)->beginTransaction(CONN)
+ (CONN)->beginTransaction(CONN)
#define gnc_sql_connection_rollback_transaction(CONN) \
- (CONN)->rollbackTransaction(CONN)
+ (CONN)->rollbackTransaction(CONN)
#define gnc_sql_connection_commit_transaction(CONN) \
- (CONN)->commitTransaction(CONN)
+ (CONN)->commitTransaction(CONN)
#define gnc_sql_connection_create_table(CONN,NAME,COLLIST) \
- (CONN)->createTable(CONN,NAME,COLLIST)
+ (CONN)->createTable(CONN,NAME,COLLIST)
#define gnc_sql_connection_create_index(CONN,INDEXNAME,TABLENAME,COLTABLE) \
- (CONN)->createIndex(CONN,INDEXNAME,TABLENAME,COLTABLE)
+ (CONN)->createIndex(CONN,INDEXNAME,TABLENAME,COLTABLE)
#define gnc_sql_connection_add_columns_to_table(CONN,TABLENAME,COLLIST) \
- (CONN)->addColumnsToTable(CONN,TABLENAME,COLLIST)
+ (CONN)->addColumnsToTable(CONN,TABLENAME,COLLIST)
#define gnc_sql_connection_quote_string(CONN,STR) \
- (CONN)->quoteString(CONN,STR)
+ (CONN)->quoteString(CONN,STR)
/**
* @struct GncSqlRow
@@ -202,13 +213,13 @@ struct GncSqlConnection
*/
struct GncSqlRow
{
- const GValue* (*getValueAtColName)( GncSqlRow*, const gchar* );
- void (*dispose)( GncSqlRow* );
+ const GValue* (*getValueAtColName) (GncSqlRow*, const gchar*);
+ void (*dispose) (GncSqlRow*);
};
#define gnc_sql_row_get_value_at_col_name(ROW,N) \
- (ROW)->getValueAtColName(ROW,N)
+ (ROW)->getValueAtColName(ROW,N)
#define gnc_sql_row_dispose(ROW) \
- (ROW)->dispose(ROW)
+ (ROW)->dispose(ROW)
/**
* @struct GncSqlResult
@@ -218,19 +229,19 @@ struct GncSqlRow
*/
struct GncSqlResult
{
- guint (*getNumRows)( GncSqlResult* );
- GncSqlRow* (*getFirstRow)( GncSqlResult* );
- GncSqlRow* (*getNextRow)( GncSqlResult* );
- void (*dispose)( GncSqlResult* );
+ guint (*getNumRows) (GncSqlResult*);
+ GncSqlRow* (*getFirstRow) (GncSqlResult*);
+ GncSqlRow* (*getNextRow) (GncSqlResult*);
+ void (*dispose) (GncSqlResult*);
};
#define gnc_sql_result_get_num_rows(RESULT) \
- (RESULT)->getNumRows(RESULT)
+ (RESULT)->getNumRows(RESULT)
#define gnc_sql_result_get_first_row(RESULT) \
- (RESULT)->getFirstRow(RESULT)
+ (RESULT)->getFirstRow(RESULT)
#define gnc_sql_result_get_next_row(RESULT) \
- (RESULT)->getNextRow(RESULT)
+ (RESULT)->getNextRow(RESULT)
#define gnc_sql_result_dispose(RESULT) \
- (RESULT)->dispose(RESULT)
+ (RESULT)->dispose(RESULT)
/**
* @struct GncSqlObjectBackend
@@ -238,8 +249,8 @@ struct GncSqlResult
* Struct used to handle a specific engine object type for an SQL backend.
* This handler should be registered with qof_object_register_backend().
*
- * commit() - commit an object to the db
- * initial_load() - load stuff when new db opened
+ * commit() - commit an object to the db
+ * initial_load() - load stuff when new db opened
* create_tables() - create any db tables
* compile_query() - compile a backend object query
* run_query() - run a compiled query
@@ -248,29 +259,29 @@ struct GncSqlResult
*/
typedef struct
{
- int version; /**< Backend version number */
- const gchar * type_name; /**< Engine object type name */
+ int version; /**< Backend version number */
+ const gchar* type_name; /**< Engine object type name */
/** Commit an instance of this object to the database
* @return TRUE if successful, FALSE if error
*/
- gboolean (*commit)( GncSqlBackend* be, QofInstance* inst );
+ gboolean (*commit) (GncSqlBackend* be, QofInstance* inst);
/** Load all objects of this type from the database */
- void (*initial_load)( GncSqlBackend* be );
+ void (*initial_load) (GncSqlBackend* be);
/** Create database tables for this object */
- void (*create_tables)( GncSqlBackend* be );
+ void (*create_tables) (GncSqlBackend* be);
/** Compile a query on these objects */
- gpointer (*compile_query)( GncSqlBackend* be, QofQuery* pQuery );
+ gpointer (*compile_query) (GncSqlBackend* be, QofQuery* pQuery);
/** Run a query on these objects */
- void (*run_query)( GncSqlBackend* be, gpointer pQuery );
+ void (*run_query) (GncSqlBackend* be, gpointer pQuery);
/** Free a query on these objects */
- void (*free_query)( GncSqlBackend* be, gpointer pQuery );
+ void (*free_query) (GncSqlBackend* be, gpointer pQuery);
/** Write all objects of this type to the database
* @return TRUE if successful, FALSE if error
*/
- gboolean (*write)( GncSqlBackend* be );
+ gboolean (*write) (GncSqlBackend* be);
} GncSqlObjectBackend;
#define GNC_SQL_BACKEND "gnc:sql:1"
-#define GNC_SQL_BACKEND_VERSION 1
+#define GNC_SQL_BACKEND_VERSION 1
/**
* Basic column type
@@ -293,13 +304,13 @@ typedef enum
*/
typedef struct
{
- gchar* name; /**< Column name */
- GncSqlBasicColumnType type; /**< Column basic type */
- gint size; /**< Column size (string types) */
- gboolean is_unicode; /**< Column is unicode (string types) */
- gboolean is_autoinc; /**< Column is autoinc (int type) */
- gboolean is_primary_key; /**< Column is the primary key */
- gboolean null_allowed; /**< Column allows NULL values */
+ gchar* name; /**< Column name */
+ GncSqlBasicColumnType type; /**< Column basic type */
+ gint size; /**< Column size (string types) */
+ gboolean is_unicode; /**< Column is unicode (string types) */
+ gboolean is_autoinc; /**< Column is autoinc (int type) */
+ gboolean is_primary_key; /**< Column is the primary key */
+ gboolean null_allowed; /**< Column allows NULL values */
} GncSqlColumnInfo;
// Type for conversion of db row to object.
@@ -338,18 +349,18 @@ typedef struct
*/
struct GncSqlColumnTableEntry
{
- const gchar* col_name; /**< Column name */
- const gchar* col_type; /**< Column type */
- gint size; /**< Column size in bytes, for string columns */
-#define COL_PKEY 0x01 /**< The column is a primary key */
-#define COL_NNUL 0x02 /**< The column may not contain a NULL value */
-#define COL_UNIQUE 0x04 /**< The column must contain unique values */
-#define COL_AUTOINC 0x08 /**< The column is an auto-incrementing int */
- gint flags; /**< Column flags */
+ const gchar* col_name; /**< Column name */
+ const gchar* col_type; /**< Column type */
+ gint size; /**< Column size in bytes, for string columns */
+#define COL_PKEY 0x01 /**< The column is a primary key */
+#define COL_NNUL 0x02 /**< The column may not contain a NULL value */
+#define COL_UNIQUE 0x04 /**< The column must contain unique values */
+#define COL_AUTOINC 0x08 /**< The column is an auto-incrementing int */
+ gint flags; /**< Column flags */
const gchar* gobj_param_name; /**< If non-null, g_object param name */
const gchar* qof_param_name; /**< If non-null, qof parameter name */
- QofAccessFunc getter; /**< General access function */
- QofSetterFunc setter; /**< General setter function */
+ QofAccessFunc getter; /**< General access function */
+ QofSetterFunc setter; /**< General setter function */
};
typedef enum
@@ -359,17 +370,20 @@ typedef enum
OP_DB_DELETE
} E_DB_OPERATION;
-typedef void (*GNC_SQL_LOAD_FN)( const GncSqlBackend* be,
+typedef void (*GNC_SQL_LOAD_FN) (const GncSqlBackend* be,
GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table );
-typedef void (*GNC_SQL_ADD_COL_INFO_TO_LIST_FN)( const GncSqlBackend* be,
- const GncSqlColumnTableEntry* table_row,
- GList** pList );
-typedef void (*GNC_SQL_ADD_COLNAME_TO_LIST_FN)( const GncSqlColumnTableEntry* table_row, GList** pList );
-typedef void (*GNC_SQL_ADD_GVALUE_TO_SLIST_FN)( const GncSqlBackend* be,
- QofIdTypeConst obj_name, const gpointer pObject,
- const GncSqlColumnTableEntry* table_row, GSList** pList );
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table);
+typedef void (*GNC_SQL_ADD_COL_INFO_TO_LIST_FN) (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList);
+typedef void (*GNC_SQL_ADD_COLNAME_TO_LIST_FN) (const GncSqlColumnTableEntry*
+ table_row, GList** pList);
+typedef void (*GNC_SQL_ADD_GVALUE_TO_SLIST_FN) (const GncSqlBackend* be,
+ QofIdTypeConst obj_name,
+ const gpointer pObject,
+ const GncSqlColumnTableEntry* table_row,
+ GSList** pList);
/**
* @struct GncSqlColumnTypeHandler
@@ -400,7 +414,7 @@ typedef struct
/**
* Routine to add a GValue for the property to a GSList.
*/
- GNC_SQL_ADD_GVALUE_TO_SLIST_FN add_gvalue_to_slist_fn;
+ GNC_SQL_ADD_GVALUE_TO_SLIST_FN add_gvalue_to_slist_fn;
} GncSqlColumnTypeHandler;
/**
@@ -410,7 +424,8 @@ typedef struct
* @param table_row DB table column
* @return Access function
*/
-QofAccessFunc gnc_sql_get_getter( QofIdTypeConst obj_name, const GncSqlColumnTableEntry* table_row );
+QofAccessFunc gnc_sql_get_getter (QofIdTypeConst obj_name,
+ const GncSqlColumnTableEntry* table_row);
/**
* Adds a column name to a list. If the column type spans multiple columns,
@@ -419,7 +434,8 @@ QofAccessFunc gnc_sql_get_getter( QofIdTypeConst obj_name, const GncSqlColumnTab
* @param table_row DB table column
* @param pList List
*/
-void gnc_sql_add_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList );
+void gnc_sql_add_colname_to_list (const GncSqlColumnTableEntry* table_row,
+ GList** pList);
/**
* Performs an operation on the database.
@@ -432,12 +448,12 @@ void gnc_sql_add_colname_to_list( const GncSqlColumnTableEntry* table_row, GList
* @param table DB table description
* @return TRUE if successful, FALSE if not
*/
-gboolean gnc_sql_do_db_operation( GncSqlBackend* be,
+gboolean gnc_sql_do_db_operation (GncSqlBackend* be,
E_DB_OPERATION op,
const gchar* table_name,
QofIdTypeConst obj_name,
gpointer pObject,
- const GncSqlColumnTableEntry* table );
+ const GncSqlColumnTableEntry* table);
/**
* Executes an SQL SELECT statement and returns the result rows. If an error
@@ -448,7 +464,8 @@ gboolean gnc_sql_do_db_operation( GncSqlBackend* be,
* @param statement Statement
* @return Results, or NULL if an error has occured
*/
-GncSqlResult* gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStatement* statement );
+GncSqlResult* gnc_sql_execute_select_statement (GncSqlBackend* be,
+ GncSqlStatement* statement);
/**
* Executes an SQL SELECT statement from an SQL char string and returns the
@@ -459,7 +476,7 @@ GncSqlResult* gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStateme
* @param sql SQL SELECT string
* @return Results, or NULL if an error has occured
*/
-GncSqlResult* gnc_sql_execute_select_sql( GncSqlBackend* be, const gchar* sql );
+GncSqlResult* gnc_sql_execute_select_sql (GncSqlBackend* be, const gchar* sql);
/**
* Executes an SQL non-SELECT statement from an SQL char string.
@@ -468,7 +485,7 @@ GncSqlResult* gnc_sql_execute_select_sql( GncSqlBackend* be, const gchar* sql );
* @param sql SQL non-SELECT string
* @returns Number of rows affected, or -1 if an error has occured
*/
-gint gnc_sql_execute_nonselect_sql( GncSqlBackend* be, const gchar* sql );
+gint gnc_sql_execute_nonselect_sql (GncSqlBackend* be, const gchar* sql);
/**
* Creates a statement from an SQL char string.
@@ -477,7 +494,8 @@ gint gnc_sql_execute_nonselect_sql( GncSqlBackend* be, const gchar* sql );
* @param sql SQL char string
* @return Statement
*/
-GncSqlStatement* gnc_sql_create_statement_from_sql( GncSqlBackend* be, const gchar* sql );
+GncSqlStatement* gnc_sql_create_statement_from_sql (GncSqlBackend* be,
+ const gchar* sql);
/**
* Loads a Gnucash object from the database.
@@ -488,9 +506,9 @@ GncSqlStatement* gnc_sql_create_statement_from_sql( GncSqlBackend* be, const gch
* @param pObject Object to be loaded
* @param table DB table description
*/
-void gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
- QofIdTypeConst obj_name, gpointer pObject,
- const GncSqlColumnTableEntry* table );
+void gnc_sql_load_object (const GncSqlBackend* be, GncSqlRow* row,
+ QofIdTypeConst obj_name, gpointer pObject,
+ const GncSqlColumnTableEntry* table);
/**
* Checks whether an object is in the database or not.
@@ -502,10 +520,10 @@ void gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
* @param table DB table description
* @return TRUE if the object is in the database, FALSE otherwise
*/
-gboolean gnc_sql_object_is_it_in_db( GncSqlBackend* be,
+gboolean gnc_sql_object_is_it_in_db (GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, const gpointer pObject,
- const GncSqlColumnTableEntry* table );
+ const GncSqlColumnTableEntry* table);
/**
* Returns the version number for a DB table.
@@ -514,11 +532,12 @@ gboolean gnc_sql_object_is_it_in_db( GncSqlBackend* be,
* @param table_name Table name
* @return Version number, or 0 if the table does not exist
*/
-gint gnc_sql_get_table_version( const GncSqlBackend* be, const gchar* table_name );
+gint gnc_sql_get_table_version (const GncSqlBackend* be,
+ const gchar* table_name);
-gboolean gnc_sql_set_table_version( GncSqlBackend* be,
+gboolean gnc_sql_set_table_version (GncSqlBackend* be,
const gchar* table_name,
- gint version );
+ gint version);
/**
* Creates a table in the database
@@ -529,10 +548,10 @@ gboolean gnc_sql_set_table_version( GncSqlBackend* be,
* @param col_table DB table description
* @return TRUE if successful, FALSE if unsuccessful
*/
-gboolean gnc_sql_create_table( GncSqlBackend* be,
+gboolean gnc_sql_create_table (GncSqlBackend* be,
const gchar* table_name,
gint table_version,
- const GncSqlColumnTableEntry* col_table );
+ const GncSqlColumnTableEntry* col_table);
/**
* Creates a temporary table in the database. A temporary table does not
@@ -543,9 +562,9 @@ gboolean gnc_sql_create_table( GncSqlBackend* be,
* @param col_table DB table description
* @return TRUE if successful, FALSE if unsuccessful
*/
-gboolean gnc_sql_create_temp_table( const GncSqlBackend* be,
+gboolean gnc_sql_create_temp_table (const GncSqlBackend* be,
const gchar* table_name,
- const GncSqlColumnTableEntry* col_table );
+ const GncSqlColumnTableEntry* col_table);
/**
* Creates an index in the database
@@ -556,8 +575,9 @@ gboolean gnc_sql_create_temp_table( const GncSqlBackend* be,
* @param col_table Columns that the index should index
* @return TRUE if successful, FALSE if unsuccessful
*/
-gboolean gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
- const gchar* table_name, const GncSqlColumnTableEntry* col_table );
+gboolean gnc_sql_create_index (const GncSqlBackend* be,
+ const gchar* index_name,
+ const gchar* table_name, const GncSqlColumnTableEntry* col_table);
/**
* Loads the object guid from a database row. The table must have a column
@@ -568,7 +588,7 @@ gboolean gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
* @return GncGUID
*/
-const GncGUID* gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row );
+const GncGUID* gnc_sql_load_guid (const GncSqlBackend* be, GncSqlRow* row);
/**
* Loads the transaction guid from a database row. The table must have a column
@@ -579,7 +599,7 @@ const GncGUID* gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row );
* @return GncGUID
*/
-const GncGUID* gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row );
+const GncGUID* gnc_sql_load_tx_guid (const GncSqlBackend* be, GncSqlRow* row);
/**
* Creates a basic SELECT statement for a table.
@@ -588,8 +608,8 @@ const GncGUID* gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row );
* @param table_name Table name
* @return Statement
*/
-GncSqlStatement* gnc_sql_create_select_statement( GncSqlBackend* be,
- const gchar* table_name );
+GncSqlStatement* gnc_sql_create_select_statement (GncSqlBackend* be,
+ const gchar* table_name);
/**
* Registers a column handler for a new column type.
@@ -597,7 +617,8 @@ GncSqlStatement* gnc_sql_create_select_statement( GncSqlBackend* be,
* @param colType Column type
* @param handler Column handler
*/
-void gnc_sql_register_col_type_handler( const gchar* colType, const GncSqlColumnTypeHandler* handler );
+void gnc_sql_register_col_type_handler (const gchar* colType,
+ const GncSqlColumnTypeHandler* handler);
/**
* Adds a GValue for an object reference GncGUID to the end of a GSList.
@@ -608,9 +629,11 @@ void gnc_sql_register_col_type_handler( const gchar* colType, const GncSqlColumn
* @param table_row DB table column description
* @param pList List
*/
-void gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be,
- QofIdTypeConst obj_name, const gpointer pObject,
- const GncSqlColumnTableEntry* table_row, GSList** pList );
+void gnc_sql_add_gvalue_objectref_guid_to_slist (const GncSqlBackend* be,
+ QofIdTypeConst obj_name,
+ const gpointer pObject,
+ const GncSqlColumnTableEntry* table_row,
+ GSList** pList);
/**
* Adds a column info structure for an object reference GncGUID to the end of a
@@ -620,8 +643,9 @@ void gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be,
* @param table_row DB table column description
* @param pList List
*/
-void gnc_sql_add_objectref_guid_col_info_to_list( const GncSqlBackend* be,
- const GncSqlColumnTableEntry* table_row, GList** pList );
+void gnc_sql_add_objectref_guid_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList);
/**
* Appends the ascii strings for a list of GUIDs to the end of an SQL string.
@@ -631,7 +655,8 @@ void gnc_sql_add_objectref_guid_col_info_to_list( const GncSqlBackend* be,
* @param maxCount Max # of GUIDs to append
* @return Number of GUIDs appended
*/
-guint gnc_sql_append_guid_list_to_sql( GString* str, GList* list, guint maxCount );
+guint gnc_sql_append_guid_list_to_sql (GString* str, GList* list,
+ guint maxCount);
/**
* Appends column names for a subtable to the end of a GList.
@@ -640,9 +665,10 @@ guint gnc_sql_append_guid_list_to_sql( GString* str, GList* list, guint maxCount
* @param subtable Sub-column description table
* @param pList List
*/
-void gnc_sql_add_subtable_colnames_to_list( const GncSqlColumnTableEntry* table_row,
- const GncSqlColumnTableEntry* subtable,
- GList** pList );
+void gnc_sql_add_subtable_colnames_to_list (const GncSqlColumnTableEntry*
+ table_row,
+ const GncSqlColumnTableEntry* subtable,
+ GList** pList);
/**
* Returns a string corresponding to the SQL representation of a GValue. The
@@ -652,25 +678,26 @@ void gnc_sql_add_subtable_colnames_to_list( const GncSqlColumnTableEntry* table_
* @param value Value to be converted
* @return String
*/
-gchar* gnc_sql_get_sql_value( const GncSqlConnection* conn, const GValue* value );
+gchar* gnc_sql_get_sql_value (const GncSqlConnection* conn,
+ const GValue* value);
/**
* Initializes DB table version information.
*
* @param be SQL backend struct
*/
-void gnc_sql_init_version_info( GncSqlBackend* be );
+void gnc_sql_init_version_info (GncSqlBackend* be);
/**
* Finalizes DB table version information.
*
* @param be SQL backend struct
*/
-void gnc_sql_finalize_version_info( GncSqlBackend* be );
+void gnc_sql_finalize_version_info (GncSqlBackend* be);
/**
- * Commits a "standard" item to the database. In most cases, a commit of one object vs
- * another differs only in the table name and column table.
+ * Commits a "standard" item to the database. In most cases, a commit of one
+ * object vs another differs only in the table name and column table.
*
* @param be SQL backend
* @param inst Instance
@@ -679,8 +706,10 @@ void gnc_sql_finalize_version_info( GncSqlBackend* be );
* @param col_table Column table
* @return TRUE if successful, FALSE if not
*/
-gboolean gnc_sql_commit_standard_item( GncSqlBackend* be, QofInstance* inst, const gchar* tableName,
- QofIdTypeConst obj_name, const GncSqlColumnTableEntry* col_table );
+gboolean gnc_sql_commit_standard_item (GncSqlBackend* be, QofInstance* inst,
+ const gchar* tableName,
+ QofIdTypeConst obj_name,
+ const GncSqlColumnTableEntry* col_table);
/**
* Gets an integer value (of any size) from a GValue.
@@ -688,7 +717,7 @@ gboolean gnc_sql_commit_standard_item( GncSqlBackend* be, QofInstance* inst, con
* @param value Source value
* @return Integer value
*/
-gint64 gnc_sql_get_integer_value( const GValue* value );
+gint64 gnc_sql_get_integer_value (const GValue* value);
/**
* Converts a Timespec value to a string value for the database.
@@ -697,20 +726,22 @@ gint64 gnc_sql_get_integer_value( const GValue* value );
* @param ts Timespec to be converted
* @return String representation of the Timespec
*/
-gchar* gnc_sql_convert_timespec_to_string( const GncSqlBackend* be, Timespec ts );
+gchar* gnc_sql_convert_timespec_to_string (const GncSqlBackend* be,
+ Timespec ts);
/**
- * Upgrades a table to a new structure. The upgrade is done by creating a new table with
- * the new structure, SELECTing the old data into the new table, deleting the old table,
- * then renaming the new table. Therefore, this will only work if the new table structure
- * is similar enough to the old table that the SELECT will work.
+ * Upgrades a table to a new structure. The upgrade is done by creating a new
+ * table with the new structure, SELECTing the old data into the new table,
+ * deleting the old table, then renaming the new table. Therefore, this will
+ * only work if the new table structure is similar enough to the old table that
+ * the SELECT will work.
*
* @param be SQL backend
* @param table_name SQL table name
* @param col_table Column table
*/
-void gnc_sql_upgrade_table( GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* col_table );
+void gnc_sql_upgrade_table (GncSqlBackend* be, const gchar* table_name,
+ const GncSqlColumnTableEntry* col_table);
/**
* Adds one or more columns to an existing table.
@@ -720,27 +751,28 @@ void gnc_sql_upgrade_table( GncSqlBackend* be, const gchar* table_name,
* @param new_col_table Column table for new columns
* @return TRUE if successful, FALSE if unsuccessful
*/
-gboolean gnc_sql_add_columns_to_table( GncSqlBackend* be, const gchar* table_name,
- const GncSqlColumnTableEntry* new_col_table );
+gboolean gnc_sql_add_columns_to_table (GncSqlBackend* be,
+ const gchar* table_name,
+ const GncSqlColumnTableEntry* new_col_table);
/**
- * Specifies the load order for a set of objects. When loading from a database, the
- * objects will be loaded in this order, so that when later objects have references to
- * objects, those objects will already have been loaded.
+ * Specifies the load order for a set of objects. When loading from a database,
+ * the objects will be loaded in this order, so that when later objects have
+ * references to objects, those objects will already have been loaded.
*
* @param load_order NULL-terminated array of object type ID strings
*/
-void gnc_sql_set_load_order( const gchar** load_order );
+void gnc_sql_set_load_order (const gchar** load_order);
-void _retrieve_guid_( gpointer pObject, gpointer pValue );
+void _retrieve_guid_ (gpointer pObject, gpointer pValue);
-gpointer gnc_sql_compile_query( QofBackend* pBEnd, QofQuery* pQuery );
-void gnc_sql_free_query( QofBackend* pBEnd, gpointer pQuery );
-void gnc_sql_run_query( QofBackend* pBEnd, gpointer pQuery );
+gpointer gnc_sql_compile_query (QofBackend* pBEnd, QofQuery* pQuery);
+void gnc_sql_free_query (QofBackend* pBEnd, gpointer pQuery);
+void gnc_sql_run_query (QofBackend* pBEnd, gpointer pQuery);
typedef struct
{
- GncSqlBackend* be;
+ GncSqlBackend* be;
gboolean is_ok;
} write_objects_t;
diff --git a/src/backend/sql/gnc-bill-term-sql.cpp b/src/backend/sql/gnc-bill-term-sql.cpp
index 56ffda8..a881eda 100644
--- a/src/backend/sql/gnc-bill-term-sql.cpp
+++ b/src/backend/sql/gnc-bill-term-sql.cpp
@@ -44,7 +44,7 @@ extern "C"
#include "gnc-slots-sql.h"
#include "gnc-bill-term-sql.h"
-#define _GNC_MOD_NAME GNC_ID_BILLTERM
+#define _GNC_MOD_NAME GNC_ID_BILLTERM
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -52,10 +52,10 @@ static QofLogModule log_module = G_LOG_DOMAIN;
#define MAX_DESCRIPTION_LEN 2048
#define MAX_TYPE_LEN 2048
-static void set_invisible( gpointer data, gboolean value );
-static gpointer bt_get_parent( gpointer data );
-static void bt_set_parent( gpointer data, gpointer value );
-static void bt_set_parent_guid( gpointer data, gpointer value );
+static void set_invisible (gpointer data, gboolean value);
+static gpointer bt_get_parent (gpointer data);
+static void bt_set_parent (gpointer data, gpointer value);
+static void bt_set_parent_guid (gpointer data, gpointer value);
#define TABLE_NAME "billterms"
#define TABLE_VERSION 2
@@ -67,7 +67,7 @@ static GncSqlColumnTableEntry col_table[] =
{ "description", CT_STRING, MAX_DESCRIPTION_LEN, COL_NNUL, NULL, GNC_BILLTERM_DESC },
{
"refcount", CT_INT, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)gncBillTermGetRefcount, (QofSetterFunc)gncBillTermSetRefcount
+ (QofAccessFunc)gncBillTermGetRefcount, (QofSetterFunc)gncBillTermSetRefcount
},
{
"invisible", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
@@ -75,7 +75,7 @@ static GncSqlColumnTableEntry col_table[] =
},
{
"parent", CT_GUID, 0, 0, NULL, NULL,
- (QofAccessFunc)bt_get_parent, (QofSetterFunc)bt_set_parent
+ (QofAccessFunc)bt_get_parent, (QofSetterFunc)bt_set_parent
},
{ "type", CT_STRING, MAX_TYPE_LEN, COL_NNUL, NULL, GNC_BILLTERM_TYPE },
{ "duedays", CT_INT, 0, 0, 0, GNC_BILLTERM_DUEDAYS },
@@ -93,163 +93,165 @@ static GncSqlColumnTableEntry billterm_parent_col_table[] =
typedef struct
{
- GncBillTerm* billterm;
+ GncBillTerm* billterm;
GncGUID guid;
gboolean have_guid;
} billterm_parent_guid_struct;
static void
-set_invisible( gpointer data, gboolean value )
+set_invisible (gpointer data, gboolean value)
{
- GncBillTerm* term = GNC_BILLTERM(data);
+ GncBillTerm* term = GNC_BILLTERM (data);
- g_return_if_fail( term != NULL );
+ g_return_if_fail (term != NULL);
- if ( value )
+ if (value)
{
- gncBillTermMakeInvisible( term );
+ gncBillTermMakeInvisible (term);
}
}
static gpointer
-bt_get_parent( gpointer pObject )
+bt_get_parent (gpointer pObject)
{
const GncBillTerm* billterm;
const GncBillTerm* pParent;
const GncGUID* parent_guid;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_BILLTERM(pObject), NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (GNC_IS_BILLTERM (pObject), NULL);
- billterm = GNC_BILLTERM(pObject);
- pParent = gncBillTermGetParent( billterm );
- if ( pParent == NULL )
+ billterm = GNC_BILLTERM (pObject);
+ pParent = gncBillTermGetParent (billterm);
+ if (pParent == NULL)
{
parent_guid = NULL;
}
else
{
- parent_guid = qof_instance_get_guid( QOF_INSTANCE(pParent) );
+ parent_guid = qof_instance_get_guid (QOF_INSTANCE (pParent));
}
return (gpointer)parent_guid;
}
static void
-bt_set_parent( gpointer data, gpointer value )
+bt_set_parent (gpointer data, gpointer value)
{
GncBillTerm* billterm;
GncBillTerm* parent;
QofBook* pBook;
GncGUID* guid = (GncGUID*)value;
- g_return_if_fail( data != NULL );
- g_return_if_fail( GNC_IS_BILLTERM(data) );
+ g_return_if_fail (data != NULL);
+ g_return_if_fail (GNC_IS_BILLTERM (data));
- billterm = GNC_BILLTERM(data);
- pBook = qof_instance_get_book( QOF_INSTANCE(billterm) );
- if ( guid != NULL )
+ billterm = GNC_BILLTERM (data);
+ pBook = qof_instance_get_book (QOF_INSTANCE (billterm));
+ if (guid != NULL)
{
- parent = gncBillTermLookup( pBook, guid );
- if ( parent != NULL )
+ parent = gncBillTermLookup (pBook, guid);
+ if (parent != NULL)
{
- gncBillTermSetParent( billterm, parent );
- gncBillTermSetChild( parent, billterm );
+ gncBillTermSetParent (billterm, parent);
+ gncBillTermSetChild (parent, billterm);
}
}
}
static void
-bt_set_parent_guid( gpointer pObject, gpointer pValue )
+bt_set_parent_guid (gpointer pObject, gpointer pValue)
{
billterm_parent_guid_struct* s = (billterm_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pValue != NULL);
s->guid = *guid;
s->have_guid = TRUE;
}
static GncBillTerm*
-load_single_billterm( GncSqlBackend* be, GncSqlRow* row,
- GList** l_billterms_needing_parents )
+load_single_billterm (GncSqlBackend* be, GncSqlRow* row,
+ GList** l_billterms_needing_parents)
{
const GncGUID* guid;
GncBillTerm* pBillTerm;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- pBillTerm = gncBillTermLookup( be->book, guid );
- if ( pBillTerm == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ pBillTerm = gncBillTermLookup (be->book, guid);
+ if (pBillTerm == NULL)
{
- pBillTerm = gncBillTermCreate( be->book );
+ pBillTerm = gncBillTermCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_BILLTERM, pBillTerm, col_table );
+ gnc_sql_load_object (be, row, GNC_ID_BILLTERM, pBillTerm, col_table);
/* If the billterm doesn't have a parent, it might be because it hasn't been loaded yet.
If so, add this billterm to the list of billterms with no parent, along with the parent
GncGUID so that after they are all loaded, the parents can be fixed up. */
- if ( gncBillTermGetParent( pBillTerm ) == NULL )
+ if (gncBillTermGetParent (pBillTerm) == NULL)
{
- billterm_parent_guid_struct* s = static_cast<decltype(s)>(
- g_malloc(sizeof(billterm_parent_guid_struct)));
- g_assert( s != NULL );
+ billterm_parent_guid_struct* s = static_cast<decltype (s)> (
+ g_malloc (sizeof (billterm_parent_guid_struct)));
+ g_assert (s != NULL);
s->billterm = pBillTerm;
s->have_guid = FALSE;
- gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, s, billterm_parent_col_table );
- if ( s->have_guid )
+ gnc_sql_load_object (be, row, GNC_ID_TAXTABLE, s, billterm_parent_col_table);
+ if (s->have_guid)
{
- *l_billterms_needing_parents = g_list_prepend( *l_billterms_needing_parents, s );
+ *l_billterms_needing_parents = g_list_prepend (*l_billterms_needing_parents,
+ s);
}
else
{
- g_free( s );
+ g_free (s);
}
}
- qof_instance_mark_clean( QOF_INSTANCE(pBillTerm) );
+ qof_instance_mark_clean (QOF_INSTANCE (pBillTerm));
return pBillTerm;
}
static void
-load_all_billterms( GncSqlBackend* be )
+load_all_billterms (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
GList* list = NULL;
GList* l_billterms_needing_parents = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- GncBillTerm* pBillTerm = load_single_billterm( be, row, &l_billterms_needing_parents );
- if ( pBillTerm != NULL )
+ GncBillTerm* pBillTerm = load_single_billterm (be, row,
+ &l_billterms_needing_parents);
+ if (pBillTerm != NULL)
{
- list = g_list_append( list, pBillTerm );
+ list = g_list_append (list, pBillTerm);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
/* While there are items on the list of billterms needing parents,
@@ -257,19 +259,21 @@ load_all_billterms( GncSqlBackend* be )
items are removed from the front and added to the back if the
parent is still not available, then eventually, the list will
shrink to size 0. */
- if ( l_billterms_needing_parents != NULL )
+ if (l_billterms_needing_parents != NULL)
{
gboolean progress_made = TRUE;
GList* elem;
- while ( progress_made )
+ while (progress_made)
{
progress_made = FALSE;
- for ( elem = l_billterms_needing_parents; elem != NULL; elem = g_list_next( elem ) )
+ for (elem = l_billterms_needing_parents; elem != NULL;
+ elem = g_list_next (elem))
{
billterm_parent_guid_struct* s = (billterm_parent_guid_struct*)elem->data;
- bt_set_parent( s->billterm, &s->guid );
- l_billterms_needing_parents = g_list_delete_link( l_billterms_needing_parents, elem );
+ bt_set_parent (s->billterm, &s->guid);
+ l_billterms_needing_parents = g_list_delete_link (l_billterms_needing_parents,
+ elem);
progress_made = TRUE;
}
}
@@ -285,99 +289,102 @@ typedef struct
} write_billterms_t;
static void
-do_save_billterm( QofInstance* inst, gpointer p2 )
+do_save_billterm (QofInstance* inst, gpointer p2)
{
write_billterms_t* data = (write_billterms_t*)p2;
- if ( data->is_ok )
+ if (data->is_ok)
{
- data->is_ok = gnc_sql_save_billterm( data->be, inst );
+ data->is_ok = gnc_sql_save_billterm (data->be, inst);
}
}
static gboolean
-write_billterms( GncSqlBackend* be )
+write_billterms (GncSqlBackend* be)
{
write_billterms_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_BILLTERM, be->book, do_save_billterm, &data );
+ qof_object_foreach (GNC_ID_BILLTERM, be->book, do_save_billterm, &data);
return data.is_ok;
}
/* ================================================================= */
static void
-create_billterm_tables( GncSqlBackend* be )
+create_billterm_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
- else if ( version == 1 )
+ else if (version == 1)
{
/* Upgrade 64 bit int handling */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
+ gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
- PINFO("Billterms table upgraded from version 1 to version %d\n", TABLE_VERSION);
+ PINFO ("Billterms table upgraded from version 1 to version %d\n",
+ TABLE_VERSION);
}
}
/* ================================================================= */
gboolean
-gnc_sql_save_billterm( GncSqlBackend* be, QofInstance* inst )
+gnc_sql_save_billterm (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_BILLTERM(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_BILLTERM (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- return gnc_sql_commit_standard_item( be, inst, TABLE_NAME, GNC_ID_BILLTERM, col_table );
+ return gnc_sql_commit_standard_item (be, inst, TABLE_NAME, GNC_ID_BILLTERM,
+ col_table);
}
/* ================================================================= */
static void
-load_billterm_guid( const GncSqlBackend* be, GncSqlRow* row,
+load_billterm_guid (const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
GncBillTerm* term = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- string_to_guid( g_value_get_string( val ), &guid );
- term = gncBillTermLookup( be->book, &guid );
- if ( term != NULL )
+ string_to_guid (g_value_get_string (val), &guid);
+ term = gncBillTermLookup (be->book, &guid);
+ if (term != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, term, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, term, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- (*setter)( pObject, (const gpointer)term );
+ (*setter) (pObject, (const gpointer)term);
}
}
else
{
- PWARN( "Billterm ref '%s' not found", g_value_get_string( val ) );
+ PWARN ("Billterm ref '%s' not found", g_value_get_string (val));
}
}
}
@@ -390,21 +397,21 @@ static GncSqlColumnTypeHandler billterm_guid_handler
};
/* ================================================================= */
void
-gnc_billterm_sql_initialize( void )
+gnc_billterm_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_BILLTERM,
- gnc_sql_save_billterm, /* commit */
- load_all_billterms, /* initial_load */
- create_billterm_tables, /* create_tables */
+ gnc_sql_save_billterm, /* commit */
+ load_all_billterms, /* initial_load */
+ create_billterm_tables, /* create_tables */
NULL, NULL, NULL,
- write_billterms /* write */
+ write_billterms /* write */
};
- qof_object_register_backend( GNC_ID_BILLTERM, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_BILLTERM, GNC_SQL_BACKEND, &be_data);
- gnc_sql_register_col_type_handler( CT_BILLTERMREF, &billterm_guid_handler );
+ gnc_sql_register_col_type_handler (CT_BILLTERMREF, &billterm_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-bill-term-sql.h b/src/backend/sql/gnc-bill-term-sql.h
index 172b1e1..86722f8 100644
--- a/src/backend/sql/gnc-bill-term-sql.h
+++ b/src/backend/sql/gnc-bill-term-sql.h
@@ -37,7 +37,7 @@ extern "C"
}
#define CT_BILLTERMREF "billterm"
-void gnc_billterm_sql_initialize( void );
-gboolean gnc_sql_save_billterm( GncSqlBackend* be, QofInstance* inst );
+void gnc_billterm_sql_initialize (void);
+gboolean gnc_sql_save_billterm (GncSqlBackend* be, QofInstance* inst);
#endif /* GNC_BILLTERM_SQL_H */
diff --git a/src/backend/sql/gnc-book-sql.cpp b/src/backend/sql/gnc-book-sql.cpp
index 4089afe..9c47987 100644
--- a/src/backend/sql/gnc-book-sql.cpp
+++ b/src/backend/sql/gnc-book-sql.cpp
@@ -51,10 +51,10 @@ extern "C"
G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
-static gpointer get_root_account_guid( gpointer pObject );
-static void set_root_account_guid( gpointer pObject, gpointer pValue );
-static gpointer get_root_template_guid( gpointer pObject );
-static void set_root_template_guid( gpointer pObject, gpointer pValue );
+static gpointer get_root_account_guid (gpointer pObject);
+static void set_root_account_guid (gpointer pObject, gpointer pValue);
+static gpointer get_root_template_guid (gpointer pObject);
+static void set_root_template_guid (gpointer pObject, gpointer pValue);
static const GncSqlColumnTableEntry col_table[] =
{
@@ -72,164 +72,165 @@ static const GncSqlColumnTableEntry col_table[] =
/* ================================================================= */
static gpointer
-get_root_account_guid( gpointer pObject )
+get_root_account_guid (gpointer pObject)
{
- QofBook* book = QOF_BOOK(pObject);
+ QofBook* book = QOF_BOOK (pObject);
const Account* root;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( QOF_IS_BOOK(pObject), NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (QOF_IS_BOOK (pObject), NULL);
- root = gnc_book_get_root_account( book );
- return (gpointer)qof_instance_get_guid( QOF_INSTANCE(root) );
+ root = gnc_book_get_root_account (book);
+ return (gpointer)qof_instance_get_guid (QOF_INSTANCE (root));
}
static void
-set_root_account_guid( gpointer pObject, gpointer pValue )
+set_root_account_guid (gpointer pObject, gpointer pValue)
{
- QofBook* book = QOF_BOOK(pObject);
+ QofBook* book = QOF_BOOK (pObject);
const Account* root;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( QOF_IS_BOOK(pObject) );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (QOF_IS_BOOK (pObject));
+ g_return_if_fail (pValue != NULL);
- root = gnc_book_get_root_account( book );
- qof_instance_set_guid( QOF_INSTANCE(root), guid );
+ root = gnc_book_get_root_account (book);
+ qof_instance_set_guid (QOF_INSTANCE (root), guid);
}
static gpointer
-get_root_template_guid( gpointer pObject )
+get_root_template_guid (gpointer pObject)
{
- const QofBook* book = QOF_BOOK(pObject);
+ const QofBook* book = QOF_BOOK (pObject);
const Account* root;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( QOF_IS_BOOK(pObject), NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (QOF_IS_BOOK (pObject), NULL);
- root = gnc_book_get_template_root( book );
- return (gpointer)qof_instance_get_guid( QOF_INSTANCE(root) );
+ root = gnc_book_get_template_root (book);
+ return (gpointer)qof_instance_get_guid (QOF_INSTANCE (root));
}
static void
-set_root_template_guid( gpointer pObject, gpointer pValue )
+set_root_template_guid (gpointer pObject, gpointer pValue)
{
- QofBook* book = QOF_BOOK(pObject);
+ QofBook* book = QOF_BOOK (pObject);
GncGUID* guid = (GncGUID*)pValue;
Account* root;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( QOF_IS_BOOK(pObject) );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (QOF_IS_BOOK (pObject));
+ g_return_if_fail (pValue != NULL);
- root = gnc_book_get_template_root( book );
- if ( root == NULL )
+ root = gnc_book_get_template_root (book);
+ if (root == NULL)
{
- root = xaccMallocAccount( book );
- xaccAccountBeginEdit( root );
- xaccAccountSetType( root, ACCT_TYPE_ROOT );
- xaccAccountCommitEdit( root );
- gnc_book_set_template_root( book, root );
+ root = xaccMallocAccount (book);
+ xaccAccountBeginEdit (root);
+ xaccAccountSetType (root, ACCT_TYPE_ROOT);
+ xaccAccountCommitEdit (root);
+ gnc_book_set_template_root (book, root);
}
- qof_instance_set_guid( QOF_INSTANCE(root), guid );
+ qof_instance_set_guid (QOF_INSTANCE (root), guid);
}
/* ================================================================= */
static void
-load_single_book( GncSqlBackend* be, GncSqlRow* row )
+load_single_book (GncSqlBackend* be, GncSqlRow* row)
{
QofBook* pBook;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
- gnc_sql_load_guid( be, row );
+ gnc_sql_load_guid (be, row);
pBook = be->book;
- if ( pBook == NULL )
+ if (pBook == NULL)
{
- pBook = qof_book_new();
+ pBook = qof_book_new ();
}
- qof_book_begin_edit( pBook );
- gnc_sql_load_object( be, row, GNC_ID_BOOK, pBook, col_table );
- gnc_sql_slots_load( be, QOF_INSTANCE(pBook) );
- qof_book_commit_edit( pBook );
+ qof_book_begin_edit (pBook);
+ gnc_sql_load_object (be, row, GNC_ID_BOOK, pBook, col_table);
+ gnc_sql_slots_load (be, QOF_INSTANCE (pBook));
+ qof_book_commit_edit (pBook);
- qof_instance_mark_clean( QOF_INSTANCE(pBook) );
+ qof_instance_mark_clean (QOF_INSTANCE (pBook));
}
static void
-load_all_books( GncSqlBackend* be )
+load_all_books (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, BOOK_TABLE );
- if ( stmt != NULL )
+ stmt = gnc_sql_create_select_statement (be, BOOK_TABLE);
+ if (stmt != NULL)
{
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
/* If there are no rows, try committing the book; unset
- * loading so that it will actually get saved.
- */
- if ( row == NULL )
+ * loading so that it will actually get saved.
+ */
+ if (row == NULL)
{
be->loading = FALSE;
- (void)gnc_sql_save_book( be, QOF_INSTANCE(be->book) );
+ (void)gnc_sql_save_book (be, QOF_INSTANCE (be->book));
be->loading = TRUE;
}
else
{
// Otherwise, load the 1st book.
- load_single_book( be, row );
+ load_single_book (be, row);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
}
}
/* ================================================================= */
static void
-create_book_tables( GncSqlBackend* be )
+create_book_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, BOOK_TABLE );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, BOOK_TABLE);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, BOOK_TABLE, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, BOOK_TABLE, TABLE_VERSION, col_table);
}
}
/* ================================================================= */
gboolean
-gnc_sql_save_book( GncSqlBackend* be, QofInstance* inst)
+gnc_sql_save_book (GncSqlBackend* be, QofInstance* inst)
{
gboolean status;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( QOF_IS_BOOK(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (QOF_IS_BOOK (inst), FALSE);
- status = gnc_sql_commit_standard_item( be, inst, BOOK_TABLE, GNC_ID_BOOK, col_table );
+ status = gnc_sql_commit_standard_item (be, inst, BOOK_TABLE, GNC_ID_BOOK,
+ col_table);
return status;
}
/* ================================================================= */
void
-gnc_sql_init_book_handler( void )
+gnc_sql_init_book_handler (void)
{
static GncSqlObjectBackend be_data =
{
@@ -237,13 +238,13 @@ gnc_sql_init_book_handler( void )
GNC_ID_BOOK,
gnc_sql_save_book, /* commit */
load_all_books, /* initial_load */
- create_book_tables, /* create_tables */
+ create_book_tables, /* create_tables */
NULL, /* compile_query */
NULL, /* run_query */
NULL, /* free_query */
NULL /* write */
};
- (void)qof_object_register_backend( GNC_ID_BOOK, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (GNC_ID_BOOK, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-book-sql.h b/src/backend/sql/gnc-book-sql.h
index ad9c4ae..5a5c1f7 100644
--- a/src/backend/sql/gnc-book-sql.h
+++ b/src/backend/sql/gnc-book-sql.h
@@ -34,7 +34,7 @@ extern "C"
{
#include "qof.h"
}
-void gnc_sql_init_book_handler( void );
-gboolean gnc_sql_save_book( GncSqlBackend* be, QofInstance* inst );
+void gnc_sql_init_book_handler (void);
+gboolean gnc_sql_save_book (GncSqlBackend* be, QofInstance* inst);
#endif /* GNC_BOOK_SQL_H */
diff --git a/src/backend/sql/gnc-budget-sql.cpp b/src/backend/sql/gnc-budget-sql.cpp
index b81dcfc..599208d 100644
--- a/src/backend/sql/gnc-budget-sql.cpp
+++ b/src/backend/sql/gnc-budget-sql.cpp
@@ -49,7 +49,7 @@ extern "C"
#define AMOUNTS_TABLE "budget_amounts"
#define AMOUNTS_TABLE_VERSION 1
- static QofLogModule log_module = G_LOG_DOMAIN;
+static QofLogModule log_module = G_LOG_DOMAIN;
#define BUDGET_MAX_NAME_LEN 2048
#define BUDGET_MAX_DESCRIPTION_LEN 2048
@@ -63,14 +63,14 @@ static const GncSqlColumnTableEntry col_table[] =
{ NULL }
};
-static QofInstance* get_budget( gpointer pObj );
-static void set_budget( gpointer pObj, gpointer val );
-static QofInstance* get_account( gpointer pObj );
-static void set_account( gpointer pObj, gpointer val );
-static gint get_period_num( gpointer pObj );
-static void set_period_num( gpointer pObj, gpointer val );
-static gnc_numeric get_amount( gpointer pObj );
-static void set_amount( gpointer pObj, gnc_numeric value );
+static QofInstance* get_budget (gpointer pObj);
+static void set_budget (gpointer pObj, gpointer val);
+static QofInstance* get_account (gpointer pObj);
+static void set_account (gpointer pObj, gpointer val);
+static gint get_period_num (gpointer pObj);
+static void set_period_num (gpointer pObj, gpointer val);
+static gnc_numeric get_amount (gpointer pObj);
+static void set_amount (gpointer pObj, gnc_numeric value);
typedef struct
{
@@ -103,80 +103,82 @@ static const GncSqlColumnTableEntry budget_amounts_col_table[] =
/* ================================================================= */
static QofInstance*
-get_budget( gpointer pObj )
+get_budget (gpointer pObj)
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_val_if_fail( pObj != NULL, NULL );
+ g_return_val_if_fail (pObj != NULL, NULL);
- return QOF_INSTANCE(info->budget);
+ return QOF_INSTANCE (info->budget);
}
static void
-set_budget( gpointer pObj, gpointer val )
+set_budget (gpointer pObj, gpointer val)
{
}
static QofInstance*
-get_account( gpointer pObj )
+get_account (gpointer pObj)
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_val_if_fail( pObj != NULL, NULL );
+ g_return_val_if_fail (pObj != NULL, NULL);
- return QOF_INSTANCE(info->account);
+ return QOF_INSTANCE (info->account);
}
static void
-set_account( gpointer pObj, gpointer val )
+set_account (gpointer pObj, gpointer val)
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_if_fail( pObj != NULL );
- g_return_if_fail( val != NULL );
- g_return_if_fail( GNC_IS_ACCOUNT(val) );
+ g_return_if_fail (pObj != NULL);
+ g_return_if_fail (val != NULL);
+ g_return_if_fail (GNC_IS_ACCOUNT (val));
- info->account = GNC_ACCOUNT(val);
+ info->account = GNC_ACCOUNT (val);
}
static gint
-get_period_num( gpointer pObj )
+get_period_num (gpointer pObj)
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_val_if_fail( pObj != NULL, 0 );
+ g_return_val_if_fail (pObj != NULL, 0);
return info->period_num;
}
static void
-set_period_num( gpointer pObj, gpointer val )
+set_period_num (gpointer pObj, gpointer val)
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_if_fail( pObj != NULL );
+ g_return_if_fail (pObj != NULL);
- info->period_num = GPOINTER_TO_UINT(val);
+ info->period_num = GPOINTER_TO_UINT (val);
}
static gnc_numeric
-get_amount( gpointer pObj )
+get_amount (gpointer pObj)
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_val_if_fail( pObj != NULL, gnc_numeric_zero() );
+ g_return_val_if_fail (pObj != NULL, gnc_numeric_zero ());
- return gnc_budget_get_account_period_value( info->budget, info->account, info->period_num );
+ return gnc_budget_get_account_period_value (info->budget, info->account,
+ info->period_num);
}
static void
-set_amount( gpointer pObj, gnc_numeric value )
+set_amount (gpointer pObj, gnc_numeric value)
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
- g_return_if_fail( pObj != NULL );
+ g_return_if_fail (pObj != NULL);
- gnc_budget_set_account_period_value( info->budget, info->account, info->period_num, value );
+ gnc_budget_set_account_period_value (info->budget, info->account,
+ info->period_num, value);
}
/*----------------------------------------------------------------*/
@@ -187,35 +189,37 @@ set_amount( gpointer pObj, gnc_numeric value )
* @param budget Budget
*/
static void
-load_budget_amounts( GncSqlBackend* be, GncBudget* budget )
+load_budget_amounts (GncSqlBackend* be, GncBudget* budget)
{
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
gchar* sql;
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
- g_return_if_fail( budget != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (budget != NULL);
- (void)guid_to_string_buff( qof_instance_get_guid( QOF_INSTANCE(budget) ), guid_buf );
- sql = g_strdup_printf( "SELECT * FROM %s WHERE budget_guid='%s'", AMOUNTS_TABLE, guid_buf );
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- g_free( sql );
- if ( stmt != NULL )
+ (void)guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (budget)),
+ guid_buf);
+ sql = g_strdup_printf ("SELECT * FROM %s WHERE budget_guid='%s'",
+ AMOUNTS_TABLE, guid_buf);
+ stmt = gnc_sql_create_statement_from_sql (be, sql);
+ g_free (sql);
+ if (stmt != NULL)
{
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
budget_amount_info_t info = { budget, NULL, 0 };
- while ( row != NULL )
+ while (row != NULL)
{
- gnc_sql_load_object( be, row, NULL, &info, budget_amounts_col_table );
- row = gnc_sql_result_get_next_row( result );
+ gnc_sql_load_object (be, row, NULL, &info, budget_amounts_col_table);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
}
}
@@ -227,18 +231,20 @@ load_budget_amounts( GncSqlBackend* be, GncBudget* budget )
* @param budget Budget
*/
static gboolean
-delete_budget_amounts( GncSqlBackend* be, GncBudget* budget )
+delete_budget_amounts (GncSqlBackend* be, GncBudget* budget)
{
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
gchar* sql;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( budget != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (budget != NULL, FALSE);
- (void)guid_to_string_buff( qof_instance_get_guid( QOF_INSTANCE(budget) ), guid_buf );
- sql = g_strdup_printf( "DELETE FROM %s WHERE budget_guid='%s'", AMOUNTS_TABLE, guid_buf );
- (void)gnc_sql_execute_nonselect_sql( be, sql );
- g_free( sql );
+ (void)guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (budget)),
+ guid_buf);
+ sql = g_strdup_printf ("DELETE FROM %s WHERE budget_guid='%s'", AMOUNTS_TABLE,
+ guid_buf);
+ (void)gnc_sql_execute_nonselect_sql (be, sql);
+ g_free (sql);
return TRUE;
}
@@ -250,7 +256,7 @@ delete_budget_amounts( GncSqlBackend* be, GncBudget* budget )
* @param budget Budget
*/
static gboolean
-save_budget_amounts( GncSqlBackend* be, GncBudget* budget )
+save_budget_amounts (GncSqlBackend* be, GncBudget* budget)
{
GList* descendants;
GList* node;
@@ -258,103 +264,104 @@ save_budget_amounts( GncSqlBackend* be, GncBudget* budget )
guint num_periods;
gboolean is_ok = TRUE;;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( budget != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (budget != NULL, FALSE);
// Delete the amounts, then save
- delete_budget_amounts( be, budget );
+ delete_budget_amounts (be, budget);
info.budget = budget;
- num_periods = gnc_budget_get_num_periods( budget );
- descendants = gnc_account_get_descendants( gnc_book_get_root_account( be->book ) );
- for ( node = descendants; node != NULL && is_ok; node = g_list_next(node) )
+ num_periods = gnc_budget_get_num_periods (budget);
+ descendants = gnc_account_get_descendants (gnc_book_get_root_account (
+ be->book));
+ for (node = descendants; node != NULL && is_ok; node = g_list_next (node))
{
guint i;
- info.account = GNC_ACCOUNT(node->data);
- for ( i = 0; i < num_periods && is_ok; i++ )
+ info.account = GNC_ACCOUNT (node->data);
+ for (i = 0; i < num_periods && is_ok; i++)
{
- if ( gnc_budget_is_account_period_value_set( budget, info.account, i ) )
+ if (gnc_budget_is_account_period_value_set (budget, info.account, i))
{
info.period_num = i;
- is_ok = gnc_sql_do_db_operation( be, OP_DB_INSERT, AMOUNTS_TABLE, "", &info,
- budget_amounts_col_table );
+ is_ok = gnc_sql_do_db_operation (be, OP_DB_INSERT, AMOUNTS_TABLE, "", &info,
+ budget_amounts_col_table);
}
}
}
- g_list_free( descendants );
+ g_list_free (descendants);
return is_ok;
}
/*----------------------------------------------------------------*/
static GncBudget*
-load_single_budget( GncSqlBackend* be, GncSqlRow* row )
+load_single_budget (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncBudget* pBudget = NULL;
Recurrence* r;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- if ( guid != NULL )
+ guid = gnc_sql_load_guid (be, row);
+ if (guid != NULL)
{
- pBudget = gnc_budget_lookup( guid, be->book );
+ pBudget = gnc_budget_lookup (guid, be->book);
}
- if ( pBudget == NULL )
+ if (pBudget == NULL)
{
- pBudget = gnc_budget_new( be->book );
+ pBudget = gnc_budget_new (be->book);
}
- gnc_budget_begin_edit( pBudget );
- gnc_sql_load_object( be, row, GNC_ID_BUDGET, pBudget, col_table );
- load_budget_amounts( be, pBudget );
- r = gnc_sql_recurrence_load( be, gnc_budget_get_guid( pBudget ) );
- if ( r != NULL )
+ gnc_budget_begin_edit (pBudget);
+ gnc_sql_load_object (be, row, GNC_ID_BUDGET, pBudget, col_table);
+ load_budget_amounts (be, pBudget);
+ r = gnc_sql_recurrence_load (be, gnc_budget_get_guid (pBudget));
+ if (r != NULL)
{
- gnc_budget_set_recurrence( pBudget, r );
- g_free( r );
+ gnc_budget_set_recurrence (pBudget, r);
+ g_free (r);
}
- gnc_budget_commit_edit( pBudget );
+ gnc_budget_commit_edit (pBudget);
return pBudget;
}
static void
-load_all_budgets( GncSqlBackend* be )
+load_all_budgets (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
GList* list = NULL;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, BUDGET_TABLE );
- if ( stmt != NULL )
+ stmt = gnc_sql_create_select_statement (be, BUDGET_TABLE);
+ if (stmt != NULL)
{
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
GncBudget* b;
- while ( row != NULL )
+ while (row != NULL)
{
- b = load_single_budget( be, row );
- if ( b != NULL )
+ b = load_single_budget (be, row);
+ if (b != NULL)
{
- list = g_list_prepend( list, b );
+ list = g_list_prepend (list, b);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
@@ -362,45 +369,46 @@ load_all_budgets( GncSqlBackend* be )
/* ================================================================= */
static void
-create_budget_tables( GncSqlBackend* be )
+create_budget_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, BUDGET_TABLE );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, BUDGET_TABLE);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, BUDGET_TABLE, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, BUDGET_TABLE, TABLE_VERSION, col_table);
}
- version = gnc_sql_get_table_version( be, AMOUNTS_TABLE );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, AMOUNTS_TABLE);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, AMOUNTS_TABLE, AMOUNTS_TABLE_VERSION, budget_amounts_col_table );
+ (void)gnc_sql_create_table (be, AMOUNTS_TABLE, AMOUNTS_TABLE_VERSION,
+ budget_amounts_col_table);
}
}
/* ================================================================= */
static gboolean
-save_budget( GncSqlBackend* be, QofInstance* inst )
+save_budget (GncSqlBackend* be, QofInstance* inst)
{
- GncBudget* pBudget = GNC_BUDGET(inst);
+ GncBudget* pBudget = GNC_BUDGET (inst);
const GncGUID* guid;
E_DB_OPERATION op;
gboolean is_infant;
gboolean is_ok;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_BUDGET(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_BUDGET (inst), FALSE);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -408,34 +416,36 @@ save_budget( GncSqlBackend* be, QofInstance* inst )
{
op = OP_DB_UPDATE;
}
- is_ok = gnc_sql_do_db_operation( be, op, BUDGET_TABLE, GNC_ID_BUDGET, pBudget, col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, BUDGET_TABLE, GNC_ID_BUDGET, pBudget,
+ col_table);
// Now, commit any slots and recurrence
- if ( is_ok )
+ if (is_ok)
{
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = save_budget_amounts( be, pBudget );
- if ( is_ok )
+ is_ok = save_budget_amounts (be, pBudget);
+ if (is_ok)
{
- is_ok = gnc_sql_recurrence_save( be, guid, gnc_budget_get_recurrence( pBudget ) );
+ is_ok = gnc_sql_recurrence_save (be, guid,
+ gnc_budget_get_recurrence (pBudget));
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
}
else
{
- is_ok = delete_budget_amounts( be, pBudget );
- if ( is_ok )
+ is_ok = delete_budget_amounts (be, pBudget);
+ if (is_ok)
{
- is_ok = gnc_sql_recurrence_delete( be, guid );
+ is_ok = gnc_sql_recurrence_delete (be, guid);
}
- if ( is_ok )
+ if (is_ok)
{
- (void)gnc_sql_slots_delete( be, guid );
+ (void)gnc_sql_slots_delete (be, guid);
}
}
}
@@ -444,68 +454,69 @@ save_budget( GncSqlBackend* be, QofInstance* inst )
}
static void
-do_save_budget( QofInstance* inst, gpointer data )
+do_save_budget (QofInstance* inst, gpointer data)
{
write_objects_t* s = (write_objects_t*)data;
- if ( s->is_ok )
+ if (s->is_ok)
{
- s->is_ok = save_budget( s->be, inst );
+ s->is_ok = save_budget (s->be, inst);
}
}
static gboolean
-write_budgets( GncSqlBackend* be )
+write_budgets (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_collection_foreach( qof_book_get_collection( be->book, GNC_ID_BUDGET ),
- (QofInstanceForeachCB)do_save_budget, &data );
+ qof_collection_foreach (qof_book_get_collection (be->book, GNC_ID_BUDGET),
+ (QofInstanceForeachCB)do_save_budget, &data);
return data.is_ok;
}
/* ================================================================= */
static void
-load_budget_guid( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_budget_guid (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
GncBudget* budget = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- (void)string_to_guid( g_value_get_string( val ), &guid );
- budget = gnc_budget_lookup( &guid, be->book );
- if ( budget != NULL )
+ (void)string_to_guid (g_value_get_string (val), &guid);
+ budget = gnc_budget_lookup (&guid, be->book);
+ if (budget != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, budget, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, budget, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)budget );
+ g_return_if_fail (setter != NULL);
+ (*setter) (pObject, (const gpointer)budget);
}
}
else
{
- PWARN( "Budget ref '%s' not found", g_value_get_string( val ) );
+ PWARN ("Budget ref '%s' not found", g_value_get_string (val));
}
}
}
@@ -518,23 +529,23 @@ static GncSqlColumnTypeHandler budget_guid_handler
};
/* ================================================================= */
void
-gnc_sql_init_budget_handler( void )
+gnc_sql_init_budget_handler (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_BUDGET,
- save_budget, /* commit */
+ save_budget, /* commit */
load_all_budgets, /* initial_load */
- create_budget_tables, /* create_tables */
+ create_budget_tables, /* create_tables */
NULL, /* compile_query */
NULL, /* run_query */
NULL, /* free_query */
- write_budgets /* write */
+ write_budgets /* write */
};
- (void)qof_object_register_backend( GNC_ID_BUDGET, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (GNC_ID_BUDGET, GNC_SQL_BACKEND, &be_data);
- gnc_sql_register_col_type_handler( CT_BUDGETREF, &budget_guid_handler );
+ gnc_sql_register_col_type_handler (CT_BUDGETREF, &budget_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-budget-sql.h b/src/backend/sql/gnc-budget-sql.h
index 3b72929..1856993 100644
--- a/src/backend/sql/gnc-budget-sql.h
+++ b/src/backend/sql/gnc-budget-sql.h
@@ -29,6 +29,6 @@
#ifndef GNC_BUDGET_SQL_H
#define GNC_BUDGET_SQL_H
-void gnc_sql_init_budget_handler( void );
+void gnc_sql_init_budget_handler (void);
#endif /* GNC_BUDGET_SQL_H */
diff --git a/src/backend/sql/gnc-commodity-sql.cpp b/src/backend/sql/gnc-commodity-sql.cpp
index a441082..11a8c61 100644
--- a/src/backend/sql/gnc-commodity-sql.cpp
+++ b/src/backend/sql/gnc-commodity-sql.cpp
@@ -43,10 +43,10 @@ extern "C"
#include "splint-defs.h"
#endif
- static QofLogModule log_module = G_LOG_DOMAIN;
+static QofLogModule log_module = G_LOG_DOMAIN;
-static gpointer get_quote_source_name( gpointer pObject );
-static void set_quote_source_name( gpointer pObject, gpointer pValue );
+static gpointer get_quote_source_name (gpointer pObject);
+static void set_quote_source_name (gpointer pObject, gpointer pValue);
#define COMMODITIES_TABLE "commodities"
#define TABLE_VERSION 1
@@ -82,121 +82,122 @@ static const GncSqlColumnTableEntry col_table[] =
/* ================================================================= */
static gpointer
-get_quote_source_name( gpointer pObject )
+get_quote_source_name (gpointer pObject)
{
const gnc_commodity* pCommodity;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_COMMODITY(pObject), NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (GNC_IS_COMMODITY (pObject), NULL);
- pCommodity = GNC_COMMODITY(pObject);
- return (gpointer)gnc_quote_source_get_internal_name(
- gnc_commodity_get_quote_source(pCommodity));
+ pCommodity = GNC_COMMODITY (pObject);
+ return (gpointer)gnc_quote_source_get_internal_name (
+ gnc_commodity_get_quote_source (pCommodity));
}
static void
-set_quote_source_name( gpointer pObject, gpointer pValue )
+set_quote_source_name (gpointer pObject, gpointer pValue)
{
gnc_commodity* pCommodity;
const gchar* quote_source_name = (const gchar*)pValue;
gnc_quote_source* quote_source;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_COMMODITY(pObject) );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (GNC_IS_COMMODITY (pObject));
- if ( pValue == NULL ) return;
+ if (pValue == NULL) return;
- pCommodity = GNC_COMMODITY(pObject);
- quote_source = gnc_quote_source_lookup_by_internal( quote_source_name );
- gnc_commodity_set_quote_source( pCommodity, quote_source );
+ pCommodity = GNC_COMMODITY (pObject);
+ quote_source = gnc_quote_source_lookup_by_internal (quote_source_name);
+ gnc_commodity_set_quote_source (pCommodity, quote_source);
}
static gnc_commodity*
-load_single_commodity( GncSqlBackend* be, GncSqlRow* row )
+load_single_commodity (GncSqlBackend* be, GncSqlRow* row)
{
QofBook* pBook = be->book;
gnc_commodity* pCommodity;
- pCommodity = gnc_commodity_new( pBook, NULL, NULL, NULL, NULL, 100 );
- gnc_commodity_begin_edit( pCommodity );
- gnc_sql_load_object( be, row, GNC_ID_COMMODITY, pCommodity, col_table );
- gnc_commodity_commit_edit( pCommodity );
+ pCommodity = gnc_commodity_new (pBook, NULL, NULL, NULL, NULL, 100);
+ gnc_commodity_begin_edit (pCommodity);
+ gnc_sql_load_object (be, row, GNC_ID_COMMODITY, pCommodity, col_table);
+ gnc_commodity_commit_edit (pCommodity);
return pCommodity;
}
static void
-load_all_commodities( GncSqlBackend* be )
+load_all_commodities (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
gnc_commodity_table* pTable;
- pTable = gnc_commodity_table_get_table( be->book );
- stmt = gnc_sql_create_select_statement( be, COMMODITIES_TABLE );
- if ( stmt == NULL ) return;
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ pTable = gnc_commodity_table_get_table (be->book);
+ stmt = gnc_sql_create_select_statement (be, COMMODITIES_TABLE);
+ if (stmt == NULL) return;
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
gnc_commodity* pCommodity;
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
gchar* sql;
- while ( row != NULL )
+ while (row != NULL)
{
- pCommodity = load_single_commodity( be, row );
+ pCommodity = load_single_commodity (be, row);
- if ( pCommodity != NULL )
+ if (pCommodity != NULL)
{
GncGUID guid;
- guid = *qof_instance_get_guid( QOF_INSTANCE(pCommodity) );
- pCommodity = gnc_commodity_table_insert( pTable, pCommodity );
- if (qof_instance_is_dirty (QOF_INSTANCE (pCommodity)))
- gnc_sql_push_commodity_for_postload_processing (be, (gpointer)pCommodity);
- qof_instance_set_guid( QOF_INSTANCE(pCommodity), &guid );
+ guid = *qof_instance_get_guid (QOF_INSTANCE (pCommodity));
+ pCommodity = gnc_commodity_table_insert (pTable, pCommodity);
+ if (qof_instance_is_dirty (QOF_INSTANCE (pCommodity)))
+ gnc_sql_push_commodity_for_postload_processing (be, (gpointer)pCommodity);
+ qof_instance_set_guid (QOF_INSTANCE (pCommodity), &guid);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", COMMODITIES_TABLE );
- gnc_sql_slots_load_for_sql_subquery( be, sql,
- (BookLookupFn)gnc_commodity_find_commodity_by_guid );
- g_free( sql );
+ sql = g_strdup_printf ("SELECT DISTINCT guid FROM %s", COMMODITIES_TABLE);
+ gnc_sql_slots_load_for_sql_subquery (be, sql,
+ (BookLookupFn)gnc_commodity_find_commodity_by_guid);
+ g_free (sql);
}
}
/* ================================================================= */
static void
-create_commodities_tables( GncSqlBackend* be )
+create_commodities_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, COMMODITIES_TABLE );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, COMMODITIES_TABLE);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, COMMODITIES_TABLE, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, COMMODITIES_TABLE, TABLE_VERSION, col_table);
}
}
/* ================================================================= */
static gboolean
-do_commit_commodity( GncSqlBackend* be, QofInstance* inst, gboolean force_insert )
+do_commit_commodity (GncSqlBackend* be, QofInstance* inst,
+ gboolean force_insert)
{
const GncGUID* guid;
gboolean is_infant;
E_DB_OPERATION op;
gboolean is_ok;
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant || force_insert )
+ else if (be->is_pristine_db || is_infant || force_insert)
{
op = OP_DB_INSERT;
}
@@ -204,19 +205,20 @@ do_commit_commodity( GncSqlBackend* be, QofInstance* inst, gboolean force_insert
{
op = OP_DB_UPDATE;
}
- is_ok = gnc_sql_do_db_operation( be, op, COMMODITIES_TABLE, GNC_ID_COMMODITY, inst, col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, COMMODITIES_TABLE, GNC_ID_COMMODITY,
+ inst, col_table);
- if ( is_ok )
+ if (is_ok)
{
// Now, commit any slots
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
+ is_ok = gnc_sql_slots_delete (be, guid);
}
}
@@ -224,43 +226,43 @@ do_commit_commodity( GncSqlBackend* be, QofInstance* inst, gboolean force_insert
}
static gboolean
-commit_commodity( GncSqlBackend* be, QofInstance* inst )
+commit_commodity (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_COMMODITY(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_COMMODITY (inst), FALSE);
- return do_commit_commodity( be, inst, FALSE );
+ return do_commit_commodity (be, inst, FALSE);
}
static gboolean
-is_commodity_in_db( GncSqlBackend* be, gnc_commodity* pCommodity )
+is_commodity_in_db (GncSqlBackend* be, gnc_commodity* pCommodity)
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( pCommodity != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (pCommodity != NULL, FALSE);
- return gnc_sql_object_is_it_in_db( be, COMMODITIES_TABLE, GNC_ID_COMMODITY,
- pCommodity, col_table );
+ return gnc_sql_object_is_it_in_db (be, COMMODITIES_TABLE, GNC_ID_COMMODITY,
+ pCommodity, col_table);
}
gboolean
-gnc_sql_save_commodity( GncSqlBackend* be, gnc_commodity* pCommodity )
+gnc_sql_save_commodity (GncSqlBackend* be, gnc_commodity* pCommodity)
{
gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( pCommodity != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (pCommodity != NULL, FALSE);
- if ( !is_commodity_in_db( be, pCommodity ) )
+ if (!is_commodity_in_db (be, pCommodity))
{
- is_ok = do_commit_commodity( be, QOF_INSTANCE(pCommodity), TRUE );
+ is_ok = do_commit_commodity (be, QOF_INSTANCE (pCommodity), TRUE);
}
return is_ok;
}
void
-gnc_sql_commit_commodity (gnc_commodity *pCommodity)
+gnc_sql_commit_commodity (gnc_commodity* pCommodity)
{
g_return_if_fail (pCommodity != NULL);
g_return_if_fail (GNC_IS_COMMODITY (pCommodity));
@@ -271,40 +273,41 @@ gnc_sql_commit_commodity (gnc_commodity *pCommodity)
/* ----------------------------------------------------------------- */
static void
-load_commodity_guid( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_commodity_guid (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
gnc_commodity* commodity = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- (void)string_to_guid( g_value_get_string( val ), &guid );
- commodity = gnc_commodity_find_commodity_by_guid( &guid, be->book );
- if ( commodity != NULL )
+ (void)string_to_guid (g_value_get_string (val), &guid);
+ commodity = gnc_commodity_find_commodity_by_guid (&guid, be->book);
+ if (commodity != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, commodity, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, commodity, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
- else if ( setter != NULL )
+ else if (setter != NULL)
{
- (*setter)( pObject, (const gpointer)commodity );
+ (*setter) (pObject, (const gpointer)commodity);
}
}
else
{
- PWARN( "Commodity ref '%s' not found", g_value_get_string( val ) );
+ PWARN ("Commodity ref '%s' not found", g_value_get_string (val));
}
}
}
@@ -317,7 +320,7 @@ static GncSqlColumnTypeHandler commodity_guid_handler
};
/* ================================================================= */
void
-gnc_sql_init_commodity_handler( void )
+gnc_sql_init_commodity_handler (void)
{
static GncSqlObjectBackend be_data =
{
@@ -332,8 +335,9 @@ gnc_sql_init_commodity_handler( void )
NULL /* write */
};
- (void)qof_object_register_backend( GNC_ID_COMMODITY, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (GNC_ID_COMMODITY, GNC_SQL_BACKEND,
+ &be_data);
- gnc_sql_register_col_type_handler( CT_COMMODITYREF, &commodity_guid_handler );
+ gnc_sql_register_col_type_handler (CT_COMMODITYREF, &commodity_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-commodity-sql.h b/src/backend/sql/gnc-commodity-sql.h
index 2f698cb..79f558c 100644
--- a/src/backend/sql/gnc-commodity-sql.h
+++ b/src/backend/sql/gnc-commodity-sql.h
@@ -34,8 +34,8 @@ extern "C"
{
#include "gnc-commodity.h"
}
-void gnc_sql_init_commodity_handler( void );
-gboolean gnc_sql_save_commodity( GncSqlBackend* be, gnc_commodity* pCommodity );
+void gnc_sql_init_commodity_handler (void);
+gboolean gnc_sql_save_commodity (GncSqlBackend* be, gnc_commodity* pCommodity);
void gnc_sql_commit_commodity (gnc_commodity* pCommodity);
#endif /* GNC_COMMODITY_SQL_H */
diff --git a/src/backend/sql/gnc-customer-sql.cpp b/src/backend/sql/gnc-customer-sql.cpp
index ed62cad..05ff4bf 100644
--- a/src/backend/sql/gnc-customer-sql.cpp
+++ b/src/backend/sql/gnc-customer-sql.cpp
@@ -47,7 +47,7 @@ extern "C"
#include "gnc-bill-term-sql.h"
#include "gnc-tax-table-sql.h"
-#define _GNC_MOD_NAME GNC_ID_CUSTOMER
+#define _GNC_MOD_NAME GNC_ID_CUSTOMER
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -87,95 +87,97 @@ static GncSqlColumnTableEntry col_table[] =
};
static GncCustomer*
-load_single_customer( GncSqlBackend* be, GncSqlRow* row )
+load_single_customer (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncCustomer* pCustomer;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- pCustomer = gncCustomerLookup( be->book, guid );
- if ( pCustomer == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ pCustomer = gncCustomerLookup (be->book, guid);
+ if (pCustomer == NULL)
{
- pCustomer = gncCustomerCreate( be->book );
+ pCustomer = gncCustomerCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_CUSTOMER, pCustomer, col_table );
- qof_instance_mark_clean( QOF_INSTANCE(pCustomer) );
+ gnc_sql_load_object (be, row, GNC_ID_CUSTOMER, pCustomer, col_table);
+ qof_instance_mark_clean (QOF_INSTANCE (pCustomer));
return pCustomer;
}
static void
-load_all_customers( GncSqlBackend* be )
+load_all_customers (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GList* list = NULL;
GncSqlRow* row;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- GncCustomer* pCustomer = load_single_customer( be, row );
- if ( pCustomer != NULL )
+ GncCustomer* pCustomer = load_single_customer (be, row);
+ if (pCustomer != NULL)
{
- list = g_list_append( list, pCustomer );
+ list = g_list_append (list, pCustomer);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
/* ================================================================= */
static void
-create_customer_tables( GncSqlBackend* be )
+create_customer_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
- else if ( version == 1 )
+ else if (version == 1)
{
/* Upgrade 64 bit int handling */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
+ gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
- PINFO("Customers table upgraded from version 1 to version %d\n", TABLE_VERSION);
+ PINFO ("Customers table upgraded from version 1 to version %d\n",
+ TABLE_VERSION);
}
}
/* ================================================================= */
static gboolean
-save_customer( GncSqlBackend* be, QofInstance* inst )
+save_customer (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_CUSTOMER(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_CUSTOMER (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- return gnc_sql_commit_standard_item( be, inst, TABLE_NAME, GNC_ID_CUSTOMER, col_table );
+ return gnc_sql_commit_standard_item (be, inst, TABLE_NAME, GNC_ID_CUSTOMER,
+ col_table);
}
/* ================================================================= */
@@ -186,15 +188,15 @@ typedef struct
} write_customers_t;
static gboolean
-customer_should_be_saved( GncCustomer *customer )
+customer_should_be_saved (GncCustomer* customer)
{
- const char *id;
+ const char* id;
- g_return_val_if_fail( customer != NULL, FALSE );
+ g_return_val_if_fail (customer != NULL, FALSE);
/* Make sure this is a valid customer before we save it -- should have an ID */
- id = gncCustomerGetID( customer );
- if ( id == NULL || *id == '\0' )
+ id = gncCustomerGetID (customer);
+ if (id == NULL || *id == '\0')
{
return FALSE;
}
@@ -203,48 +205,49 @@ customer_should_be_saved( GncCustomer *customer )
}
static void
-write_single_customer( QofInstance *term_p, gpointer data_p )
+write_single_customer (QofInstance* term_p, gpointer data_p)
{
write_customers_t* data = (write_customers_t*)data_p;
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_CUSTOMER(term_p) );
- g_return_if_fail( data_p != NULL );
+ g_return_if_fail (term_p != NULL);
+ g_return_if_fail (GNC_IS_CUSTOMER (term_p));
+ g_return_if_fail (data_p != NULL);
- if ( customer_should_be_saved( GNC_CUSTOMER(term_p) ) && data->is_ok )
+ if (customer_should_be_saved (GNC_CUSTOMER (term_p)) && data->is_ok)
{
- data->is_ok = save_customer( data->be, term_p );
+ data->is_ok = save_customer (data->be, term_p);
}
}
static gboolean
-write_customers( GncSqlBackend* be )
+write_customers (GncSqlBackend* be)
{
write_customers_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_CUSTOMER, be->book, write_single_customer, (gpointer)&data );
+ qof_object_foreach (GNC_ID_CUSTOMER, be->book, write_single_customer,
+ (gpointer)&data);
return data.is_ok;
}
/* ================================================================= */
void
-gnc_customer_sql_initialize( void )
+gnc_customer_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_CUSTOMER,
- save_customer, /* commit */
- load_all_customers, /* initial_load */
- create_customer_tables, /* create_tables */
+ save_customer, /* commit */
+ load_all_customers, /* initial_load */
+ create_customer_tables, /* create_tables */
NULL, NULL, NULL,
- write_customers /* write */
+ write_customers /* write */
};
- qof_object_register_backend( GNC_ID_CUSTOMER, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_CUSTOMER, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-customer-sql.h b/src/backend/sql/gnc-customer-sql.h
index 1a8b679..1e85b86 100644
--- a/src/backend/sql/gnc-customer-sql.h
+++ b/src/backend/sql/gnc-customer-sql.h
@@ -30,6 +30,6 @@
#ifndef GNC_CUSTOMER_SQL_H
#define GNC_CUSTOMER_SQL_H
-void gnc_customer_sql_initialize( void );
+void gnc_customer_sql_initialize (void);
#endif /* GNC_CUSTOMER_SQL_H */
diff --git a/src/backend/sql/gnc-employee-sql.cpp b/src/backend/sql/gnc-employee-sql.cpp
index a4a4e65..ce28239 100644
--- a/src/backend/sql/gnc-employee-sql.cpp
+++ b/src/backend/sql/gnc-employee-sql.cpp
@@ -46,7 +46,7 @@ extern "C"
#include "gnc-address-sql.h"
-#define _GNC_MOD_NAME GNC_ID_EMPLOYEE
+#define _GNC_MOD_NAME GNC_ID_EMPLOYEE
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -75,88 +75,89 @@ static GncSqlColumnTableEntry col_table[] =
};
static GncEmployee*
-load_single_employee( GncSqlBackend* be, GncSqlRow* row )
+load_single_employee (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncEmployee* pEmployee;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- pEmployee = gncEmployeeLookup( be->book, guid );
- if ( pEmployee == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ pEmployee = gncEmployeeLookup (be->book, guid);
+ if (pEmployee == NULL)
{
- pEmployee = gncEmployeeCreate( be->book );
+ pEmployee = gncEmployeeCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_EMPLOYEE, pEmployee, col_table );
- qof_instance_mark_clean( QOF_INSTANCE(pEmployee) );
+ gnc_sql_load_object (be, row, GNC_ID_EMPLOYEE, pEmployee, col_table);
+ qof_instance_mark_clean (QOF_INSTANCE (pEmployee));
return pEmployee;
}
static void
-load_all_employees( GncSqlBackend* be )
+load_all_employees (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
GList* list = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- GncEmployee* pEmployee = load_single_employee( be, row );
- if ( pEmployee != NULL )
+ GncEmployee* pEmployee = load_single_employee (be, row);
+ if (pEmployee != NULL)
{
- list = g_list_append( list, pEmployee );
+ list = g_list_append (list, pEmployee);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
/* ================================================================= */
static void
-create_employee_tables( GncSqlBackend* be )
+create_employee_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
- else if ( version == 1 )
+ else if (version == 1)
{
/* Upgrade 64 bit int handling */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
+ gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
- PINFO("Employees table upgraded from version 1 to version %d\n", TABLE_VERSION);
+ PINFO ("Employees table upgraded from version 1 to version %d\n",
+ TABLE_VERSION);
}
}
/* ================================================================= */
static gboolean
-save_employee( GncSqlBackend* be, QofInstance* inst )
+save_employee (GncSqlBackend* be, QofInstance* inst)
{
GncEmployee* emp;
const GncGUID* guid;
@@ -164,18 +165,18 @@ save_employee( GncSqlBackend* be, QofInstance* inst )
gboolean is_infant;
gboolean is_ok = TRUE;
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_EMPLOYEE(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_EMPLOYEE (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- emp = GNC_EMPLOYEE(inst);
+ emp = GNC_EMPLOYEE (inst);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -183,28 +184,29 @@ save_employee( GncSqlBackend* be, QofInstance* inst )
{
op = OP_DB_UPDATE;
}
- if ( op != OP_DB_DELETE )
+ if (op != OP_DB_DELETE)
{
// Ensure the commodity is in the db
- is_ok = gnc_sql_save_commodity( be, gncEmployeeGetCurrency( emp ) );
+ is_ok = gnc_sql_save_commodity (be, gncEmployeeGetCurrency (emp));
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_EMPLOYEE, emp, col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, TABLE_NAME, GNC_ID_EMPLOYEE, emp,
+ col_table);
}
- if ( is_ok )
+ if (is_ok)
{
// Now, commit or delete any slots
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
+ is_ok = gnc_sql_slots_delete (be, guid);
}
}
@@ -213,15 +215,15 @@ save_employee( GncSqlBackend* be, QofInstance* inst )
/* ================================================================= */
static gboolean
-employee_should_be_saved( GncEmployee *employee )
+employee_should_be_saved (GncEmployee* employee)
{
- const char *id;
+ const char* id;
- g_return_val_if_fail( employee != NULL, FALSE );
+ g_return_val_if_fail (employee != NULL, FALSE);
/* make sure this is a valid employee before we save it -- should have an ID */
- id = gncEmployeeGetID( employee );
- if ( id == NULL || *id == '\0' )
+ id = gncEmployeeGetID (employee);
+ if (id == NULL || *id == '\0')
{
return FALSE;
}
@@ -230,49 +232,49 @@ employee_should_be_saved( GncEmployee *employee )
}
static void
-write_single_employee( QofInstance *term_p, gpointer data_p )
+write_single_employee (QofInstance* term_p, gpointer data_p)
{
write_objects_t* s = (write_objects_t*)data_p;
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_EMPLOYEE(term_p) );
- g_return_if_fail( data_p != NULL );
+ g_return_if_fail (term_p != NULL);
+ g_return_if_fail (GNC_IS_EMPLOYEE (term_p));
+ g_return_if_fail (data_p != NULL);
- if ( s->is_ok && employee_should_be_saved( GNC_EMPLOYEE(term_p) ) )
+ if (s->is_ok && employee_should_be_saved (GNC_EMPLOYEE (term_p)))
{
- s->is_ok = save_employee( s->be, term_p );
+ s->is_ok = save_employee (s->be, term_p);
}
}
static gboolean
-write_employees( GncSqlBackend* be )
+write_employees (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_EMPLOYEE, be->book, write_single_employee, &data );
+ qof_object_foreach (GNC_ID_EMPLOYEE, be->book, write_single_employee, &data);
return data.is_ok;
}
/* ================================================================= */
void
-gnc_employee_sql_initialize( void )
+gnc_employee_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_EMPLOYEE,
- save_employee, /* commit */
- load_all_employees, /* initial_load */
- create_employee_tables, /* create_tables */
+ save_employee, /* commit */
+ load_all_employees, /* initial_load */
+ create_employee_tables, /* create_tables */
NULL, NULL, NULL,
- write_employees /* write */
+ write_employees /* write */
};
- qof_object_register_backend( GNC_ID_EMPLOYEE, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_EMPLOYEE, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-employee-sql.h b/src/backend/sql/gnc-employee-sql.h
index ca0c99a..6f8777c 100644
--- a/src/backend/sql/gnc-employee-sql.h
+++ b/src/backend/sql/gnc-employee-sql.h
@@ -30,6 +30,6 @@
#ifndef GNC_EMPLOYEE_SQL_H
#define GNC_EMPLOYEE_SQL_H
-void gnc_employee_sql_initialize( void );
+void gnc_employee_sql_initialize (void);
#endif /* GNC_EMPLOYEE_SQL_H */
diff --git a/src/backend/sql/gnc-entry-sql.cpp b/src/backend/sql/gnc-entry-sql.cpp
index 4b8d9e4..88a43d8 100644
--- a/src/backend/sql/gnc-entry-sql.cpp
+++ b/src/backend/sql/gnc-entry-sql.cpp
@@ -49,7 +49,7 @@ extern "C"
#include "gnc-owner-sql.h"
#include "gnc-tax-table-sql.h"
-#define _GNC_MOD_NAME GNC_ID_ENTRY
+#define _GNC_MOD_NAME GNC_ID_ENTRY
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -61,8 +61,8 @@ static QofLogModule log_module = G_LOG_DOMAIN;
#define MAX_DISCTYPE_LEN 2048
#define MAX_DISCHOW_LEN 2048
-static void entry_set_invoice( gpointer pObject, gpointer val );
-static void entry_set_bill( gpointer pObject, gpointer val );
+static void entry_set_invoice (gpointer pObject, gpointer val);
+static void entry_set_bill (gpointer pObject, gpointer val);
static GncSqlColumnTableEntry col_table[] =
{
@@ -83,215 +83,218 @@ static GncSqlColumnTableEntry col_table[] =
"invoice", CT_INVOICEREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncEntryGetInvoice, (QofSetterFunc)entry_set_invoice
},
- { "i_disc_type", CT_STRING, MAX_DISCTYPE_LEN, 0, NULL, ENTRY_INV_DISC_TYPE },
- { "i_disc_how", CT_STRING, MAX_DISCHOW_LEN, 0, NULL, ENTRY_INV_DISC_HOW },
- { "i_taxable", CT_BOOLEAN, 0, 0, NULL, ENTRY_INV_TAXABLE },
- { "i_taxincluded", CT_BOOLEAN, 0, 0, NULL, ENTRY_INV_TAX_INC },
+ { "i_disc_type", CT_STRING, MAX_DISCTYPE_LEN, 0, NULL, ENTRY_INV_DISC_TYPE },
+ { "i_disc_how", CT_STRING, MAX_DISCHOW_LEN, 0, NULL, ENTRY_INV_DISC_HOW },
+ { "i_taxable", CT_BOOLEAN, 0, 0, NULL, ENTRY_INV_TAXABLE },
+ { "i_taxincluded", CT_BOOLEAN, 0, 0, NULL, ENTRY_INV_TAX_INC },
{
- "i_taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL,
+ "i_taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncEntryGetInvTaxTable, (QofSetterFunc)gncEntrySetInvTaxTable
},
- { "b_acct", CT_ACCOUNTREF, 0, 0, NULL, ENTRY_BACCT },
- { "b_price", CT_NUMERIC, 0, 0, NULL, ENTRY_BPRICE },
+ { "b_acct", CT_ACCOUNTREF, 0, 0, NULL, ENTRY_BACCT },
+ { "b_price", CT_NUMERIC, 0, 0, NULL, ENTRY_BPRICE },
{
- "bill", CT_INVOICEREF, 0, 0, NULL, NULL,
+ "bill", CT_INVOICEREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncEntryGetBill, (QofSetterFunc)entry_set_bill
},
- { "b_taxable", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILL_TAXABLE },
- { "b_taxincluded", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILL_TAX_INC },
+ { "b_taxable", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILL_TAXABLE },
+ { "b_taxincluded", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILL_TAX_INC },
{
- "b_taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL,
+ "b_taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncEntryGetBillTaxTable, (QofSetterFunc)gncEntrySetBillTaxTable
},
{
- "b_paytype", CT_INT, 0, 0, NULL, NULL,
+ "b_paytype", CT_INT, 0, 0, NULL, NULL,
(QofAccessFunc)gncEntryGetBillPayment, (QofSetterFunc)gncEntrySetBillPayment
},
- { "billable", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILLABLE },
- { "billto", CT_OWNERREF, 0, 0, NULL, ENTRY_BILLTO },
+ { "billable", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILLABLE },
+ { "billto", CT_OWNERREF, 0, 0, NULL, ENTRY_BILLTO },
{
- "order_guid", CT_ORDERREF, 0, 0, NULL, NULL,
+ "order_guid", CT_ORDERREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncEntryGetOrder, (QofSetterFunc)gncEntrySetOrder
},
{ NULL }
};
static void
-entry_set_invoice( gpointer pObject, gpointer val )
+entry_set_invoice (gpointer pObject, gpointer val)
{
GncEntry* entry;
GncInvoice* invoice;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_ENTRY(pObject) );
- g_return_if_fail( val != NULL );
- g_return_if_fail( GNC_IS_INVOICE(val) );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (GNC_IS_ENTRY (pObject));
+ g_return_if_fail (val != NULL);
+ g_return_if_fail (GNC_IS_INVOICE (val));
- entry = GNC_ENTRY(pObject);
- invoice = GNC_INVOICE(val);
+ entry = GNC_ENTRY (pObject);
+ invoice = GNC_INVOICE (val);
- gncInvoiceAddEntry( invoice, entry );
+ gncInvoiceAddEntry (invoice, entry);
}
static void
-entry_set_bill( gpointer pObject, gpointer val )
+entry_set_bill (gpointer pObject, gpointer val)
{
GncEntry* entry;
GncInvoice* bill;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_ENTRY(pObject) );
- g_return_if_fail( val != NULL );
- g_return_if_fail( GNC_IS_INVOICE(val) );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (GNC_IS_ENTRY (pObject));
+ g_return_if_fail (val != NULL);
+ g_return_if_fail (GNC_IS_INVOICE (val));
- entry = GNC_ENTRY(pObject);
- bill = GNC_INVOICE(val);
+ entry = GNC_ENTRY (pObject);
+ bill = GNC_INVOICE (val);
- gncBillAddEntry( bill, entry );
+ gncBillAddEntry (bill, entry);
}
static GncEntry*
-load_single_entry( GncSqlBackend* be, GncSqlRow* row )
+load_single_entry (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncEntry* pEntry;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- pEntry = gncEntryLookup( be->book, guid );
- if ( pEntry == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ pEntry = gncEntryLookup (be->book, guid);
+ if (pEntry == NULL)
{
- pEntry = gncEntryCreate( be->book );
+ pEntry = gncEntryCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_ENTRY, pEntry, col_table );
- qof_instance_mark_clean( QOF_INSTANCE(pEntry) );
+ gnc_sql_load_object (be, row, GNC_ID_ENTRY, pEntry, col_table);
+ qof_instance_mark_clean (QOF_INSTANCE (pEntry));
return pEntry;
}
static void
-load_all_entries( GncSqlBackend* be )
+load_all_entries (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
GList* list = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- GncEntry* pEntry = load_single_entry( be, row );
- if ( pEntry != NULL )
+ GncEntry* pEntry = load_single_entry (be, row);
+ if (pEntry != NULL)
{
- list = g_list_append( list, pEntry );
+ list = g_list_append (list, pEntry);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
/* ================================================================= */
static void
-create_entry_tables( GncSqlBackend* be )
+create_entry_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
- else if ( version < TABLE_VERSION )
+ else if (version < TABLE_VERSION)
{
/* Upgrade:
1->2: 64 bit int handling
- 2->3: "entered" -> "date_entered", and it can be NULL
+ 2->3: "entered" -> "date_entered", and it can be NULL
*/
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
+ gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
- PINFO("Entries table upgraded from version %d to version %d\n", version, TABLE_VERSION);
+ PINFO ("Entries table upgraded from version %d to version %d\n", version,
+ TABLE_VERSION);
}
}
/* ================================================================= */
static gboolean
-save_entry( GncSqlBackend* be, QofInstance* inst )
+save_entry (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_ENTRY(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_ENTRY (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- return gnc_sql_commit_standard_item( be, inst, TABLE_NAME, GNC_ID_ENTRY, col_table );
+ return gnc_sql_commit_standard_item (be, inst, TABLE_NAME, GNC_ID_ENTRY,
+ col_table);
}
/* ================================================================= */
static void
-write_single_entry( QofInstance *term_p, gpointer data_p )
+write_single_entry (QofInstance* term_p, gpointer data_p)
{
write_objects_t* s = (write_objects_t*)data_p;
- GncEntry* entry = GNC_ENTRY(term_p);
+ GncEntry* entry = GNC_ENTRY (term_p);
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_ENTRY(term_p) );
- g_return_if_fail( data_p != NULL );
+ g_return_if_fail (term_p != NULL);
+ g_return_if_fail (GNC_IS_ENTRY (term_p));
+ g_return_if_fail (data_p != NULL);
/* Only save if attached */
- if ( s->is_ok && (gncEntryGetOrder( entry ) != NULL || gncEntryGetInvoice( entry ) != NULL ||
- gncEntryGetBill( entry ) != NULL) )
+ if (s->is_ok && (gncEntryGetOrder (entry) != NULL ||
+ gncEntryGetInvoice (entry) != NULL ||
+ gncEntryGetBill (entry) != NULL))
{
- s->is_ok = save_entry( s->be, term_p );
+ s->is_ok = save_entry (s->be, term_p);
}
}
static gboolean
-write_entries( GncSqlBackend* be )
+write_entries (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_ENTRY, be->book, write_single_entry, &data );
+ qof_object_foreach (GNC_ID_ENTRY, be->book, write_single_entry, &data);
return data.is_ok;
}
/* ================================================================= */
void
-gnc_entry_sql_initialize( void )
+gnc_entry_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_ENTRY,
- save_entry, /* commit */
- load_all_entries, /* initial_load */
- create_entry_tables, /* create_tables */
+ save_entry, /* commit */
+ load_all_entries, /* initial_load */
+ create_entry_tables, /* create_tables */
NULL, NULL, NULL,
- write_entries /* write */
+ write_entries /* write */
};
- qof_object_register_backend( GNC_ID_ENTRY, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_ENTRY, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-entry-sql.h b/src/backend/sql/gnc-entry-sql.h
index bd111d1..d1feb6f 100644
--- a/src/backend/sql/gnc-entry-sql.h
+++ b/src/backend/sql/gnc-entry-sql.h
@@ -30,6 +30,6 @@
#ifndef GNC_ENTRY_SQL_H
#define GNC_ENTRY_SQL_H
-void gnc_entry_sql_initialize( void );
+void gnc_entry_sql_initialize (void);
#endif /* GNC_ENTRY_SQL_H */
diff --git a/src/backend/sql/gnc-invoice-sql.cpp b/src/backend/sql/gnc-invoice-sql.cpp
index aa606b0..cef0763 100644
--- a/src/backend/sql/gnc-invoice-sql.cpp
+++ b/src/backend/sql/gnc-invoice-sql.cpp
@@ -47,7 +47,7 @@ extern "C"
#include "gnc-owner-sql.h"
#include "gnc-bill-term-sql.h"
-#define _GNC_MOD_NAME GNC_ID_INVOICE
+#define _GNC_MOD_NAME GNC_ID_INVOICE
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -94,91 +94,92 @@ static GncSqlColumnTableEntry col_table[] =
};
static GncInvoice*
-load_single_invoice( GncSqlBackend* be, GncSqlRow* row )
+load_single_invoice (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncInvoice* pInvoice;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- pInvoice = gncInvoiceLookup( be->book, guid );
- if ( pInvoice == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ pInvoice = gncInvoiceLookup (be->book, guid);
+ if (pInvoice == NULL)
{
- pInvoice = gncInvoiceCreate( be->book );
+ pInvoice = gncInvoiceCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_INVOICE, pInvoice, col_table );
- qof_instance_mark_clean( QOF_INSTANCE(pInvoice) );
+ gnc_sql_load_object (be, row, GNC_ID_INVOICE, pInvoice, col_table);
+ qof_instance_mark_clean (QOF_INSTANCE (pInvoice));
return pInvoice;
}
static void
-load_all_invoices( GncSqlBackend* be )
+load_all_invoices (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
GList* list = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- GncInvoice* pInvoice = load_single_invoice( be, row );
- if ( pInvoice != NULL )
+ GncInvoice* pInvoice = load_single_invoice (be, row);
+ if (pInvoice != NULL)
{
- list = g_list_append( list, pInvoice );
+ list = g_list_append (list, pInvoice);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
/* ================================================================= */
static void
-create_invoice_tables( GncSqlBackend* be )
+create_invoice_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
- else if ( version < TABLE_VERSION )
+ else if (version < TABLE_VERSION)
{
/* Upgrade:
1->2: 64 bit int handling
- 2->3: invoice open date can be NULL
+ 2->3: invoice open date can be NULL
*/
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
+ gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
- PINFO("Invoices table upgraded from version %d to version %d\n", version, TABLE_VERSION);
+ PINFO ("Invoices table upgraded from version %d to version %d\n", version,
+ TABLE_VERSION);
}
}
/* ================================================================= */
static gboolean
-save_invoice( GncSqlBackend* be, QofInstance* inst )
+save_invoice (GncSqlBackend* be, QofInstance* inst)
{
const GncGUID* guid;
GncInvoice* invoice;
@@ -186,18 +187,18 @@ save_invoice( GncSqlBackend* be, QofInstance* inst )
gboolean is_infant;
gboolean is_ok = TRUE;
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_INVOICE(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_INVOICE (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- invoice = GNC_INVOICE(inst);
+ invoice = GNC_INVOICE (inst);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -205,28 +206,29 @@ save_invoice( GncSqlBackend* be, QofInstance* inst )
{
op = OP_DB_UPDATE;
}
- if ( op != OP_DB_DELETE )
+ if (op != OP_DB_DELETE)
{
// Ensure the commodity is in the db
- is_ok = gnc_sql_save_commodity( be, gncInvoiceGetCurrency( invoice ) );
+ is_ok = gnc_sql_save_commodity (be, gncInvoiceGetCurrency (invoice));
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_INVOICE, inst, col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, TABLE_NAME, GNC_ID_INVOICE, inst,
+ col_table);
}
- if ( is_ok )
+ if (is_ok)
{
// Now, commit or delete any slots
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
+ is_ok = gnc_sql_slots_delete (be, guid);
}
}
@@ -235,15 +237,15 @@ save_invoice( GncSqlBackend* be, QofInstance* inst )
/* ================================================================= */
static gboolean
-invoice_should_be_saved( GncInvoice *invoice )
+invoice_should_be_saved (GncInvoice* invoice)
{
- const char *id;
+ const char* id;
- g_return_val_if_fail( invoice != NULL, FALSE );
+ g_return_val_if_fail (invoice != NULL, FALSE);
/* make sure this is a valid invoice before we save it -- should have an ID */
- id = gncInvoiceGetID( invoice );
- if ( id == NULL || *id == '\0' )
+ id = gncInvoiceGetID (invoice);
+ if (id == NULL || *id == '\0')
{
return FALSE;
}
@@ -252,70 +254,71 @@ invoice_should_be_saved( GncInvoice *invoice )
}
static void
-write_single_invoice( QofInstance *term_p, gpointer data_p )
+write_single_invoice (QofInstance* term_p, gpointer data_p)
{
write_objects_t* s = (write_objects_t*)data_p;
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_INVOICE(term_p) );
- g_return_if_fail( data_p != NULL );
+ g_return_if_fail (term_p != NULL);
+ g_return_if_fail (GNC_IS_INVOICE (term_p));
+ g_return_if_fail (data_p != NULL);
- if ( s->is_ok && invoice_should_be_saved( GNC_INVOICE(term_p) ) )
+ if (s->is_ok && invoice_should_be_saved (GNC_INVOICE (term_p)))
{
- s->is_ok = save_invoice( s->be, term_p );
+ s->is_ok = save_invoice (s->be, term_p);
}
}
static gboolean
-write_invoices( GncSqlBackend* be )
+write_invoices (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_INVOICE, be->book, write_single_invoice, &data );
+ qof_object_foreach (GNC_ID_INVOICE, be->book, write_single_invoice, &data);
return data.is_ok;
}
/* ================================================================= */
static void
-load_invoice_guid( const GncSqlBackend* be, GncSqlRow* row,
+load_invoice_guid (const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
GncInvoice* invoice = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- string_to_guid( g_value_get_string( val ), &guid );
- invoice = gncInvoiceLookup( be->book, &guid );
- if ( invoice != NULL )
+ string_to_guid (g_value_get_string (val), &guid);
+ invoice = gncInvoiceLookup (be->book, &guid);
+ if (invoice != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, invoice, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, invoice, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- (*setter)( pObject, (const gpointer)invoice );
+ (*setter) (pObject, (const gpointer)invoice);
}
}
else
{
- PWARN( "Invoice ref '%s' not found", g_value_get_string( val ) );
+ PWARN ("Invoice ref '%s' not found", g_value_get_string (val));
}
}
}
@@ -328,21 +331,21 @@ static GncSqlColumnTypeHandler invoice_guid_handler
};
/* ================================================================= */
void
-gnc_invoice_sql_initialize( void )
+gnc_invoice_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_INVOICE,
- save_invoice, /* commit */
- load_all_invoices, /* initial_load */
- create_invoice_tables, /* create_tables */
+ save_invoice, /* commit */
+ load_all_invoices, /* initial_load */
+ create_invoice_tables, /* create_tables */
NULL, NULL, NULL,
- write_invoices /* write */
+ write_invoices /* write */
};
- qof_object_register_backend( GNC_ID_INVOICE, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_INVOICE, GNC_SQL_BACKEND, &be_data);
- gnc_sql_register_col_type_handler( CT_INVOICEREF, &invoice_guid_handler );
+ gnc_sql_register_col_type_handler (CT_INVOICEREF, &invoice_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-invoice-sql.h b/src/backend/sql/gnc-invoice-sql.h
index 4d047af..1329bdf 100644
--- a/src/backend/sql/gnc-invoice-sql.h
+++ b/src/backend/sql/gnc-invoice-sql.h
@@ -32,6 +32,6 @@
#define CT_INVOICEREF "invoice"
-void gnc_invoice_sql_initialize( void );
+void gnc_invoice_sql_initialize (void);
#endif /* GNC_INVOICE_SQL_H */
diff --git a/src/backend/sql/gnc-job-sql.cpp b/src/backend/sql/gnc-job-sql.cpp
index 8470416..1a42eb5 100644
--- a/src/backend/sql/gnc-job-sql.cpp
+++ b/src/backend/sql/gnc-job-sql.cpp
@@ -43,7 +43,7 @@ extern "C"
#include "gnc-job-sql.h"
#include "gnc-owner-sql.h"
-#define _GNC_MOD_NAME GNC_ID_JOB
+#define _GNC_MOD_NAME GNC_ID_JOB
G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
@@ -72,99 +72,100 @@ static GncSqlColumnTableEntry col_table[] =
};
static GncJob*
-load_single_job( GncSqlBackend* be, GncSqlRow* row )
+load_single_job (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncJob* pJob;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- pJob = gncJobLookup( be->book, guid );
- if ( pJob == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ pJob = gncJobLookup (be->book, guid);
+ if (pJob == NULL)
{
- pJob = gncJobCreate( be->book );
+ pJob = gncJobCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_JOB, pJob, col_table );
- qof_instance_mark_clean( QOF_INSTANCE(pJob) );
+ gnc_sql_load_object (be, row, GNC_ID_JOB, pJob, col_table);
+ qof_instance_mark_clean (QOF_INSTANCE (pJob));
return pJob;
}
static void
-load_all_jobs( GncSqlBackend* be )
+load_all_jobs (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
GList* list = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- GncJob* pJob = load_single_job( be, row );
- if ( pJob != NULL )
+ GncJob* pJob = load_single_job (be, row);
+ if (pJob != NULL)
{
- list = g_list_append( list, pJob );
+ list = g_list_append (list, pJob);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
/* ================================================================= */
static void
-create_job_tables( GncSqlBackend* be )
+create_job_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
}
/* ================================================================= */
static gboolean
-save_job( GncSqlBackend* be, QofInstance* inst )
+save_job (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_JOB(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_JOB (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- return gnc_sql_commit_standard_item( be, inst, TABLE_NAME, GNC_ID_JOB, col_table );
+ return gnc_sql_commit_standard_item (be, inst, TABLE_NAME, GNC_ID_JOB,
+ col_table);
}
/* ================================================================= */
static gboolean
-job_should_be_saved( GncJob *job )
+job_should_be_saved (GncJob* job)
{
- const char *id;
+ const char* id;
- g_return_val_if_fail( job != NULL, FALSE );
+ g_return_val_if_fail (job != NULL, FALSE);
/* make sure this is a valid job before we save it -- should have an ID */
- id = gncJobGetID( job );
- if ( id == NULL || *id == '\0' )
+ id = gncJobGetID (job);
+ if (id == NULL || *id == '\0')
{
return FALSE;
}
@@ -173,49 +174,49 @@ job_should_be_saved( GncJob *job )
}
static void
-write_single_job( QofInstance *term_p, gpointer data_p )
+write_single_job (QofInstance* term_p, gpointer data_p)
{
write_objects_t* s = (write_objects_t*)data_p;
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_JOB(term_p) );
- g_return_if_fail( data_p != NULL );
+ g_return_if_fail (term_p != NULL);
+ g_return_if_fail (GNC_IS_JOB (term_p));
+ g_return_if_fail (data_p != NULL);
- if ( s->is_ok && job_should_be_saved( GNC_JOB(term_p) ) )
+ if (s->is_ok && job_should_be_saved (GNC_JOB (term_p)))
{
- s->is_ok = save_job( s->be, term_p );
+ s->is_ok = save_job (s->be, term_p);
}
}
static gboolean
-write_jobs( GncSqlBackend* be )
+write_jobs (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_JOB, be->book, write_single_job, &data );
+ qof_object_foreach (GNC_ID_JOB, be->book, write_single_job, &data);
return data.is_ok;
}
/* ================================================================= */
void
-gnc_job_sql_initialize( void )
+gnc_job_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_JOB,
- save_job, /* commit */
- load_all_jobs, /* initial_load */
- create_job_tables, /* create_tables */
+ save_job, /* commit */
+ load_all_jobs, /* initial_load */
+ create_job_tables, /* create_tables */
NULL, NULL, NULL,
- write_jobs /* write */
+ write_jobs /* write */
};
- qof_object_register_backend( GNC_ID_JOB, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_JOB, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-job-sql.h b/src/backend/sql/gnc-job-sql.h
index 68e8e6d..22edf20 100644
--- a/src/backend/sql/gnc-job-sql.h
+++ b/src/backend/sql/gnc-job-sql.h
@@ -30,6 +30,6 @@
#ifndef GNC_JOB_SQL_H
#define GNC_JOB_SQL_H
-void gnc_job_sql_initialize( void );
+void gnc_job_sql_initialize (void);
#endif /* GNC_JOB_SQL_H */
diff --git a/src/backend/sql/gnc-lots-sql.cpp b/src/backend/sql/gnc-lots-sql.cpp
index 2a84edc..1a271f4 100644
--- a/src/backend/sql/gnc-lots-sql.cpp
+++ b/src/backend/sql/gnc-lots-sql.cpp
@@ -45,13 +45,13 @@ extern "C"
#include "gnc-lots-sql.h"
- static QofLogModule log_module = G_LOG_DOMAIN;
+static QofLogModule log_module = G_LOG_DOMAIN;
#define TABLE_NAME "lots"
#define TABLE_VERSION 2
-static gpointer get_lot_account( gpointer pObject );
-static void set_lot_account( gpointer pObject, gpointer pValue );
+static gpointer get_lot_account (gpointer pObject);
+static void set_lot_account (gpointer pObject, gpointer pValue);
static const GncSqlColumnTableEntry col_table[] =
{
@@ -66,100 +66,100 @@ static const GncSqlColumnTableEntry col_table[] =
/* ================================================================= */
static gpointer
-get_lot_account( gpointer pObject )
+get_lot_account (gpointer pObject)
{
const GNCLot* lot;
Account* pAccount;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_LOT(pObject), NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (GNC_IS_LOT (pObject), NULL);
- lot = GNC_LOT(pObject);
- pAccount = gnc_lot_get_account( lot );
+ lot = GNC_LOT (pObject);
+ pAccount = gnc_lot_get_account (lot);
return pAccount;
}
static void
-set_lot_account( gpointer pObject, gpointer pValue )
+set_lot_account (gpointer pObject, gpointer pValue)
{
GNCLot* lot;
Account* pAccount;
- g_return_if_fail( pObject != NULL && GNC_IS_LOT(pObject) );
- g_return_if_fail( pValue == NULL || GNC_IS_ACCOUNT(pValue) );
+ g_return_if_fail (pObject != NULL && GNC_IS_LOT (pObject));
+ g_return_if_fail (pValue == NULL || GNC_IS_ACCOUNT (pValue));
- lot = GNC_LOT(pObject);
- pAccount = GNC_ACCOUNT(pValue);
- if ( pAccount != NULL )
+ lot = GNC_LOT (pObject);
+ pAccount = GNC_ACCOUNT (pValue);
+ if (pAccount != NULL)
{
- xaccAccountInsertLot( pAccount, lot );
+ xaccAccountInsertLot (pAccount, lot);
}
}
static GNCLot*
-load_single_lot( GncSqlBackend* be, GncSqlRow* row )
+load_single_lot (GncSqlBackend* be, GncSqlRow* row)
{
GNCLot* lot;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- lot = gnc_lot_new( be->book );
+ lot = gnc_lot_new (be->book);
- gnc_lot_begin_edit( lot );
- gnc_sql_load_object( be, row, GNC_ID_LOT, lot, col_table );
- gnc_lot_commit_edit( lot );
+ gnc_lot_begin_edit (lot);
+ gnc_sql_load_object (be, row, GNC_ID_LOT, lot, col_table);
+ gnc_lot_commit_edit (lot);
return lot;
}
static void
-load_all_lots( GncSqlBackend* be )
+load_all_lots (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- if ( stmt != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ if (stmt != NULL)
{
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
gchar* sql;
- while ( row != NULL )
+ while (row != NULL)
{
- load_single_lot( be, row );
- row = gnc_sql_result_get_next_row( result );
+ load_single_lot (be, row);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
- gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)gnc_lot_lookup );
- g_free( sql );
+ sql = g_strdup_printf ("SELECT DISTINCT guid FROM %s", TABLE_NAME);
+ gnc_sql_slots_load_for_sql_subquery (be, sql, (BookLookupFn)gnc_lot_lookup);
+ g_free (sql);
}
}
}
/* ================================================================= */
static void
-create_lots_tables( GncSqlBackend* be )
+create_lots_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
/* The table doesn't exist, so create it */
- (void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
- else if ( version == 1 )
+ else if (version == 1)
{
/* Version 1 -> 2 removes the 'NOT NULL' constraint on the account_guid
field.
@@ -167,87 +167,89 @@ create_lots_tables( GncSqlBackend* be )
Create a temporary table, copy the data from the old table, delete the
old table, then rename the new one. */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
+ (void)gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
- PINFO("Lots table upgraded from version 1 to version %d\n", TABLE_VERSION);
+ PINFO ("Lots table upgraded from version 1 to version %d\n", TABLE_VERSION);
}
}
/* ================================================================= */
static gboolean
-commit_lot( GncSqlBackend* be, QofInstance* inst )
+commit_lot (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_LOT(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_LOT (inst), FALSE);
- return gnc_sql_commit_standard_item( be, inst, TABLE_NAME, GNC_ID_LOT, col_table );
+ return gnc_sql_commit_standard_item (be, inst, TABLE_NAME, GNC_ID_LOT,
+ col_table);
}
static void
-do_save_lot( QofInstance* inst, gpointer data )
+do_save_lot (QofInstance* inst, gpointer data)
{
write_objects_t* s = (write_objects_t*)data;
- if ( s->is_ok )
+ if (s->is_ok)
{
- s->is_ok = commit_lot( s->be, inst );
+ s->is_ok = commit_lot (s->be, inst);
}
}
static gboolean
-write_lots( GncSqlBackend* be )
+write_lots (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_collection_foreach( qof_book_get_collection( be->book, GNC_ID_LOT ),
- (QofInstanceForeachCB)do_save_lot, &data );
+ qof_collection_foreach (qof_book_get_collection (be->book, GNC_ID_LOT),
+ (QofInstanceForeachCB)do_save_lot, &data);
return data.is_ok;
}
/* ================================================================= */
static void
-load_lot_guid( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_lot_guid (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
GNCLot* lot;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- (void)string_to_guid( g_value_get_string( val ), &guid );
- lot = gnc_lot_lookup( &guid, be->book );
- if ( lot != NULL )
+ (void)string_to_guid (g_value_get_string (val), &guid);
+ lot = gnc_lot_lookup (&guid, be->book);
+ if (lot != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, lot, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, lot, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)lot );
+ g_return_if_fail (setter != NULL);
+ (*setter) (pObject, (const gpointer)lot);
}
}
else
{
- PWARN( "Lot ref '%s' not found", g_value_get_string( val ) );
+ PWARN ("Lot ref '%s' not found", g_value_get_string (val));
}
}
}
@@ -260,7 +262,7 @@ static GncSqlColumnTypeHandler lot_guid_handler
};
/* ================================================================= */
void
-gnc_sql_init_lot_handler( void )
+gnc_sql_init_lot_handler (void)
{
static GncSqlObjectBackend be_data =
{
@@ -273,9 +275,9 @@ gnc_sql_init_lot_handler( void )
write_lots /* save all */
};
- (void)qof_object_register_backend( GNC_ID_LOT, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (GNC_ID_LOT, GNC_SQL_BACKEND, &be_data);
- gnc_sql_register_col_type_handler( CT_LOTREF, &lot_guid_handler );
+ gnc_sql_register_col_type_handler (CT_LOTREF, &lot_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-lots-sql.h b/src/backend/sql/gnc-lots-sql.h
index 8bd195b..c0b7c18 100644
--- a/src/backend/sql/gnc-lots-sql.h
+++ b/src/backend/sql/gnc-lots-sql.h
@@ -29,6 +29,6 @@
#ifndef GNC_LOT_SQL_H
#define GNC_LOT_SQL_H
-void gnc_sql_init_lot_handler( void );
+void gnc_sql_init_lot_handler (void);
#endif /* GNC_LOT_SQL_H */
diff --git a/src/backend/sql/gnc-order-sql.cpp b/src/backend/sql/gnc-order-sql.cpp
index 5b5d555..7512baf 100644
--- a/src/backend/sql/gnc-order-sql.cpp
+++ b/src/backend/sql/gnc-order-sql.cpp
@@ -42,7 +42,7 @@ extern "C"
#include "gnc-order-sql.h"
#include "gnc-owner-sql.h"
-#define _GNC_MOD_NAME GNC_ID_ORDER
+#define _GNC_MOD_NAME GNC_ID_ORDER
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -67,99 +67,100 @@ static GncSqlColumnTableEntry col_table[] =
};
static GncOrder*
-load_single_order( GncSqlBackend* be, GncSqlRow* row )
+load_single_order (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncOrder* pOrder;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- pOrder = gncOrderLookup( be->book, guid );
- if ( pOrder == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ pOrder = gncOrderLookup (be->book, guid);
+ if (pOrder == NULL)
{
- pOrder = gncOrderCreate( be->book );
+ pOrder = gncOrderCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_ORDER, pOrder, col_table );
- qof_instance_mark_clean( QOF_INSTANCE(pOrder) );
+ gnc_sql_load_object (be, row, GNC_ID_ORDER, pOrder, col_table);
+ qof_instance_mark_clean (QOF_INSTANCE (pOrder));
return pOrder;
}
static void
-load_all_orders( GncSqlBackend* be )
+load_all_orders (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
GList* list = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- GncOrder* pOrder = load_single_order( be, row );
- if ( pOrder != NULL )
+ GncOrder* pOrder = load_single_order (be, row);
+ if (pOrder != NULL)
{
- list = g_list_append( list, pOrder );
+ list = g_list_append (list, pOrder);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
/* ================================================================= */
static void
-create_order_tables( GncSqlBackend* be )
+create_order_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
}
/* ================================================================= */
static gboolean
-save_order( GncSqlBackend* be, QofInstance* inst )
+save_order (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_ORDER(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_ORDER (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- return gnc_sql_commit_standard_item( be, inst, TABLE_NAME, GNC_ID_ORDER, col_table );
+ return gnc_sql_commit_standard_item (be, inst, TABLE_NAME, GNC_ID_ORDER,
+ col_table);
}
/* ================================================================= */
static gboolean
-order_should_be_saved( GncOrder *order )
+order_should_be_saved (GncOrder* order)
{
- const char *id;
+ const char* id;
- g_return_val_if_fail( order != NULL, FALSE );
+ g_return_val_if_fail (order != NULL, FALSE);
/* make sure this is a valid order before we save it -- should have an ID */
- id = gncOrderGetID( order );
- if ( id == NULL || *id == '\0' )
+ id = gncOrderGetID (order);
+ if (id == NULL || *id == '\0')
{
return FALSE;
}
@@ -168,70 +169,71 @@ order_should_be_saved( GncOrder *order )
}
static void
-write_single_order( QofInstance *term_p, gpointer data_p )
+write_single_order (QofInstance* term_p, gpointer data_p)
{
write_objects_t* s = (write_objects_t*)data_p;
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_ORDER(term_p) );
- g_return_if_fail( data_p != NULL );
+ g_return_if_fail (term_p != NULL);
+ g_return_if_fail (GNC_IS_ORDER (term_p));
+ g_return_if_fail (data_p != NULL);
- if ( s->is_ok && order_should_be_saved( GNC_ORDER(term_p) ) )
+ if (s->is_ok && order_should_be_saved (GNC_ORDER (term_p)))
{
- s->is_ok = save_order( s->be, term_p );
+ s->is_ok = save_order (s->be, term_p);
}
}
static gboolean
-write_orders( GncSqlBackend* be )
+write_orders (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_ORDER, be->book, write_single_order, &data );
+ qof_object_foreach (GNC_ID_ORDER, be->book, write_single_order, &data);
return data.is_ok;
}
/* ================================================================= */
static void
-load_order_guid( const GncSqlBackend* be, GncSqlRow* row,
+load_order_guid (const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
GncOrder* order = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- string_to_guid( g_value_get_string( val ), &guid );
- order = gncOrderLookup( be->book, &guid );
- if ( order != NULL )
+ string_to_guid (g_value_get_string (val), &guid);
+ order = gncOrderLookup (be->book, &guid);
+ if (order != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, order, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, order, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- (*setter)( pObject, (const gpointer)order );
+ (*setter) (pObject, (const gpointer)order);
}
}
else
{
- PWARN( "Order ref '%s' not found", g_value_get_string( val ) );
+ PWARN ("Order ref '%s' not found", g_value_get_string (val));
}
}
}
@@ -244,21 +246,21 @@ static GncSqlColumnTypeHandler order_guid_handler
};
/* ================================================================= */
void
-gnc_order_sql_initialize( void )
+gnc_order_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_ORDER,
- save_order, /* commit */
- load_all_orders, /* initial_load */
- create_order_tables, /* create_tables */
+ save_order, /* commit */
+ load_all_orders, /* initial_load */
+ create_order_tables, /* create_tables */
NULL, NULL, NULL,
- write_orders /* write */
+ write_orders /* write */
};
- qof_object_register_backend( GNC_ID_ORDER, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_ORDER, GNC_SQL_BACKEND, &be_data);
- gnc_sql_register_col_type_handler( CT_ORDERREF, &order_guid_handler );
+ gnc_sql_register_col_type_handler (CT_ORDERREF, &order_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-order-sql.h b/src/backend/sql/gnc-order-sql.h
index f9a50a1..1106430 100644
--- a/src/backend/sql/gnc-order-sql.h
+++ b/src/backend/sql/gnc-order-sql.h
@@ -32,6 +32,6 @@
#define CT_ORDERREF "order"
-void gnc_order_sql_initialize( void );
+void gnc_order_sql_initialize (void);
#endif /* GNC_ORDER_SQL_H */
diff --git a/src/backend/sql/gnc-owner-sql.cpp b/src/backend/sql/gnc-owner-sql.cpp
index 3c1c3ad..f4696d2 100644
--- a/src/backend/sql/gnc-owner-sql.cpp
+++ b/src/backend/sql/gnc-owner-sql.cpp
@@ -44,13 +44,13 @@ extern "C"
static QofLogModule log_module = G_LOG_DOMAIN;
-typedef void (*OwnerSetterFunc)( gpointer, GncOwner* );
-typedef GncOwner* (*OwnerGetterFunc)( const gpointer );
+typedef void (*OwnerSetterFunc) (gpointer, GncOwner*);
+typedef GncOwner* (*OwnerGetterFunc) (const gpointer);
static void
-load_owner( const GncSqlBackend* be, GncSqlRow* row,
+load_owner (const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
gchar* buf;
@@ -60,232 +60,235 @@ load_owner( const GncSqlBackend* be, GncSqlRow* row,
GncOwner owner;
GncGUID* pGuid = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
book = be->book;
- buf = g_strdup_printf( "%s_type", table_row->col_name );
- val = gnc_sql_row_get_value_at_col_name( row, buf );
- type = (GncOwnerType)gnc_sql_get_integer_value( val );
- g_free( buf );
- buf = g_strdup_printf( "%s_guid", table_row->col_name );
- val = gnc_sql_row_get_value_at_col_name( row, buf );
- g_free( buf );
-
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ buf = g_strdup_printf ("%s_type", table_row->col_name);
+ val = gnc_sql_row_get_value_at_col_name (row, buf);
+ type = (GncOwnerType)gnc_sql_get_integer_value (val);
+ g_free (buf);
+ buf = g_strdup_printf ("%s_guid", table_row->col_name);
+ val = gnc_sql_row_get_value_at_col_name (row, buf);
+ g_free (buf);
+
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- string_to_guid( g_value_get_string( val ), &guid );
+ string_to_guid (g_value_get_string (val), &guid);
pGuid = &guid;
}
- switch ( type )
+ switch (type)
{
case GNC_OWNER_CUSTOMER:
{
- GncCustomer *cust = NULL;
+ GncCustomer* cust = NULL;
- if ( pGuid != NULL )
+ if (pGuid != NULL)
{
- cust = gncCustomerLookup( book, pGuid );
- if ( cust == NULL )
+ cust = gncCustomerLookup (book, pGuid);
+ if (cust == NULL)
{
- cust = gncCustomerCreate( book );
- gncCustomerSetGUID( cust, &guid );
+ cust = gncCustomerCreate (book);
+ gncCustomerSetGUID (cust, &guid);
}
}
- gncOwnerInitCustomer( &owner, cust );
+ gncOwnerInitCustomer (&owner, cust);
break;
}
case GNC_OWNER_JOB:
{
- GncJob *job = NULL;
+ GncJob* job = NULL;
- if ( pGuid != NULL )
+ if (pGuid != NULL)
{
- job = gncJobLookup( book, pGuid );
- if ( job == NULL )
+ job = gncJobLookup (book, pGuid);
+ if (job == NULL)
{
- job = gncJobCreate( book );
- gncJobSetGUID( job, &guid );
+ job = gncJobCreate (book);
+ gncJobSetGUID (job, &guid);
}
}
- gncOwnerInitJob( &owner, job );
+ gncOwnerInitJob (&owner, job);
break;
}
case GNC_OWNER_VENDOR:
{
- GncVendor *vendor = NULL;
+ GncVendor* vendor = NULL;
- if ( pGuid != NULL )
+ if (pGuid != NULL)
{
- vendor = gncVendorLookup( book, pGuid );
- if ( vendor == NULL )
+ vendor = gncVendorLookup (book, pGuid);
+ if (vendor == NULL)
{
- vendor = gncVendorCreate( book );
- gncVendorSetGUID( vendor, &guid );
+ vendor = gncVendorCreate (book);
+ gncVendorSetGUID (vendor, &guid);
}
}
- gncOwnerInitVendor( &owner, vendor );
+ gncOwnerInitVendor (&owner, vendor);
break;
}
case GNC_OWNER_EMPLOYEE:
{
- GncEmployee *employee = NULL;
+ GncEmployee* employee = NULL;
- if ( pGuid != NULL )
+ if (pGuid != NULL)
{
- employee = gncEmployeeLookup( book, pGuid );
- if ( employee == NULL )
+ employee = gncEmployeeLookup (book, pGuid);
+ if (employee == NULL)
{
- employee = gncEmployeeCreate( book );
- gncEmployeeSetGUID( employee, &guid );
+ employee = gncEmployeeCreate (book);
+ gncEmployeeSetGUID (employee, &guid);
}
}
- gncOwnerInitEmployee( &owner, employee );
+ gncOwnerInitEmployee (&owner, employee);
break;
}
default:
- PWARN("Invalid owner type: %d\n", type );
+ PWARN ("Invalid owner type: %d\n", type);
}
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, &owner, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, &owner, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- (*setter)( pObject, &owner );
+ (*setter) (pObject, &owner);
}
}
static void
-add_owner_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
- GList** pList )
+add_owner_col_info_to_list (const GncSqlBackend* be,
+ const GncSqlColumnTableEntry* table_row,
+ GList** pList)
{
GncSqlColumnInfo* info;
gchar* buf;
- g_return_if_fail( be != NULL );
- g_return_if_fail( table_row != NULL );
- g_return_if_fail( pList != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (table_row != NULL);
+ g_return_if_fail (pList != NULL);
- buf = g_strdup_printf( "%s_type", table_row->col_name );
- info = g_new0( GncSqlColumnInfo, 1 );
+ buf = g_strdup_printf ("%s_type", table_row->col_name);
+ info = g_new0 (GncSqlColumnInfo, 1);
info->name = buf;
info->type = BCT_INT;
info->is_primary_key = (table_row->flags & COL_PKEY) ? TRUE : FALSE;
info->null_allowed = (table_row->flags & COL_NNUL) ? FALSE : TRUE;
info->size = table_row->size;
info->is_unicode = FALSE;
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
- buf = g_strdup_printf( "%s_guid", table_row->col_name );
- info = g_new0( GncSqlColumnInfo, 1 );
+ buf = g_strdup_printf ("%s_guid", table_row->col_name);
+ info = g_new0 (GncSqlColumnInfo, 1);
info->name = buf;
info->type = BCT_STRING;
info->size = GUID_ENCODING_LENGTH;
info->is_primary_key = (table_row->flags & COL_PKEY) ? TRUE : FALSE;
info->null_allowed = (table_row->flags & COL_NNUL) ? FALSE : TRUE;
info->is_unicode = FALSE;
- *pList = g_list_append( *pList, info );
+ *pList = g_list_append (*pList, info);
}
static void
-add_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
+add_colname_to_list (const GncSqlColumnTableEntry* table_row, GList** pList)
{
gchar* buf;
- buf = g_strdup_printf( "%s_type", table_row->col_name );
- (*pList) = g_list_append( (*pList), buf );
- buf = g_strdup_printf( "%s_guid", table_row->col_name );
- (*pList) = g_list_append( (*pList), buf );
+ buf = g_strdup_printf ("%s_type", table_row->col_name);
+ (*pList) = g_list_append ((*pList), buf);
+ buf = g_strdup_printf ("%s_guid", table_row->col_name);
+ (*pList) = g_list_append ((*pList), buf);
}
static void
-add_gvalue_owner_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
+add_gvalue_owner_to_slist (const GncSqlBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row,
+ GSList** pList)
{
GValue* subfield_value;
GncOwner* owner;
gchar* buf;
const GncGUID* guid;
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
GncOwnerType type;
QofInstance* inst = NULL;
OwnerGetterFunc getter;
- g_return_if_fail( be != NULL );
- g_return_if_fail( obj_name != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (obj_name != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- getter = (OwnerGetterFunc)gnc_sql_get_getter( obj_name, table_row );
- owner = (*getter)( pObject );
+ getter = (OwnerGetterFunc)gnc_sql_get_getter (obj_name, table_row);
+ owner = (*getter) (pObject);
- if ( owner != NULL )
+ if (owner != NULL)
{
- buf = g_strdup_printf( "%s_type", table_row->col_name );
- subfield_value = g_new0( GValue, 1 );
- g_value_init( subfield_value, G_TYPE_INT );
- type = gncOwnerGetType( owner );
- g_value_set_int( subfield_value, type );
- (*pList) = g_slist_append( (*pList), subfield_value );
- g_free( buf );
-
- buf = g_strdup_printf( "%s_guid", table_row->col_name );
- subfield_value = g_new0( GValue, 1 );
- switch ( type )
+ buf = g_strdup_printf ("%s_type", table_row->col_name);
+ subfield_value = g_new0 (GValue, 1);
+ g_value_init (subfield_value, G_TYPE_INT);
+ type = gncOwnerGetType (owner);
+ g_value_set_int (subfield_value, type);
+ (*pList) = g_slist_append ((*pList), subfield_value);
+ g_free (buf);
+
+ buf = g_strdup_printf ("%s_guid", table_row->col_name);
+ subfield_value = g_new0 (GValue, 1);
+ switch (type)
{
case GNC_OWNER_CUSTOMER:
- inst = QOF_INSTANCE(gncOwnerGetCustomer( owner ));
+ inst = QOF_INSTANCE (gncOwnerGetCustomer (owner));
break;
case GNC_OWNER_JOB:
- inst = QOF_INSTANCE(gncOwnerGetJob( owner ));
+ inst = QOF_INSTANCE (gncOwnerGetJob (owner));
break;
case GNC_OWNER_VENDOR:
- inst = QOF_INSTANCE(gncOwnerGetVendor( owner ));
+ inst = QOF_INSTANCE (gncOwnerGetVendor (owner));
break;
case GNC_OWNER_EMPLOYEE:
- inst = QOF_INSTANCE(gncOwnerGetEmployee( owner ));
+ inst = QOF_INSTANCE (gncOwnerGetEmployee (owner));
break;
default:
- PWARN("Invalid owner type: %d\n", type );
+ PWARN ("Invalid owner type: %d\n", type);
}
- g_value_init( subfield_value, G_TYPE_STRING );
- if ( inst != NULL )
+ g_value_init (subfield_value, G_TYPE_STRING);
+ if (inst != NULL)
{
- guid = qof_instance_get_guid( inst );
- if ( guid != NULL )
+ guid = qof_instance_get_guid (inst);
+ if (guid != NULL)
{
- (void)guid_to_string_buff( guid, guid_buf );
- g_value_take_string( subfield_value, g_strdup_printf( "%s", guid_buf ) );
+ (void)guid_to_string_buff (guid, guid_buf);
+ g_value_take_string (subfield_value, g_strdup_printf ("%s", guid_buf));
}
}
- (*pList) = g_slist_append( (*pList), subfield_value );
- g_free( buf );
+ (*pList) = g_slist_append ((*pList), subfield_value);
+ g_free (buf);
}
else
{
- subfield_value = g_new0( GValue, 1 );
- g_value_init( subfield_value, G_TYPE_STRING );
- g_value_set_string( subfield_value, "NULL" );
- (*pList) = g_slist_append( (*pList), subfield_value );
- subfield_value = g_new0( GValue, 1 );
- g_value_init( subfield_value, G_TYPE_STRING );
- g_value_set_string( subfield_value, "NULL" );
- (*pList) = g_slist_append( (*pList), subfield_value );
+ subfield_value = g_new0 (GValue, 1);
+ g_value_init (subfield_value, G_TYPE_STRING);
+ g_value_set_string (subfield_value, "NULL");
+ (*pList) = g_slist_append ((*pList), subfield_value);
+ subfield_value = g_new0 (GValue, 1);
+ g_value_init (subfield_value, G_TYPE_STRING);
+ g_value_set_string (subfield_value, "NULL");
+ (*pList) = g_slist_append ((*pList), subfield_value);
}
}
@@ -298,8 +301,8 @@ static GncSqlColumnTypeHandler owner_handler
/* ================================================================= */
void
-gnc_owner_sql_initialize( void )
+gnc_owner_sql_initialize (void)
{
- gnc_sql_register_col_type_handler( CT_OWNERREF, &owner_handler );
+ gnc_sql_register_col_type_handler (CT_OWNERREF, &owner_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-owner-sql.h b/src/backend/sql/gnc-owner-sql.h
index 9b4a950..52bbd90 100644
--- a/src/backend/sql/gnc-owner-sql.h
+++ b/src/backend/sql/gnc-owner-sql.h
@@ -31,6 +31,6 @@
#define CT_OWNERREF "owner"
-void gnc_owner_sql_initialize( void );
+void gnc_owner_sql_initialize (void);
#endif /* GNC_OWNER_SQL_H */
diff --git a/src/backend/sql/gnc-price-sql.cpp b/src/backend/sql/gnc-price-sql.cpp
index 8235e7c..c061120 100644
--- a/src/backend/sql/gnc-price-sql.cpp
+++ b/src/backend/sql/gnc-price-sql.cpp
@@ -45,7 +45,7 @@ extern "C"
#include "gnc-slots-sql.h"
- static QofLogModule log_module = G_LOG_DOMAIN;
+static QofLogModule log_module = G_LOG_DOMAIN;
#define TABLE_NAME "prices"
#define TABLE_VERSION 2
@@ -68,110 +68,110 @@ static const GncSqlColumnTableEntry col_table[] =
/* ================================================================= */
static GNCPrice*
-load_single_price( GncSqlBackend* be, GncSqlRow* row )
+load_single_price (GncSqlBackend* be, GncSqlRow* row)
{
GNCPrice* pPrice;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- pPrice = gnc_price_create( be->book );
+ pPrice = gnc_price_create (be->book);
- gnc_price_begin_edit( pPrice );
- gnc_sql_load_object( be, row, GNC_ID_PRICE, pPrice, col_table );
- gnc_price_commit_edit( pPrice );
+ gnc_price_begin_edit (pPrice);
+ gnc_sql_load_object (be, row, GNC_ID_PRICE, pPrice, col_table);
+ gnc_price_commit_edit (pPrice);
return pPrice;
}
static void
-load_all_prices( GncSqlBackend* be )
+load_all_prices (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
QofBook* pBook;
GNCPriceDB* pPriceDB;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
pBook = be->book;
- pPriceDB = gnc_pricedb_get_db( pBook );
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- if ( stmt != NULL )
+ pPriceDB = gnc_pricedb_get_db (pBook);
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ if (stmt != NULL)
{
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GNCPrice* pPrice;
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
gchar* sql;
- gnc_pricedb_set_bulk_update( pPriceDB, TRUE );
- while ( row != NULL )
+ gnc_pricedb_set_bulk_update (pPriceDB, TRUE);
+ while (row != NULL)
{
- pPrice = load_single_price( be, row );
+ pPrice = load_single_price (be, row);
- if ( pPrice != NULL )
+ if (pPrice != NULL)
{
- (void)gnc_pricedb_add_price( pPriceDB, pPrice );
- gnc_price_unref( pPrice );
+ (void)gnc_pricedb_add_price (pPriceDB, pPrice);
+ gnc_price_unref (pPrice);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
- gnc_pricedb_set_bulk_update( pPriceDB, FALSE );
+ gnc_sql_result_dispose (result);
+ gnc_pricedb_set_bulk_update (pPriceDB, FALSE);
- sql = g_strdup_printf( "SELECT DISTINCT guid FROM %s", TABLE_NAME );
- gnc_sql_slots_load_for_sql_subquery( be, sql, (BookLookupFn)gnc_price_lookup );
- g_free( sql );
+ sql = g_strdup_printf ("SELECT DISTINCT guid FROM %s", TABLE_NAME);
+ gnc_sql_slots_load_for_sql_subquery (be, sql, (BookLookupFn)gnc_price_lookup);
+ g_free (sql);
}
}
}
/* ================================================================= */
static void
-create_prices_tables( GncSqlBackend* be )
+create_prices_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
- else if ( version == 1 )
+ else if (version == 1)
{
/* Upgrade 64 bit int handling */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
+ (void)gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
- PINFO("Prices table upgraded from version 1 to version %d\n", TABLE_VERSION);
+ PINFO ("Prices table upgraded from version 1 to version %d\n", TABLE_VERSION);
}
}
/* ================================================================= */
static gboolean
-save_price( GncSqlBackend* be, QofInstance* inst )
+save_price (GncSqlBackend* be, QofInstance* inst)
{
- GNCPrice* pPrice = GNC_PRICE(inst);
+ GNCPrice* pPrice = GNC_PRICE (inst);
E_DB_OPERATION op;
gboolean is_infant;
gboolean is_ok = TRUE;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_PRICE(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_PRICE (inst), FALSE);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -180,68 +180,69 @@ save_price( GncSqlBackend* be, QofInstance* inst )
op = OP_DB_UPDATE;
}
- if ( op != OP_DB_DELETE )
+ if (op != OP_DB_DELETE)
{
/* Ensure commodity and currency are in the db */
- (void)gnc_sql_save_commodity( be, gnc_price_get_commodity( pPrice ) );
- is_ok = gnc_sql_save_commodity( be, gnc_price_get_currency( pPrice ) );
+ (void)gnc_sql_save_commodity (be, gnc_price_get_commodity (pPrice));
+ is_ok = gnc_sql_save_commodity (be, gnc_price_get_currency (pPrice));
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_PRICE, pPrice, col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, TABLE_NAME, GNC_ID_PRICE, pPrice,
+ col_table);
}
return is_ok;
}
static gboolean
-write_price( GNCPrice* p, gpointer data )
+write_price (GNCPrice* p, gpointer data)
{
write_objects_t* s = (write_objects_t*)data;
- g_return_val_if_fail( p != NULL, FALSE );
- g_return_val_if_fail( data != NULL, FALSE );
+ g_return_val_if_fail (p != NULL, FALSE);
+ g_return_val_if_fail (data != NULL, FALSE);
- if ( s->is_ok && gnc_price_get_source(p) != PRICE_SOURCE_TEMP)
+ if (s->is_ok && gnc_price_get_source (p) != PRICE_SOURCE_TEMP)
{
- s->is_ok = save_price( s->be, QOF_INSTANCE(p) );
+ s->is_ok = save_price (s->be, QOF_INSTANCE (p));
}
return s->is_ok;
}
static gboolean
-write_prices( GncSqlBackend* be )
+write_prices (GncSqlBackend* be)
{
GNCPriceDB* priceDB;
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
- priceDB = gnc_pricedb_get_db( be->book );
+ priceDB = gnc_pricedb_get_db (be->book);
data.be = be;
data.is_ok = TRUE;
- return gnc_pricedb_foreach_price( priceDB, write_price, &data, TRUE );
+ return gnc_pricedb_foreach_price (priceDB, write_price, &data, TRUE);
}
/* ================================================================= */
void
-gnc_sql_init_price_handler( void )
+gnc_sql_init_price_handler (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_PRICE,
- save_price, /* commit */
+ save_price, /* commit */
load_all_prices, /* initial_load */
- create_prices_tables, /* create tables */
+ create_prices_tables, /* create tables */
NULL, NULL, NULL,
- write_prices /* write */
+ write_prices /* write */
};
- (void)qof_object_register_backend( GNC_ID_PRICE, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (GNC_ID_PRICE, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-price-sql.h b/src/backend/sql/gnc-price-sql.h
index badfff3..f7f181f 100644
--- a/src/backend/sql/gnc-price-sql.h
+++ b/src/backend/sql/gnc-price-sql.h
@@ -29,6 +29,6 @@
#ifndef GNC_PRICE_SQL_H
#define GNC_PRICE_SQL_H
-void gnc_sql_init_price_handler( void );
+void gnc_sql_init_price_handler (void);
#endif /* GNC_PRICE_SQL_H */
diff --git a/src/backend/sql/gnc-recurrence-sql.cpp b/src/backend/sql/gnc-recurrence-sql.cpp
index 1f49b8b..17e60be 100644
--- a/src/backend/sql/gnc-recurrence-sql.cpp
+++ b/src/backend/sql/gnc-recurrence-sql.cpp
@@ -53,21 +53,21 @@ G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
typedef struct
{
- GncSqlBackend* be;
+ GncSqlBackend* be;
const GncGUID* guid;
Recurrence* pRecurrence;
} recurrence_info_t;
-static gpointer get_obj_guid( gpointer pObject );
-static void set_obj_guid( void );
-static gint get_recurrence_mult( gpointer pObject );
-static void set_recurrence_mult( gpointer pObject, gint value );
-static gpointer get_recurrence_period_type( gpointer pObject );
-static void set_recurrence_period_type( gpointer pObject, gpointer pValue );
-static gpointer get_recurrence_weekend_adjust( gpointer pObject );
-static void set_recurrence_weekend_adjust( gpointer pObject, gpointer pValue );
-static gpointer get_recurrence_period_start( gpointer pObject );
-static void set_recurrence_period_start( gpointer pObject, gpointer pValue );
+static gpointer get_obj_guid (gpointer pObject);
+static void set_obj_guid (void);
+static gint get_recurrence_mult (gpointer pObject);
+static void set_recurrence_mult (gpointer pObject, gint value);
+static gpointer get_recurrence_period_type (gpointer pObject);
+static void set_recurrence_period_type (gpointer pObject, gpointer pValue);
+static gpointer get_recurrence_weekend_adjust (gpointer pObject);
+static void set_recurrence_weekend_adjust (gpointer pObject, gpointer pValue);
+static gpointer get_recurrence_period_start (gpointer pObject);
+static void set_recurrence_period_start (gpointer pObject, gpointer pValue);
static const GncSqlColumnTableEntry col_table[] =
{
@@ -118,113 +118,113 @@ static const GncSqlColumnTableEntry weekend_adjust_col_table[] =
/* ================================================================= */
static gpointer
-get_obj_guid( gpointer pObject )
+get_obj_guid (gpointer pObject)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
return (gpointer)pInfo->guid;
}
static void
-set_obj_guid( void )
+set_obj_guid (void)
{
// Nowhere to put the GncGUID
}
static gint
-get_recurrence_mult( gpointer pObject )
+get_recurrence_mult (gpointer pObject)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, 0 );
- g_return_val_if_fail( pInfo->pRecurrence != NULL, 0 );
+ g_return_val_if_fail (pObject != NULL, 0);
+ g_return_val_if_fail (pInfo->pRecurrence != NULL, 0);
return (gint)pInfo->pRecurrence->mult;
}
static void
-set_recurrence_mult( gpointer pObject, gint value )
+set_recurrence_mult (gpointer pObject, gint value)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pInfo->pRecurrence != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pInfo->pRecurrence != NULL);
pInfo->pRecurrence->mult = (guint16)value;
}
static gpointer
-get_recurrence_period_type( gpointer pObject )
+get_recurrence_period_type (gpointer pObject)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( pInfo->pRecurrence != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (pInfo->pRecurrence != NULL, NULL);
- return (gpointer)recurrencePeriodTypeToString(
- recurrenceGetPeriodType( pInfo->pRecurrence ) );
+ return (gpointer)recurrencePeriodTypeToString (
+ recurrenceGetPeriodType (pInfo->pRecurrence));
}
static void
-set_recurrence_period_type( gpointer pObject, gpointer pValue )
+set_recurrence_period_type (gpointer pObject, gpointer pValue)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pInfo->pRecurrence != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pInfo->pRecurrence != NULL);
+ g_return_if_fail (pValue != NULL);
- pInfo->pRecurrence->ptype = recurrencePeriodTypeFromString( (gchar*)pValue );
+ pInfo->pRecurrence->ptype = recurrencePeriodTypeFromString ((gchar*)pValue);
}
static gpointer
-get_recurrence_weekend_adjust( gpointer pObject )
+get_recurrence_weekend_adjust (gpointer pObject)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( pInfo->pRecurrence != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (pInfo->pRecurrence != NULL, NULL);
- return (gpointer)recurrenceWeekendAdjustToString(
- recurrenceGetWeekendAdjust( pInfo->pRecurrence ) );
+ return (gpointer)recurrenceWeekendAdjustToString (
+ recurrenceGetWeekendAdjust (pInfo->pRecurrence));
}
static void
-set_recurrence_weekend_adjust( gpointer pObject, gpointer pValue )
+set_recurrence_weekend_adjust (gpointer pObject, gpointer pValue)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pInfo->pRecurrence != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pInfo->pRecurrence != NULL);
+ g_return_if_fail (pValue != NULL);
- pInfo->pRecurrence->wadj = recurrenceWeekendAdjustFromString( (gchar*)pValue );
+ pInfo->pRecurrence->wadj = recurrenceWeekendAdjustFromString ((gchar*)pValue);
}
static gpointer
-get_recurrence_period_start( gpointer pObject )
+get_recurrence_period_start (gpointer pObject)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
static GDate date;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( pInfo->pRecurrence != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (pInfo->pRecurrence != NULL, NULL);
- date = recurrenceGetDate( pInfo->pRecurrence );
+ date = recurrenceGetDate (pInfo->pRecurrence);
return (gpointer)&date;
}
static void
-set_recurrence_period_start( gpointer pObject, gpointer pValue )
+set_recurrence_period_start (gpointer pObject, gpointer pValue)
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
GDate* date = (GDate*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pInfo->pRecurrence != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pInfo->pRecurrence != NULL);
+ g_return_if_fail (pValue != NULL);
pInfo->pRecurrence->start = *date;
}
@@ -232,150 +232,153 @@ set_recurrence_period_start( gpointer pObject, gpointer pValue )
/* ================================================================= */
gboolean
-gnc_sql_recurrence_save( GncSqlBackend* be, const GncGUID* guid, const Recurrence* r )
+gnc_sql_recurrence_save (GncSqlBackend* be, const GncGUID* guid,
+ const Recurrence* r)
{
recurrence_info_t recurrence_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
- g_return_val_if_fail( r != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (guid != NULL, FALSE);
+ g_return_val_if_fail (r != NULL, FALSE);
- (void)gnc_sql_recurrence_delete( be, guid );
+ (void)gnc_sql_recurrence_delete (be, guid);
recurrence_info.be = be;
recurrence_info.guid = guid;
recurrence_info.pRecurrence = (Recurrence*)r;
- return gnc_sql_do_db_operation( be, OP_DB_INSERT, TABLE_NAME,
- TABLE_NAME, &recurrence_info, col_table );
+ return gnc_sql_do_db_operation (be, OP_DB_INSERT, TABLE_NAME,
+ TABLE_NAME, &recurrence_info, col_table);
}
void
-gnc_sql_recurrence_save_list( GncSqlBackend* be, const GncGUID* guid, GList* schedule )
+gnc_sql_recurrence_save_list (GncSqlBackend* be, const GncGUID* guid,
+ GList* schedule)
{
recurrence_info_t recurrence_info;
GList* l;
- g_return_if_fail( be != NULL );
- g_return_if_fail( guid != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (guid != NULL);
- (void)gnc_sql_recurrence_delete( be, guid );
+ (void)gnc_sql_recurrence_delete (be, guid);
recurrence_info.be = be;
recurrence_info.guid = guid;
- for ( l = schedule; l != NULL; l = g_list_next( l ) )
+ for (l = schedule; l != NULL; l = g_list_next (l))
{
recurrence_info.pRecurrence = (Recurrence*)l->data;
- (void)gnc_sql_do_db_operation( be, OP_DB_INSERT, TABLE_NAME,
- TABLE_NAME, &recurrence_info, col_table );
+ (void)gnc_sql_do_db_operation (be, OP_DB_INSERT, TABLE_NAME,
+ TABLE_NAME, &recurrence_info, col_table);
}
}
gboolean
-gnc_sql_recurrence_delete( GncSqlBackend* be, const GncGUID* guid )
+gnc_sql_recurrence_delete (GncSqlBackend* be, const GncGUID* guid)
{
recurrence_info_t recurrence_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (guid != NULL, FALSE);
recurrence_info.be = be;
recurrence_info.guid = guid;
- return gnc_sql_do_db_operation( be, OP_DB_DELETE, TABLE_NAME,
- TABLE_NAME, &recurrence_info, guid_col_table );
+ return gnc_sql_do_db_operation (be, OP_DB_DELETE, TABLE_NAME,
+ TABLE_NAME, &recurrence_info, guid_col_table);
}
static void
-load_recurrence( GncSqlBackend* be, GncSqlRow* row, Recurrence* r )
+load_recurrence (GncSqlBackend* be, GncSqlRow* row, Recurrence* r)
{
recurrence_info_t recurrence_info;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( r != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (r != NULL);
recurrence_info.be = be;
recurrence_info.pRecurrence = r;
- gnc_sql_load_object( be, row, TABLE_NAME, &recurrence_info, col_table );
+ gnc_sql_load_object (be, row, TABLE_NAME, &recurrence_info, col_table);
}
static GncSqlResult*
-gnc_sql_set_recurrences_from_db( GncSqlBackend* be, const GncGUID* guid )
+gnc_sql_set_recurrences_from_db (GncSqlBackend* be, const GncGUID* guid)
{
gchar* buf;
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( guid != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (guid != NULL, NULL);
- (void)guid_to_string_buff( guid, guid_buf );
- buf = g_strdup_printf( "SELECT * FROM %s WHERE obj_guid='%s'", TABLE_NAME, guid_buf );
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, buf );
- g_free( buf );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
+ (void)guid_to_string_buff (guid, guid_buf);
+ buf = g_strdup_printf ("SELECT * FROM %s WHERE obj_guid='%s'", TABLE_NAME,
+ guid_buf);
+ stmt = gnc_sql_connection_create_statement_from_sql (be->conn, buf);
+ g_free (buf);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
return result;
}
- Recurrence*
-gnc_sql_recurrence_load( GncSqlBackend* be, const GncGUID* guid )
+Recurrence*
+gnc_sql_recurrence_load (GncSqlBackend* be, const GncGUID* guid)
{
GncSqlResult* result;
Recurrence* r = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( guid != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (guid != NULL, NULL);
- result = gnc_sql_set_recurrences_from_db( be, guid );
- if ( result != NULL )
+ result = gnc_sql_set_recurrences_from_db (be, guid);
+ if (result != NULL)
{
- guint numRows = gnc_sql_result_get_num_rows( result );
+ guint numRows = gnc_sql_result_get_num_rows (result);
- if ( numRows > 0 )
+ if (numRows > 0)
{
- if ( numRows > 1 )
+ if (numRows > 1)
{
- g_warning( "More than 1 recurrence found: first one used" );
+ g_warning ("More than 1 recurrence found: first one used");
}
- r = g_new0( Recurrence, 1 );
- g_assert( r != NULL );
- load_recurrence( be, gnc_sql_result_get_first_row( result ), r );
+ r = g_new0 (Recurrence, 1);
+ g_assert (r != NULL);
+ load_recurrence (be, gnc_sql_result_get_first_row (result), r);
}
else
{
- g_warning( "No recurrences found" );
+ g_warning ("No recurrences found");
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
return r;
}
- GList*
-gnc_sql_recurrence_load_list( GncSqlBackend* be, const GncGUID* guid )
+GList*
+gnc_sql_recurrence_load_list (GncSqlBackend* be, const GncGUID* guid)
{
GncSqlResult* result;
GList* list = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( guid != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (guid != NULL, NULL);
- result = gnc_sql_set_recurrences_from_db( be, guid );
- if ( result != NULL )
+ result = gnc_sql_set_recurrences_from_db (be, guid);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
- while ( row != NULL )
+ while (row != NULL)
{
- Recurrence* pRecurrence = g_new0( Recurrence, 1 );
- g_assert( pRecurrence != NULL );
- load_recurrence( be, row, pRecurrence );
- list = g_list_append( list, pRecurrence );
- row = gnc_sql_result_get_next_row( result );
+ Recurrence* pRecurrence = g_new0 (Recurrence, 1);
+ g_assert (pRecurrence != NULL);
+ load_recurrence (be, row, pRecurrence);
+ list = g_list_append (list, pRecurrence);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
return list;
@@ -383,20 +386,21 @@ gnc_sql_recurrence_load_list( GncSqlBackend* be, const GncGUID* guid )
/* ================================================================= */
static void
-upgrade_recurrence_table_1_2 ( GncSqlBackend* be )
+upgrade_recurrence_table_1_2 (GncSqlBackend* be)
{
/* Step 1: add field, but allow it to be null */
- gboolean ok = gnc_sql_add_columns_to_table( be, TABLE_NAME, weekend_adjust_col_table );
- if ( !ok )
+ gboolean ok = gnc_sql_add_columns_to_table (be, TABLE_NAME,
+ weekend_adjust_col_table);
+ if (!ok)
{
- PERR( "Unable to add recurrence_weekend_adjust column\n" );
+ PERR ("Unable to add recurrence_weekend_adjust column\n");
return;
}
/* Step 2: insert a default value in the newly created column */
{
- gchar *weekend_adj_str = recurrenceWeekendAdjustToString(WEEKEND_ADJ_NONE);
- gchar *update_query = g_strdup_printf ("UPDATE %s SET %s = '%s';",
+ gchar* weekend_adj_str = recurrenceWeekendAdjustToString (WEEKEND_ADJ_NONE);
+ gchar* update_query = g_strdup_printf ("UPDATE %s SET %s = '%s';",
TABLE_NAME,
weekend_adjust_col_table[0].col_name,
weekend_adj_str);
@@ -406,40 +410,41 @@ upgrade_recurrence_table_1_2 ( GncSqlBackend* be )
}
/* Step 3: rewrite the table, requiring the weekend_adj column to be non-null */
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
}
static void
-create_recurrence_tables( GncSqlBackend* be )
+create_recurrence_tables (GncSqlBackend* be)
{
gint version;
gboolean ok;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
- else if ( version < TABLE_VERSION )
+ else if (version < TABLE_VERSION)
{
/* Upgrade:
1->2: Add recurrence_weekend_adjust field (mandatory, non-null field)
*/
- if ( version == 1 )
+ if (version == 1)
{
upgrade_recurrence_table_1_2 (be);
}
- (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
- PINFO("Recurrence table upgraded from version %d to version %d\n", version, TABLE_VERSION);
+ (void)gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
+ PINFO ("Recurrence table upgraded from version %d to version %d\n", version,
+ TABLE_VERSION);
}
}
/* ================================================================= */
void
-gnc_sql_init_recurrence_handler( void )
+gnc_sql_init_recurrence_handler (void)
{
static GncSqlObjectBackend be_data =
{
@@ -454,6 +459,6 @@ gnc_sql_init_recurrence_handler( void )
NULL /* write */
};
- (void)qof_object_register_backend( TABLE_NAME, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (TABLE_NAME, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-recurrence-sql.h b/src/backend/sql/gnc-recurrence-sql.h
index c03826e..9466d00 100644
--- a/src/backend/sql/gnc-recurrence-sql.h
+++ b/src/backend/sql/gnc-recurrence-sql.h
@@ -36,12 +36,14 @@ extern "C"
}
#include "gnc-backend-sql.h"
-gboolean gnc_sql_recurrence_save( GncSqlBackend* be, const GncGUID* guid, const Recurrence* pRecurrence );
-void gnc_sql_recurrence_save_list( GncSqlBackend* be, const GncGUID* guid, GList* schedule );
-gboolean gnc_sql_recurrence_delete( GncSqlBackend* be, const GncGUID* guid );
-Recurrence* gnc_sql_recurrence_load( GncSqlBackend* be, const GncGUID* guid );
-GList* gnc_sql_recurrence_load_list( GncSqlBackend* be, const GncGUID* guid );
+gboolean gnc_sql_recurrence_save (GncSqlBackend* be, const GncGUID* guid,
+ const Recurrence* pRecurrence);
+void gnc_sql_recurrence_save_list (GncSqlBackend* be, const GncGUID* guid,
+ GList* schedule);
+gboolean gnc_sql_recurrence_delete (GncSqlBackend* be, const GncGUID* guid);
+Recurrence* gnc_sql_recurrence_load (GncSqlBackend* be, const GncGUID* guid);
+GList* gnc_sql_recurrence_load_list (GncSqlBackend* be, const GncGUID* guid);
-void gnc_sql_init_recurrence_handler( void );
+void gnc_sql_init_recurrence_handler (void);
#endif /* GNC_RECURRENCE_SQL_H */
diff --git a/src/backend/sql/gnc-schedxaction-sql.cpp b/src/backend/sql/gnc-schedxaction-sql.cpp
index be8c423..9cce493 100644
--- a/src/backend/sql/gnc-schedxaction-sql.cpp
+++ b/src/backend/sql/gnc-schedxaction-sql.cpp
@@ -76,92 +76,92 @@ static const GncSqlColumnTableEntry col_table[] =
/* ================================================================= */
static SchedXaction*
-load_single_sx( GncSqlBackend* be, GncSqlRow* row )
+load_single_sx (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
SchedXaction* pSx;
GList* schedule;
GDate start_date;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- g_assert( guid != NULL );
- pSx = xaccSchedXactionMalloc( be->book );
+ guid = gnc_sql_load_guid (be, row);
+ g_assert (guid != NULL);
+ pSx = xaccSchedXactionMalloc (be->book);
- gnc_sx_begin_edit( pSx );
- gnc_sql_load_object( be, row, GNC_SX_ID, pSx, col_table );
- schedule = gnc_sql_recurrence_load_list( be, guid );
- gnc_sx_set_schedule( pSx, schedule );
- gnc_sx_commit_edit( pSx );
- gnc_sql_transaction_load_tx_for_account( be, pSx->template_acct );
+ gnc_sx_begin_edit (pSx);
+ gnc_sql_load_object (be, row, GNC_SX_ID, pSx, col_table);
+ schedule = gnc_sql_recurrence_load_list (be, guid);
+ gnc_sx_set_schedule (pSx, schedule);
+ gnc_sx_commit_edit (pSx);
+ gnc_sql_transaction_load_tx_for_account (be, pSx->template_acct);
- g_object_get(pSx, "start-date", &start_date, NULL);
+ g_object_get (pSx, "start-date", &start_date, NULL);
return pSx;
}
static void
-load_all_sxes( GncSqlBackend* be )
+load_all_sxes (GncSqlBackend* be)
{
GncSqlStatement* stmt = NULL;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, SCHEDXACTION_TABLE );
- if ( stmt == NULL ) return;
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, SCHEDXACTION_TABLE);
+ if (stmt == NULL) return;
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
- SchedXactions *sxes;
+ SchedXactions* sxes;
GList* list = NULL;
- sxes = gnc_book_get_schedxactions( be->book );
+ sxes = gnc_book_get_schedxactions (be->book);
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
SchedXaction* sx;
- sx = load_single_sx( be, row );
- if ( sx != NULL )
+ sx = load_single_sx (be, row);
+ if (sx != NULL)
{
- gnc_sxes_add_sx( sxes, sx );
- list = g_list_prepend( list, sx );
+ gnc_sxes_add_sx (sxes, sx);
+ list = g_list_prepend (list, sx);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
/* ================================================================= */
static void
-create_sx_tables( GncSqlBackend* be )
+create_sx_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, SCHEDXACTION_TABLE );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, SCHEDXACTION_TABLE);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, SCHEDXACTION_TABLE, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, SCHEDXACTION_TABLE, TABLE_VERSION, col_table);
}
}
/* ================================================================= */
gboolean
-gnc_sql_save_schedxaction( GncSqlBackend* be, QofInstance* inst )
+gnc_sql_save_schedxaction (GncSqlBackend* be, QofInstance* inst)
{
SchedXaction* pSx;
const GncGUID* guid;
@@ -169,18 +169,18 @@ gnc_sql_save_schedxaction( GncSqlBackend* be, QofInstance* inst )
gboolean is_infant;
gboolean is_ok;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_SX(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_SX (inst), FALSE);
- pSx = GNC_SX(inst);
+ pSx = GNC_SX (inst);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -188,27 +188,28 @@ gnc_sql_save_schedxaction( GncSqlBackend* be, QofInstance* inst )
{
op = OP_DB_UPDATE;
}
- is_ok = gnc_sql_do_db_operation( be, op, SCHEDXACTION_TABLE, GNC_SX_ID, pSx, col_table );
- guid = qof_instance_get_guid( inst );
- if ( op == OP_DB_INSERT || op == OP_DB_UPDATE )
+ is_ok = gnc_sql_do_db_operation (be, op, SCHEDXACTION_TABLE, GNC_SX_ID, pSx,
+ col_table);
+ guid = qof_instance_get_guid (inst);
+ if (op == OP_DB_INSERT || op == OP_DB_UPDATE)
{
- gnc_sql_recurrence_save_list( be, guid, gnc_sx_get_schedule( pSx ) );
+ gnc_sql_recurrence_save_list (be, guid, gnc_sx_get_schedule (pSx));
}
else
{
- gnc_sql_recurrence_delete( be, guid );
+ gnc_sql_recurrence_delete (be, guid);
}
- if ( is_ok )
+ if (is_ok)
{
// Now, commit any slots
- if ( op == OP_DB_INSERT || op == OP_DB_UPDATE )
+ if (op == OP_DB_INSERT || op == OP_DB_UPDATE)
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
+ is_ok = gnc_sql_slots_delete (be, guid);
}
}
@@ -217,7 +218,7 @@ gnc_sql_save_schedxaction( GncSqlBackend* be, QofInstance* inst )
/* ================================================================= */
void
-gnc_sql_init_schedxaction_handler( void )
+gnc_sql_init_schedxaction_handler (void)
{
static GncSqlObjectBackend be_data =
{
@@ -232,6 +233,7 @@ gnc_sql_init_schedxaction_handler( void )
NULL /* write */
};
- (void)qof_object_register_backend( GNC_ID_SCHEDXACTION, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (GNC_ID_SCHEDXACTION, GNC_SQL_BACKEND,
+ &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-schedxaction-sql.h b/src/backend/sql/gnc-schedxaction-sql.h
index bed1a1e..3b22713 100644
--- a/src/backend/sql/gnc-schedxaction-sql.h
+++ b/src/backend/sql/gnc-schedxaction-sql.h
@@ -34,7 +34,7 @@ extern "C"
}
#include "gnc-backend-sql.h"
-void gnc_sql_init_schedxaction_handler( void );
-gboolean gnc_sql_save_schedxaction( GncSqlBackend* be, QofInstance* inst );
+void gnc_sql_init_schedxaction_handler (void);
+gboolean gnc_sql_save_schedxaction (GncSqlBackend* be, QofInstance* inst);
#endif /* GNC_SCHEDXACTION_SQL_H */
diff --git a/src/backend/sql/gnc-slots-sql.cpp b/src/backend/sql/gnc-slots-sql.cpp
index 67209f7..06983ba 100644
--- a/src/backend/sql/gnc-slots-sql.cpp
+++ b/src/backend/sql/gnc-slots-sql.cpp
@@ -43,7 +43,7 @@ extern "C"
#include <kvp_frame.hpp>
- static QofLogModule log_module = G_LOG_DOMAIN;
+static QofLogModule log_module = G_LOG_DOMAIN;
#define TABLE_NAME "slots"
#define TABLE_VERSION 3
@@ -57,40 +57,40 @@ typedef enum
typedef struct
{
- GncSqlBackend* be;
+ GncSqlBackend* be;
const GncGUID* guid;
gboolean is_ok;
KvpFrame* pKvpFrame;
KvpValue::Type value_type;
- GList *pList;
+ GList* pList;
context_t context;
KvpValue* pKvpValue;
GString* path;
} slot_info_t;
-static gpointer get_obj_guid( gpointer pObject );
-static void set_obj_guid( void );
-static gpointer get_path( gpointer pObject );
-static void set_path( gpointer pObject, gpointer pValue );
-static KvpValue::Type get_slot_type( gpointer pObject );
-static void set_slot_type( gpointer pObject, gpointer pValue );
-static gint64 get_int64_val( gpointer pObject );
-static void set_int64_val( gpointer pObject, gint64 pValue );
-static gpointer get_string_val( gpointer pObject );
-static void set_string_val( gpointer pObject, gpointer pValue );
-static gpointer get_double_val( gpointer pObject );
-static void set_double_val( gpointer pObject, gpointer pValue );
-static Timespec get_timespec_val( gpointer pObject );
-static void set_timespec_val( gpointer pObject, Timespec ts );
-static gpointer get_guid_val( gpointer pObject );
-static void set_guid_val( gpointer pObject, gpointer pValue );
-static gnc_numeric get_numeric_val( gpointer pObject );
-static void set_numeric_val( gpointer pObject, gnc_numeric value );
-static GDate* get_gdate_val( gpointer pObject );
-static void set_gdate_val( gpointer pObject, GDate* value );
-static slot_info_t *slot_info_copy( slot_info_t *pInfo, GncGUID *guid );
-static void slots_load_info( slot_info_t *pInfo );
+static gpointer get_obj_guid (gpointer pObject);
+static void set_obj_guid (void);
+static gpointer get_path (gpointer pObject);
+static void set_path (gpointer pObject, gpointer pValue);
+static KvpValue::Type get_slot_type (gpointer pObject);
+static void set_slot_type (gpointer pObject, gpointer pValue);
+static gint64 get_int64_val (gpointer pObject);
+static void set_int64_val (gpointer pObject, gint64 pValue);
+static gpointer get_string_val (gpointer pObject);
+static void set_string_val (gpointer pObject, gpointer pValue);
+static gpointer get_double_val (gpointer pObject);
+static void set_double_val (gpointer pObject, gpointer pValue);
+static Timespec get_timespec_val (gpointer pObject);
+static void set_timespec_val (gpointer pObject, Timespec ts);
+static gpointer get_guid_val (gpointer pObject);
+static void set_guid_val (gpointer pObject, gpointer pValue);
+static gnc_numeric get_numeric_val (gpointer pObject);
+static void set_numeric_val (gpointer pObject, gnc_numeric value);
+static GDate* get_gdate_val (gpointer pObject);
+static void set_gdate_val (gpointer pObject, GDate* value);
+static slot_info_t* slot_info_copy (slot_info_t* pInfo, GncGUID* guid);
+static void slots_load_info (slot_info_t* pInfo);
#define SLOT_MAX_PATHNAME_LEN 4096
#define SLOT_MAX_STRINGVAL_LEN 4096
@@ -115,7 +115,7 @@ static const GncSqlColumnTableEntry col_table[] =
{ "id", CT_INT, 0, COL_PKEY | COL_NNUL | COL_AUTOINC },
{
"obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid
+ (QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid
},
{
"name", CT_STRING, SLOT_MAX_PATHNAME_LEN, COL_NNUL, NULL, NULL,
@@ -127,7 +127,7 @@ static const GncSqlColumnTableEntry col_table[] =
},
{
"int64_val", CT_INT64, 0, 0, NULL, NULL,
- (QofAccessFunc)get_int64_val, (QofSetterFunc)set_int64_val
+ (QofAccessFunc)get_int64_val, (QofSetterFunc)set_int64_val
},
{
"string_val", CT_STRING, SLOT_MAX_PATHNAME_LEN, 0, NULL, NULL,
@@ -172,58 +172,58 @@ static const GncSqlColumnTableEntry gdate_col_table[] =
/* ================================================================= */
-static gchar *
-get_key_from_path( GString *path )
+static gchar*
+get_key_from_path (GString* path)
{
- gchar *str = NULL, *key = NULL, *ret = NULL;
+ gchar* str = NULL, *key = NULL, *ret = NULL;
- g_return_val_if_fail( path != NULL, g_strdup("") );
+ g_return_val_if_fail (path != NULL, g_strdup (""));
- if ( path->str == NULL ) return g_strdup("");
- str = g_strdup( path->str );
- key = strrchr( str, '/');
+ if (path->str == NULL) return g_strdup ("");
+ str = g_strdup (path->str);
+ key = strrchr (str, '/');
/* Remove trailing /es */
- if ( key == NULL ) return str;
- while ( str + strlen(str) - key == 1 )
+ if (key == NULL) return str;
+ while (str + strlen (str) - key == 1)
{
*key = '\0';
- key = strrchr( str, '/' );
+ key = strrchr (str, '/');
}
- if ( key == NULL ) return str;
+ if (key == NULL) return str;
/* Now advance key past the last intermediate / to get the post-delimiter string */
- while ( *key == '/') ++key;
+ while (*key == '/') ++key;
ret = g_strdup (key);
- g_free( str );
+ g_free (str);
return ret;
}
-static gchar *
-get_path_from_path( GString *path )
+static gchar*
+get_path_from_path (GString* path)
{
- gchar *str = NULL, *key = NULL;
+ gchar* str = NULL, *key = NULL;
- g_return_val_if_fail( path != NULL, NULL );
+ g_return_val_if_fail (path != NULL, NULL);
- if ( path->str == NULL ) return NULL;
- str = g_strdup( path->str );
- key = strrchr( str, '/');
+ if (path->str == NULL) return NULL;
+ str = g_strdup (path->str);
+ key = strrchr (str, '/');
/* No /es means no path, just a key */
- if ( key == NULL )
+ if (key == NULL)
{
- g_free( str );
+ g_free (str);
return NULL;
}
/* Remove trailing /es */
- while ( str + strlen(str) - key == 1 )
+ while (str + strlen (str) - key == 1)
{
*key = '\0';
- key = strrchr( str, '/' );
+ key = strrchr (str, '/');
}
- if ( key == NULL )
+ if (key == NULL)
{
- g_free(str);
+ g_free (str);
return NULL;
}
/* reterminate the string at the slash */
@@ -233,117 +233,117 @@ get_path_from_path( GString *path )
}
static void
-set_slot_from_value( slot_info_t *pInfo, KvpValue *pValue)
+set_slot_from_value (slot_info_t* pInfo, KvpValue* pValue)
{
- g_return_if_fail( pInfo != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pInfo != NULL);
+ g_return_if_fail (pValue != NULL);
- switch ( pInfo->context)
+ switch (pInfo->context)
{
case FRAME:
{
- gchar *key = get_key_from_path( pInfo->path );
- pInfo->pKvpFrame->set(key, pValue);
- g_free( key );
+ gchar* key = get_key_from_path (pInfo->path);
+ pInfo->pKvpFrame->set (key, pValue);
+ g_free (key);
break;
}
case LIST:
{
- pInfo->pList = g_list_append(pInfo->pList, pValue);
+ pInfo->pList = g_list_append (pInfo->pList, pValue);
break;
}
case NONE:
default:
{
- gchar *key = get_key_from_path( pInfo->path );
- gchar *path = get_path_from_path( pInfo->path );
+ gchar* key = get_key_from_path (pInfo->path);
+ gchar* path = get_path_from_path (pInfo->path);
auto frame = pInfo->pKvpFrame;
- if ( path )
+ if (path)
{
- frame->set_path({path, key}, pValue);
- g_free( path );
+ frame->set_path ({path, key}, pValue);
+ g_free (path);
}
else
- frame->set(key, pValue);
- g_free( key );
+ frame->set (key, pValue);
+ g_free (key);
break;
}
}
}
static gpointer
-get_obj_guid( gpointer pObject )
+get_obj_guid (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
return (gpointer)pInfo->guid;
}
static void
-set_obj_guid( void )
+set_obj_guid (void)
{
// Nowhere to put the GncGUID
}
static gpointer
-get_path( gpointer pObject )
+get_path (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
return (gpointer)pInfo->path->str;
}
static void
-set_path( gpointer pObject, gpointer pValue )
+set_path (gpointer pObject, gpointer pValue)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pValue != NULL);
- if ( pInfo->path != NULL )
+ if (pInfo->path != NULL)
{
- (void)g_string_free( pInfo->path, TRUE );
+ (void)g_string_free (pInfo->path, TRUE);
}
- pInfo->path = g_string_new( (gchar*)pValue );
+ pInfo->path = g_string_new ((gchar*)pValue);
}
static KvpValue::Type
-get_slot_type( gpointer pObject )
+get_slot_type (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, KvpValue::Type::INVALID );
+ g_return_val_if_fail (pObject != NULL, KvpValue::Type::INVALID);
// return (gpointer)kvp_value_get_type( pInfo->pKvpValue );
return pInfo->value_type;
}
static void
-set_slot_type( gpointer pObject, gpointer pValue )
+set_slot_type (gpointer pObject, gpointer pValue)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pValue != NULL);
- pInfo->value_type = static_cast<KvpValue::Type>(GPOINTER_TO_INT(pValue));
+ pInfo->value_type = static_cast<KvpValue::Type> (GPOINTER_TO_INT (pValue));
}
static gint64
-get_int64_val( gpointer pObject )
+get_int64_val (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, 0 );
+ g_return_val_if_fail (pObject != NULL, 0);
- if ( pInfo->pKvpValue->get_type() == KvpValue::Type::INT64 )
+ if (pInfo->pKvpValue->get_type () == KvpValue::Type::INT64)
{
- return pInfo->pKvpValue->get<int64_t>();
+ return pInfo->pKvpValue->get<int64_t> ();
}
else
{
@@ -352,28 +352,28 @@ get_int64_val( gpointer pObject )
}
static void
-set_int64_val( gpointer pObject, gint64 value )
+set_int64_val (gpointer pObject, gint64 value)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- KvpValue *pValue = NULL;
+ KvpValue* pValue = NULL;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail (pObject != NULL);
- if ( pInfo->value_type != KvpValue::Type::INT64 ) return;
- pValue = new KvpValue{value};
- set_slot_from_value( pInfo, pValue );
+ if (pInfo->value_type != KvpValue::Type::INT64) return;
+ pValue = new KvpValue {value};
+ set_slot_from_value (pInfo, pValue);
}
static gpointer
-get_string_val( gpointer pObject )
+get_string_val (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
- if ( pInfo->pKvpValue->get_type() == KvpValue::Type::STRING )
+ if (pInfo->pKvpValue->get_type () == KvpValue::Type::STRING)
{
- return (gpointer)pInfo->pKvpValue->get<const char*>();
+ return (gpointer)pInfo->pKvpValue->get<const char*> ();
}
else
{
@@ -382,29 +382,29 @@ get_string_val( gpointer pObject )
}
static void
-set_string_val( gpointer pObject, gpointer pValue )
+set_string_val (gpointer pObject, gpointer pValue)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail (pObject != NULL);
if (pInfo->value_type != KvpValue::Type::STRING || pValue == NULL)
return;
- auto string = g_strdup(static_cast<const char*>(pValue));
- auto value = new KvpValue{string};
- set_slot_from_value( pInfo, value );
+ auto string = g_strdup (static_cast<const char*> (pValue));
+ auto value = new KvpValue {string};
+ set_slot_from_value (pInfo, value);
}
static gpointer
-get_double_val( gpointer pObject )
+get_double_val (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
static double d_val;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
- if (pInfo->pKvpValue->get_type() == KvpValue::Type::DOUBLE)
+ if (pInfo->pKvpValue->get_type () == KvpValue::Type::DOUBLE)
{
- d_val = pInfo->pKvpValue->get<double>();
+ d_val = pInfo->pKvpValue->get<double> ();
return (gpointer)&d_val;
}
else
@@ -414,52 +414,52 @@ get_double_val( gpointer pObject )
}
static void
-set_double_val( gpointer pObject, gpointer pValue )
+set_double_val (gpointer pObject, gpointer pValue)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- KvpValue *value = NULL;
+ KvpValue* value = NULL;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail (pObject != NULL);
- if ( pInfo->value_type != KvpValue::Type::DOUBLE || pValue == NULL ) return;
- value = new KvpValue{*(static_cast<double*>(pValue))};
- set_slot_from_value( pInfo, value );
+ if (pInfo->value_type != KvpValue::Type::DOUBLE || pValue == NULL) return;
+ value = new KvpValue {* (static_cast<double*> (pValue))};
+ set_slot_from_value (pInfo, value);
}
static Timespec
-get_timespec_val( gpointer pObject )
+get_timespec_val (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, gnc_dmy2timespec( 1, 1, 1970 ) );
+ g_return_val_if_fail (pObject != NULL, gnc_dmy2timespec (1, 1, 1970));
//if( kvp_value_get_type( pInfo->pKvpValue ) == KvpValue::Type::TIMESPEC ) {
- return pInfo->pKvpValue->get<Timespec>();
+ return pInfo->pKvpValue->get<Timespec> ();
}
static void
-set_timespec_val( gpointer pObject, Timespec ts )
+set_timespec_val (gpointer pObject, Timespec ts)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- KvpValue *value = NULL;
+ KvpValue* value = NULL;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail (pObject != NULL);
- if ( pInfo->value_type != KvpValue::Type::TIMESPEC ) return;
- value = new KvpValue{ts};
- set_slot_from_value( pInfo, value );
+ if (pInfo->value_type != KvpValue::Type::TIMESPEC) return;
+ value = new KvpValue {ts};
+ set_slot_from_value (pInfo, value);
}
static gpointer
-get_guid_val( gpointer pObject )
+get_guid_val (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
- if (pInfo->pKvpValue->get_type() == KvpValue::Type::GUID)
+ if (pInfo->pKvpValue->get_type () == KvpValue::Type::GUID)
{
- return (gpointer)pInfo->pKvpValue->get<GncGUID*>();
+ return (gpointer)pInfo->pKvpValue->get<GncGUID*> ();
}
else
{
@@ -468,68 +468,68 @@ get_guid_val( gpointer pObject )
}
static void
-set_guid_val( gpointer pObject, gpointer pValue )
+set_guid_val (gpointer pObject, gpointer pValue)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_if_fail( pObject != NULL );
- if ( pValue == NULL ) return;
+ g_return_if_fail (pObject != NULL);
+ if (pValue == NULL) return;
- switch ( pInfo->value_type)
+ switch (pInfo->value_type)
{
case KvpValue::Type::GUID:
{
- auto new_guid = guid_copy(static_cast<GncGUID*>(pValue));
- set_slot_from_value(pInfo, new KvpValue{new_guid});
+ auto new_guid = guid_copy (static_cast<GncGUID*> (pValue));
+ set_slot_from_value (pInfo, new KvpValue {new_guid});
break;
}
case KvpValue::Type::GLIST:
{
- slot_info_t *newInfo = slot_info_copy( pInfo, (GncGUID*)pValue );
- KvpValue *pValue = NULL;
- gchar *key = get_key_from_path( pInfo->path );
+ slot_info_t* newInfo = slot_info_copy (pInfo, (GncGUID*)pValue);
+ KvpValue* pValue = NULL;
+ gchar* key = get_key_from_path (pInfo->path);
newInfo->context = LIST;
- slots_load_info( newInfo );
- pValue = new KvpValue{newInfo->pList};
- pInfo->pKvpFrame->set(key, pValue);
- g_string_free( newInfo->path, TRUE );
- g_slice_free( slot_info_t, newInfo );
- g_free( key );
+ slots_load_info (newInfo);
+ pValue = new KvpValue {newInfo->pList};
+ pInfo->pKvpFrame->set (key, pValue);
+ g_string_free (newInfo->path, TRUE);
+ g_slice_free (slot_info_t, newInfo);
+ g_free (key);
break;
}
case KvpValue::Type::FRAME:
{
- slot_info_t *newInfo = slot_info_copy( pInfo, (GncGUID*)pValue ) ;
+ slot_info_t* newInfo = slot_info_copy (pInfo, (GncGUID*)pValue) ;
auto newFrame = new KvpFrame;
newInfo->pKvpFrame = newFrame;
- switch ( pInfo->context )
+ switch (pInfo->context)
{
case LIST:
{
- auto value = new KvpValue{newFrame};
- gchar *key = get_key_from_path( pInfo->path );
- newInfo->path = g_string_assign( newInfo->path, key );
- pInfo->pList = g_list_append( pInfo->pList, value );
- g_free( key );
+ auto value = new KvpValue {newFrame};
+ gchar* key = get_key_from_path (pInfo->path);
+ newInfo->path = g_string_assign (newInfo->path, key);
+ pInfo->pList = g_list_append (pInfo->pList, value);
+ g_free (key);
break;
}
case FRAME:
default:
{
- gchar *key = get_key_from_path( pInfo->path );
- pInfo->pKvpFrame->set(key, new KvpValue{newFrame});
- g_free( key );
+ gchar* key = get_key_from_path (pInfo->path);
+ pInfo->pKvpFrame->set (key, new KvpValue {newFrame});
+ g_free (key);
break;
}
}
newInfo->context = FRAME;
- slots_load_info ( newInfo );
- g_string_free( newInfo->path, TRUE );
- g_slice_free( slot_info_t, newInfo );
+ slots_load_info (newInfo);
+ g_string_free (newInfo->path, TRUE);
+ g_slice_free (slot_info_t, newInfo);
break;
}
default:
@@ -538,45 +538,45 @@ set_guid_val( gpointer pObject, gpointer pValue )
}
static gnc_numeric
-get_numeric_val( gpointer pObject )
+get_numeric_val (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- g_return_val_if_fail( pObject != NULL, gnc_numeric_zero() );
+ g_return_val_if_fail (pObject != NULL, gnc_numeric_zero ());
- if (pInfo->pKvpValue->get_type() == KvpValue::Type::NUMERIC)
+ if (pInfo->pKvpValue->get_type () == KvpValue::Type::NUMERIC)
{
- return pInfo->pKvpValue->get<gnc_numeric>();
+ return pInfo->pKvpValue->get<gnc_numeric> ();
}
else
{
- return gnc_numeric_zero();
+ return gnc_numeric_zero ();
}
}
static void
-set_numeric_val( gpointer pObject, gnc_numeric value )
+set_numeric_val (gpointer pObject, gnc_numeric value)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- KvpValue *pValue = NULL;
+ KvpValue* pValue = NULL;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail (pObject != NULL);
- if ( pInfo->value_type != KvpValue::Type::NUMERIC ) return;
- set_slot_from_value(pInfo, new KvpValue{value});
+ if (pInfo->value_type != KvpValue::Type::NUMERIC) return;
+ set_slot_from_value (pInfo, new KvpValue {value});
}
static GDate*
-get_gdate_val( gpointer pObject )
+get_gdate_val (gpointer pObject)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
static GDate date;
- g_return_val_if_fail( pObject != NULL, NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
- if (pInfo->pKvpValue->get_type() == KvpValue::Type::GDATE)
+ if (pInfo->pKvpValue->get_type () == KvpValue::Type::GDATE)
{
- date = pInfo->pKvpValue->get<GDate>();
+ date = pInfo->pKvpValue->get<GDate> ();
return &date;
}
else
@@ -586,23 +586,23 @@ get_gdate_val( gpointer pObject )
}
static void
-set_gdate_val( gpointer pObject, GDate* value )
+set_gdate_val (gpointer pObject, GDate* value)
{
slot_info_t* pInfo = (slot_info_t*)pObject;
- KvpValue *pValue = NULL;
+ KvpValue* pValue = NULL;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail (pObject != NULL);
- if ( pInfo->value_type != KvpValue::Type::GDATE ) return;
- set_slot_from_value(pInfo, new KvpValue{*value});
+ if (pInfo->value_type != KvpValue::Type::GDATE) return;
+ set_slot_from_value (pInfo, new KvpValue {*value});
}
-static slot_info_t *
-slot_info_copy( slot_info_t *pInfo, GncGUID *guid )
+static slot_info_t*
+slot_info_copy (slot_info_t* pInfo, GncGUID* guid)
{
- slot_info_t *newSlot;
- g_return_val_if_fail( pInfo != NULL, NULL );
- newSlot = g_slice_new0(slot_info_t);
+ slot_info_t* newSlot;
+ g_return_val_if_fail (pInfo != NULL, NULL);
+ newSlot = g_slice_new0 (slot_info_t);
newSlot->be = pInfo->be;
newSlot->guid = guid == NULL ? pInfo->guid : guid;
@@ -612,296 +612,297 @@ slot_info_copy( slot_info_t *pInfo, GncGUID *guid )
newSlot->pList = pInfo->pList;
newSlot->context = pInfo->context;
newSlot->pKvpValue = pInfo->pKvpValue;
- newSlot->path = g_string_new(pInfo->path->str);
+ newSlot->path = g_string_new (pInfo->path->str);
return newSlot;
}
static void
-save_slot( const gchar* key, KvpValue* value, gpointer data )
+save_slot (const gchar* key, KvpValue* value, gpointer data)
{
slot_info_t* pSlot_info = (slot_info_t*)data;
gsize curlen;
- g_return_if_fail( key != NULL );
- g_return_if_fail( value != NULL );
- g_return_if_fail( data != NULL );
+ g_return_if_fail (key != NULL);
+ g_return_if_fail (value != NULL);
+ g_return_if_fail (data != NULL);
// Ignore if we've already run into a failure
- if ( !pSlot_info->is_ok )
+ if (!pSlot_info->is_ok)
{
return;
}
curlen = pSlot_info->path->len;
pSlot_info->pKvpValue = value;
- if ( curlen != 0 )
+ if (curlen != 0)
{
- (void)g_string_append( pSlot_info->path, "/" );
+ (void)g_string_append (pSlot_info->path, "/");
}
- (void)g_string_append( pSlot_info->path, key );
- pSlot_info->value_type = value->get_type();
+ (void)g_string_append (pSlot_info->path, key);
+ pSlot_info->value_type = value->get_type ();
- switch ( pSlot_info->value_type )
+ switch (pSlot_info->value_type)
{
case KvpValue::Type::FRAME:
{
- auto pKvpFrame = value->get<KvpFrame*>();
- auto guid = guid_new();
- slot_info_t *pNewInfo = slot_info_copy( pSlot_info, guid );
- KvpValue *oldValue = pSlot_info->pKvpValue;
- pSlot_info->pKvpValue = new KvpValue{guid};
- pSlot_info->is_ok = gnc_sql_do_db_operation( pSlot_info->be,
- OP_DB_INSERT, TABLE_NAME,
- TABLE_NAME, pSlot_info,
- col_table );
- g_return_if_fail( pSlot_info->is_ok );
- pKvpFrame->for_each_slot(save_slot, pNewInfo);
+ auto pKvpFrame = value->get<KvpFrame*> ();
+ auto guid = guid_new ();
+ slot_info_t* pNewInfo = slot_info_copy (pSlot_info, guid);
+ KvpValue* oldValue = pSlot_info->pKvpValue;
+ pSlot_info->pKvpValue = new KvpValue {guid};
+ pSlot_info->is_ok = gnc_sql_do_db_operation (pSlot_info->be,
+ OP_DB_INSERT, TABLE_NAME,
+ TABLE_NAME, pSlot_info,
+ col_table);
+ g_return_if_fail (pSlot_info->is_ok);
+ pKvpFrame->for_each_slot (save_slot, pNewInfo);
delete pSlot_info->pKvpValue;
pSlot_info->pKvpValue = oldValue;
- g_string_free( pNewInfo->path, TRUE );
- g_slice_free( slot_info_t, pNewInfo );
+ g_string_free (pNewInfo->path, TRUE);
+ g_slice_free (slot_info_t, pNewInfo);
}
break;
case KvpValue::Type::GLIST:
{
- GncGUID guid = guid_new_return();
- slot_info_t *pNewInfo = slot_info_copy( pSlot_info, &guid );
- KvpValue *oldValue = pSlot_info->pKvpValue;
- pSlot_info->pKvpValue = new KvpValue{&guid};
- pSlot_info->is_ok = gnc_sql_do_db_operation( pSlot_info->be,
- OP_DB_INSERT, TABLE_NAME,
- TABLE_NAME, pSlot_info,
- col_table );
- g_return_if_fail( pSlot_info->is_ok );
- for (auto cursor = value->get<GList*>(); cursor; cursor = cursor->next)
+ GncGUID guid = guid_new_return ();
+ slot_info_t* pNewInfo = slot_info_copy (pSlot_info, &guid);
+ KvpValue* oldValue = pSlot_info->pKvpValue;
+ pSlot_info->pKvpValue = new KvpValue {&guid};
+ pSlot_info->is_ok = gnc_sql_do_db_operation (pSlot_info->be,
+ OP_DB_INSERT, TABLE_NAME,
+ TABLE_NAME, pSlot_info,
+ col_table);
+ g_return_if_fail (pSlot_info->is_ok);
+ for (auto cursor = value->get<GList*> (); cursor; cursor = cursor->next)
{
- auto val = static_cast<KvpValue*>(cursor->data);
- save_slot("", val, pNewInfo);
+ auto val = static_cast<KvpValue*> (cursor->data);
+ save_slot ("", val, pNewInfo);
}
delete pSlot_info->pKvpValue;
pSlot_info->pKvpValue = oldValue;
- g_string_free( pNewInfo->path, TRUE );
- g_slice_free( slot_info_t, pNewInfo );
+ g_string_free (pNewInfo->path, TRUE);
+ g_slice_free (slot_info_t, pNewInfo);
}
break;
default:
{
- pSlot_info->is_ok = gnc_sql_do_db_operation( pSlot_info->be,
- OP_DB_INSERT, TABLE_NAME,
- TABLE_NAME, pSlot_info,
- col_table );
+ pSlot_info->is_ok = gnc_sql_do_db_operation (pSlot_info->be,
+ OP_DB_INSERT, TABLE_NAME,
+ TABLE_NAME, pSlot_info,
+ col_table);
}
break;
}
- (void)g_string_truncate( pSlot_info->path, curlen );
+ (void)g_string_truncate (pSlot_info->path, curlen);
}
gboolean
-gnc_sql_slots_save( GncSqlBackend* be, const GncGUID* guid, gboolean is_infant,
- QofInstance *inst)
+gnc_sql_slots_save (GncSqlBackend* be, const GncGUID* guid, gboolean is_infant,
+ QofInstance* inst)
{
- slot_info_t slot_info = { NULL, NULL, TRUE, NULL, KvpValue::Type::INVALID, NULL, FRAME, NULL, g_string_new(NULL) };
- KvpFrame *pFrame = qof_instance_get_slots (inst);
+ slot_info_t slot_info = { NULL, NULL, TRUE, NULL, KvpValue::Type::INVALID, NULL, FRAME, NULL, g_string_new (NULL) };
+ KvpFrame* pFrame = qof_instance_get_slots (inst);
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
- g_return_val_if_fail( pFrame != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (guid != NULL, FALSE);
+ g_return_val_if_fail (pFrame != NULL, FALSE);
// If this is not saving into a new db, clear out the old saved slots first
- if ( !be->is_pristine_db && !is_infant )
+ if (!be->is_pristine_db && !is_infant)
{
- (void)gnc_sql_slots_delete( be, guid );
+ (void)gnc_sql_slots_delete (be, guid);
}
slot_info.be = be;
slot_info.guid = guid;
- pFrame->for_each_slot(save_slot, &slot_info);
- (void)g_string_free( slot_info.path, TRUE );
+ pFrame->for_each_slot (save_slot, &slot_info);
+ (void)g_string_free (slot_info.path, TRUE);
return slot_info.is_ok;
}
gboolean
-gnc_sql_slots_delete( GncSqlBackend* be, const GncGUID* guid )
+gnc_sql_slots_delete (GncSqlBackend* be, const GncGUID* guid)
{
gchar* buf;
GncSqlResult* result;
gchar guid_buf[GUID_ENCODING_LENGTH + 1];
GncSqlStatement* stmt;
- slot_info_t slot_info = { NULL, NULL, TRUE, NULL, KvpValue::Type::INVALID, NULL, FRAME, NULL, g_string_new(NULL) };
+ slot_info_t slot_info = { NULL, NULL, TRUE, NULL, KvpValue::Type::INVALID, NULL, FRAME, NULL, g_string_new (NULL) };
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (guid != NULL, FALSE);
- (void)guid_to_string_buff( guid, guid_buf );
+ (void)guid_to_string_buff (guid, guid_buf);
- buf = g_strdup_printf( "SELECT * FROM %s WHERE obj_guid='%s' and slot_type in ('%d', '%d') and not guid_val is null",
- TABLE_NAME, guid_buf, KvpValue::Type::FRAME, KvpValue::Type::GLIST );
- stmt = gnc_sql_create_statement_from_sql( be, buf );
- g_free( buf );
- if ( stmt != NULL )
+ buf = g_strdup_printf ("SELECT * FROM %s WHERE obj_guid='%s' and slot_type in ('%d', '%d') and not guid_val is null",
+ TABLE_NAME, guid_buf, KvpValue::Type::FRAME, KvpValue::Type::GLIST);
+ stmt = gnc_sql_create_statement_from_sql (be, buf);
+ g_free (buf);
+ if (stmt != NULL)
{
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
- while ( row != NULL )
+ while (row != NULL)
{
GncSqlColumnTableEntry table_row = col_table[guid_val_col];
GncGUID child_guid;
const GValue* val =
- gnc_sql_row_get_value_at_col_name( row, table_row.col_name);
- if ( val == NULL )
+ gnc_sql_row_get_value_at_col_name (row, table_row.col_name);
+ if (val == NULL)
continue;
- (void)string_to_guid( g_value_get_string( val ), &child_guid );
- gnc_sql_slots_delete( be, &child_guid );
- row = gnc_sql_result_get_next_row( result );
+ (void)string_to_guid (g_value_get_string (val), &child_guid);
+ gnc_sql_slots_delete (be, &child_guid);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
}
slot_info.be = be;
slot_info.guid = guid;
slot_info.is_ok = TRUE;
- slot_info.is_ok = gnc_sql_do_db_operation( be, OP_DB_DELETE, TABLE_NAME,
- TABLE_NAME, &slot_info, obj_guid_col_table );
+ slot_info.is_ok = gnc_sql_do_db_operation (be, OP_DB_DELETE, TABLE_NAME,
+ TABLE_NAME, &slot_info, obj_guid_col_table);
return slot_info.is_ok;
}
static void
-load_slot( slot_info_t *pInfo, GncSqlRow* row )
+load_slot (slot_info_t* pInfo, GncSqlRow* row)
{
- slot_info_t *slot_info;
+ slot_info_t* slot_info;
- g_return_if_fail( pInfo != NULL );
- g_return_if_fail( pInfo->be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pInfo->pKvpFrame != NULL );
+ g_return_if_fail (pInfo != NULL);
+ g_return_if_fail (pInfo->be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pInfo->pKvpFrame != NULL);
- slot_info = slot_info_copy( pInfo, NULL );
- g_string_free( slot_info->path, TRUE );
+ slot_info = slot_info_copy (pInfo, NULL);
+ g_string_free (slot_info->path, TRUE);
slot_info->path = NULL;
- gnc_sql_load_object( pInfo->be, row, TABLE_NAME, slot_info, col_table );
+ gnc_sql_load_object (pInfo->be, row, TABLE_NAME, slot_info, col_table);
- if ( slot_info->path != NULL )
+ if (slot_info->path != NULL)
{
- (void)g_string_free( slot_info->path, TRUE );
+ (void)g_string_free (slot_info->path, TRUE);
}
- if ( slot_info->pList != pInfo->pList )
+ if (slot_info->pList != pInfo->pList)
{
if (pInfo->pList != NULL)
{
- PWARN("Load slot returned a different list than the original");
+ PWARN ("Load slot returned a different list than the original");
}
else
{
pInfo->pList = slot_info->pList;
}
}
- g_slice_free( slot_info_t, slot_info );
+ g_slice_free (slot_info_t, slot_info);
}
void
-gnc_sql_slots_load( GncSqlBackend* be, QofInstance* inst )
+gnc_sql_slots_load (GncSqlBackend* be, QofInstance* inst)
{
- slot_info_t info = { NULL, NULL, TRUE, NULL, KvpValue::Type::INVALID, NULL, FRAME, NULL, g_string_new(NULL) };
- g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
+ slot_info_t info = { NULL, NULL, TRUE, NULL, KvpValue::Type::INVALID, NULL, FRAME, NULL, g_string_new (NULL) };
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (inst != NULL);
info.be = be;
- info.guid = qof_instance_get_guid( inst );
- info.pKvpFrame = qof_instance_get_slots( inst );
+ info.guid = qof_instance_get_guid (inst);
+ info.pKvpFrame = qof_instance_get_slots (inst);
info.context = NONE;
- slots_load_info( &info );
+ slots_load_info (&info);
}
static void
-slots_load_info ( slot_info_t *pInfo )
+slots_load_info (slot_info_t* pInfo)
{
gchar* buf;
GncSqlResult* result;
gchar guid_buf[GUID_ENCODING_LENGTH + 1];
GncSqlStatement* stmt;
- g_return_if_fail( pInfo != NULL );
- g_return_if_fail( pInfo->be != NULL );
- g_return_if_fail( pInfo->guid != NULL );
- g_return_if_fail( pInfo->pKvpFrame != NULL );
+ g_return_if_fail (pInfo != NULL);
+ g_return_if_fail (pInfo->be != NULL);
+ g_return_if_fail (pInfo->guid != NULL);
+ g_return_if_fail (pInfo->pKvpFrame != NULL);
- (void)guid_to_string_buff( pInfo->guid, guid_buf );
+ (void)guid_to_string_buff (pInfo->guid, guid_buf);
- buf = g_strdup_printf( "SELECT * FROM %s WHERE obj_guid='%s'",
- TABLE_NAME, guid_buf );
- stmt = gnc_sql_create_statement_from_sql( pInfo->be, buf );
- g_free( buf );
- if ( stmt != NULL )
+ buf = g_strdup_printf ("SELECT * FROM %s WHERE obj_guid='%s'",
+ TABLE_NAME, guid_buf);
+ stmt = gnc_sql_create_statement_from_sql (pInfo->be, buf);
+ g_free (buf);
+ if (stmt != NULL)
{
- result = gnc_sql_execute_select_statement( pInfo->be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (pInfo->be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
- while ( row != NULL )
+ while (row != NULL)
{
- load_slot( pInfo, row );
- row = gnc_sql_result_get_next_row( result );
+ load_slot (pInfo, row);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
}
}
static const GncGUID*
-load_obj_guid( const GncSqlBackend* be, GncSqlRow* row )
+load_obj_guid (const GncSqlBackend* be, GncSqlRow* row)
{
static GncGUID guid;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- gnc_sql_load_object( be, row, NULL, &guid, obj_guid_col_table );
+ gnc_sql_load_object (be, row, NULL, &guid, obj_guid_col_table);
return &guid;
}
static void
-load_slot_for_list_item( GncSqlBackend* be, GncSqlRow* row, QofCollection* coll )
+load_slot_for_list_item (GncSqlBackend* be, GncSqlRow* row,
+ QofCollection* coll)
{
slot_info_t slot_info = { NULL, NULL, TRUE, NULL, KvpValue::Type::INVALID, NULL, FRAME, NULL, NULL };
const GncGUID* guid;
QofInstance* inst;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( coll != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (coll != NULL);
- guid = load_obj_guid( be, row );
- g_assert( guid != NULL );
- inst = qof_collection_lookup_entity( coll, guid );
+ guid = load_obj_guid (be, row);
+ g_assert (guid != NULL);
+ inst = qof_collection_lookup_entity (coll, guid);
slot_info.be = be;
- slot_info.pKvpFrame = qof_instance_get_slots( inst );
+ slot_info.pKvpFrame = qof_instance_get_slots (inst);
slot_info.context = NONE;
- gnc_sql_load_object( be, row, TABLE_NAME, &slot_info, col_table );
+ gnc_sql_load_object (be, row, TABLE_NAME, &slot_info, col_table);
- if ( slot_info.path != NULL )
+ if (slot_info.path != NULL)
{
- (void)g_string_free( slot_info.path, TRUE );
+ (void)g_string_free (slot_info.path, TRUE);
}
}
void
-gnc_sql_slots_load_for_list( GncSqlBackend* be, GList* list )
+gnc_sql_slots_load_for_list (GncSqlBackend* be, GList* list)
{
QofCollection* coll;
GncSqlStatement* stmt;
@@ -909,81 +910,84 @@ gnc_sql_slots_load_for_list( GncSqlBackend* be, GList* list )
GncSqlResult* result;
gboolean single_item;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
// Ignore empty list
- if ( list == NULL ) return;
+ if (list == NULL) return;
- coll = qof_instance_get_collection( QOF_INSTANCE(list->data) );
+ coll = qof_instance_get_collection (QOF_INSTANCE (list->data));
// Create the query for all slots for all items on the list
- sql = g_string_sized_new( 40 + (GUID_ENCODING_LENGTH + 3) * g_list_length( list ) );
- g_string_append_printf( sql, "SELECT * FROM %s WHERE %s ", TABLE_NAME, obj_guid_col_table[0].col_name );
- if ( g_list_length( list ) != 1 )
+ sql = g_string_sized_new (40 + (GUID_ENCODING_LENGTH + 3) * g_list_length (
+ list));
+ g_string_append_printf (sql, "SELECT * FROM %s WHERE %s ", TABLE_NAME,
+ obj_guid_col_table[0].col_name);
+ if (g_list_length (list) != 1)
{
- (void)g_string_append( sql, "IN (" );
+ (void)g_string_append (sql, "IN (");
single_item = FALSE;
}
else
{
- (void)g_string_append( sql, "= " );
+ (void)g_string_append (sql, "= ");
single_item = TRUE;
}
- (void)gnc_sql_append_guid_list_to_sql( sql, list, G_MAXUINT );
- if ( !single_item )
+ (void)gnc_sql_append_guid_list_to_sql (sql, list, G_MAXUINT);
+ if (!single_item)
{
- (void)g_string_append( sql, ")" );
+ (void)g_string_append (sql, ")");
}
// Execute the query and load the slots
- stmt = gnc_sql_create_statement_from_sql( be, sql->str );
- if ( stmt == NULL )
+ stmt = gnc_sql_create_statement_from_sql (be, sql->str);
+ if (stmt == NULL)
{
- PERR( "stmt == NULL, SQL = '%s'\n", sql->str );
- (void)g_string_free( sql, TRUE );
+ PERR ("stmt == NULL, SQL = '%s'\n", sql->str);
+ (void)g_string_free (sql, TRUE);
return;
}
- (void)g_string_free( sql, TRUE );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ (void)g_string_free (sql, TRUE);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
- while ( row != NULL )
+ while (row != NULL)
{
- load_slot_for_list_item( be, row, coll );
- row = gnc_sql_result_get_next_row( result );
+ load_slot_for_list_item (be, row, coll);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
}
static void
-load_slot_for_book_object( GncSqlBackend* be, GncSqlRow* row, BookLookupFn lookup_fn )
+load_slot_for_book_object (GncSqlBackend* be, GncSqlRow* row,
+ BookLookupFn lookup_fn)
{
slot_info_t slot_info = { NULL, NULL, TRUE, NULL, KvpValue::Type::INVALID, NULL, FRAME, NULL, NULL };
const GncGUID* guid;
QofInstance* inst;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( lookup_fn != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (lookup_fn != NULL);
- guid = load_obj_guid( be, row );
- g_return_if_fail( guid != NULL );
- inst = lookup_fn( guid, be->book );
- g_return_if_fail( inst != NULL );
+ guid = load_obj_guid (be, row);
+ g_return_if_fail (guid != NULL);
+ inst = lookup_fn (guid, be->book);
+ g_return_if_fail (inst != NULL);
slot_info.be = be;
- slot_info.pKvpFrame = qof_instance_get_slots( inst );
+ slot_info.pKvpFrame = qof_instance_get_slots (inst);
slot_info.path = NULL;
- gnc_sql_load_object( be, row, TABLE_NAME, &slot_info, col_table );
+ gnc_sql_load_object (be, row, TABLE_NAME, &slot_info, col_table);
- if ( slot_info.path != NULL )
+ if (slot_info.path != NULL)
{
- (void)g_string_free( slot_info.path, TRUE );
+ (void)g_string_free (slot_info.path, TRUE);
}
}
@@ -996,97 +1000,101 @@ load_slot_for_book_object( GncSqlBackend* be, GncSqlRow* row, BookLookupFn looku
* @param subquery Subquery SQL string
* @param lookup_fn Lookup function
*/
-void gnc_sql_slots_load_for_sql_subquery( GncSqlBackend* be, const gchar* subquery,
- BookLookupFn lookup_fn )
+void gnc_sql_slots_load_for_sql_subquery (GncSqlBackend* be,
+ const gchar* subquery,
+ BookLookupFn lookup_fn)
{
gchar* sql;
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
// Ignore empty subquery
- if ( subquery == NULL ) return;
+ if (subquery == NULL) return;
- sql = g_strdup_printf( "SELECT * FROM %s WHERE %s IN (%s)",
+ sql = g_strdup_printf ("SELECT * FROM %s WHERE %s IN (%s)",
TABLE_NAME, obj_guid_col_table[0].col_name,
- subquery );
+ subquery);
// Execute the query and load the slots
- stmt = gnc_sql_create_statement_from_sql( be, sql );
- if ( stmt == NULL )
+ stmt = gnc_sql_create_statement_from_sql (be, sql);
+ if (stmt == NULL)
{
- PERR( "stmt == NULL, SQL = '%s'\n", sql );
- g_free( sql );
+ PERR ("stmt == NULL, SQL = '%s'\n", sql);
+ g_free (sql);
return;
}
- g_free( sql );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ g_free (sql);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
- GncSqlRow* row = gnc_sql_result_get_first_row( result );
+ GncSqlRow* row = gnc_sql_result_get_first_row (result);
- while ( row != NULL )
+ while (row != NULL)
{
- load_slot_for_book_object( be, row, lookup_fn );
- row = gnc_sql_result_get_next_row( result );
+ load_slot_for_book_object (be, row, lookup_fn);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
}
/* ================================================================= */
static void
-create_slots_tables( GncSqlBackend* be )
+create_slots_tables (GncSqlBackend* be)
{
gint version;
gboolean ok;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ (void)gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
- ok = gnc_sql_create_index( be, "slots_guid_index", TABLE_NAME, obj_guid_col_table );
- if ( !ok )
+ ok = gnc_sql_create_index (be, "slots_guid_index", TABLE_NAME,
+ obj_guid_col_table);
+ if (!ok)
{
- PERR( "Unable to create index\n" );
+ PERR ("Unable to create index\n");
}
}
- else if ( version < TABLE_VERSION )
+ else if (version < TABLE_VERSION)
{
/* Upgrade:
1->2: 64-bit int values to proper definition, add index
2->3: Add gdate field
*/
- if ( version == 1 )
+ if (version == 1)
{
- gnc_sql_upgrade_table( be, TABLE_NAME, col_table );
- ok = gnc_sql_create_index( be, "slots_guid_index", TABLE_NAME, obj_guid_col_table );
- if ( !ok )
+ gnc_sql_upgrade_table (be, TABLE_NAME, col_table);
+ ok = gnc_sql_create_index (be, "slots_guid_index", TABLE_NAME,
+ obj_guid_col_table);
+ if (!ok)
{
- PERR( "Unable to create index\n" );
+ PERR ("Unable to create index\n");
}
}
- else if ( version == 2 )
+ else if (version == 2)
{
- ok = gnc_sql_add_columns_to_table( be, TABLE_NAME, gdate_col_table );
- if ( !ok )
+ ok = gnc_sql_add_columns_to_table (be, TABLE_NAME, gdate_col_table);
+ if (!ok)
{
- PERR( "Unable to add gdate column\n" );
+ PERR ("Unable to add gdate column\n");
}
}
- (void)gnc_sql_set_table_version( be, TABLE_NAME, TABLE_VERSION );
- PINFO("Slots table upgraded from version %d to version %d\n", version, TABLE_VERSION);
+ (void)gnc_sql_set_table_version (be, TABLE_NAME, TABLE_VERSION);
+ PINFO ("Slots table upgraded from version %d to version %d\n", version,
+ TABLE_VERSION);
}
}
/* ================================================================= */
void
-gnc_sql_init_slots_handler( void )
+gnc_sql_init_slots_handler (void)
{
static GncSqlObjectBackend be_data =
{
@@ -1101,6 +1109,6 @@ gnc_sql_init_slots_handler( void )
NULL /* write */
};
- (void)qof_object_register_backend( TABLE_NAME, GNC_SQL_BACKEND, &be_data );
+ (void)qof_object_register_backend (TABLE_NAME, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-slots-sql.h b/src/backend/sql/gnc-slots-sql.h
index 6a413cd..6690777 100644
--- a/src/backend/sql/gnc-slots-sql.h
+++ b/src/backend/sql/gnc-slots-sql.h
@@ -45,8 +45,8 @@ extern "C"
* @param inst The QodInstance owning the slots.
* @return TRUE if successful, FALSE if error
*/
-gboolean gnc_sql_slots_save( GncSqlBackend* be, const GncGUID* guid,
- gboolean is_infant, QofInstance *inst );
+gboolean gnc_sql_slots_save (GncSqlBackend* be, const GncGUID* guid,
+ gboolean is_infant, QofInstance* inst);
/**
* gnc_sql_slots_delete - Deletes slots for an object from the db.
@@ -55,13 +55,13 @@ gboolean gnc_sql_slots_save( GncSqlBackend* be, const GncGUID* guid,
* @param guid Object guid
* @return TRUE if successful, FALSE if error
*/
-gboolean gnc_sql_slots_delete( GncSqlBackend* be, const GncGUID* guid );
+gboolean gnc_sql_slots_delete (GncSqlBackend* be, const GncGUID* guid);
/** Loads slots for an object from the db.
*
* @param be SQL backend
*/
-void gnc_sql_slots_load( GncSqlBackend* be, QofInstance* inst );
+void gnc_sql_slots_load (GncSqlBackend* be, QofInstance* inst);
/**
* gnc_sql_slots_load_for_list - Loads slots for a list of objects from the db.
@@ -71,9 +71,10 @@ void gnc_sql_slots_load( GncSqlBackend* be, QofInstance* inst );
* @param be SQL backend
* @param list List of objects
*/
-void gnc_sql_slots_load_for_list( GncSqlBackend* be, GList* list );
+void gnc_sql_slots_load_for_list (GncSqlBackend* be, GList* list);
-typedef QofInstance* (*BookLookupFn)( const GncGUID* guid, const QofBook* book );
+typedef QofInstance* (*BookLookupFn) (const GncGUID* guid,
+ const QofBook* book);
/**
* gnc_sql_slots_load_for_sql_subquery - Loads slots for all objects whose guid is
@@ -84,9 +85,10 @@ typedef QofInstance* (*BookLookupFn)( const GncGUID* guid, const QofBook* book )
* @param subquery Subquery SQL string
* @param lookup_fn Lookup function to get the right object from the book
*/
-void gnc_sql_slots_load_for_sql_subquery( GncSqlBackend* be, const gchar* subquery,
- BookLookupFn lookup_fn );
+void gnc_sql_slots_load_for_sql_subquery (GncSqlBackend* be,
+ const gchar* subquery,
+ BookLookupFn lookup_fn);
-void gnc_sql_init_slots_handler( void );
+void gnc_sql_init_slots_handler (void);
#endif /* GNC_SLOTS_SQL_H */
diff --git a/src/backend/sql/gnc-tax-table-sql.cpp b/src/backend/sql/gnc-tax-table-sql.cpp
index b279f8f..4f56eea 100644
--- a/src/backend/sql/gnc-tax-table-sql.cpp
+++ b/src/backend/sql/gnc-tax-table-sql.cpp
@@ -43,7 +43,7 @@ extern "C"
#include "gnc-slots-sql.h"
#include "gnc-tax-table-sql.h"
-#define _GNC_MOD_NAME GNC_ID_TAXTABLE
+#define _GNC_MOD_NAME GNC_ID_TAXTABLE
static QofLogModule log_module = G_LOG_DOMAIN;
@@ -53,11 +53,11 @@ typedef struct
const GncGUID* guid;
} guid_info_t;
-static gpointer get_obj_guid( gpointer pObject, const QofParam* param );
-static void set_obj_guid( gpointer pObject, gpointer pValue );
-static gpointer bt_get_parent( gpointer pObject );
-static void tt_set_parent( gpointer pObject, gpointer pValue );
-static void tt_set_parent_guid( gpointer pObject, gpointer pValue );
+static gpointer get_obj_guid (gpointer pObject, const QofParam* param);
+static void set_obj_guid (gpointer pObject, gpointer pValue);
+static gpointer bt_get_parent (gpointer pObject);
+static void tt_set_parent (gpointer pObject, gpointer pValue);
+static void tt_set_parent_guid (gpointer pObject, gpointer pValue);
#define MAX_NAME_LEN 50
@@ -70,10 +70,10 @@ static GncSqlColumnTableEntry tt_col_table[] =
{ "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, "name" },
{ "refcount", CT_INT64, 0, COL_NNUL, "ref-count" },
{ "invisible", CT_BOOLEAN, 0, COL_NNUL, "invisible" },
- /* { "child", CT_TAXTABLEREF, 0, 0, NULL, NULL,
- get_child, (QofSetterFunc)gncTaxTableSetChild }, */
+ /* { "child", CT_TAXTABLEREF, 0, 0, NULL, NULL,
+ get_child, (QofSetterFunc)gncTaxTableSetChild }, */
{
- "parent", CT_GUID, 0, 0, NULL, NULL,
+ "parent", CT_GUID, 0, 0, NULL, NULL,
(QofAccessFunc)bt_get_parent, tt_set_parent
},
{ NULL }
@@ -120,224 +120,225 @@ static GncSqlColumnTableEntry guid_col_table[] =
typedef struct
{
- GncTaxTable* tt;
+ GncTaxTable* tt;
GncGUID guid;
gboolean have_guid;
} taxtable_parent_guid_struct;
static gpointer
-get_obj_guid( gpointer pObject, const QofParam* param )
+get_obj_guid (gpointer pObject, const QofParam* param)
{
guid_info_t* pInfo = (guid_info_t*)pObject;
- g_return_val_if_fail( pInfo != NULL, NULL );
+ g_return_val_if_fail (pInfo != NULL, NULL);
return (gpointer)pInfo->guid;
}
static void
-set_obj_guid( gpointer pObject, gpointer pValue )
+set_obj_guid (gpointer pObject, gpointer pValue)
{
// Nowhere to put the GncGUID
}
static gpointer
-bt_get_parent( gpointer pObject )
+bt_get_parent (gpointer pObject)
{
const GncTaxTable* tt;
const GncTaxTable* pParent;
const GncGUID* parent_guid;
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_TAXTABLE(pObject), NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (GNC_IS_TAXTABLE (pObject), NULL);
- tt = GNC_TAXTABLE(pObject);
- pParent = gncTaxTableGetParent( tt );
- if ( pParent == NULL )
+ tt = GNC_TAXTABLE (pObject);
+ pParent = gncTaxTableGetParent (tt);
+ if (pParent == NULL)
{
parent_guid = NULL;
}
else
{
- parent_guid = qof_instance_get_guid( QOF_INSTANCE(pParent) );
+ parent_guid = qof_instance_get_guid (QOF_INSTANCE (pParent));
}
return (gpointer)parent_guid;
}
static void
-tt_set_parent( gpointer data, gpointer value )
+tt_set_parent (gpointer data, gpointer value)
{
GncTaxTable* tt;
GncTaxTable* parent;
QofBook* pBook;
GncGUID* guid = (GncGUID*)value;
- g_return_if_fail( data != NULL );
- g_return_if_fail( GNC_IS_TAXTABLE(data) );
+ g_return_if_fail (data != NULL);
+ g_return_if_fail (GNC_IS_TAXTABLE (data));
- tt = GNC_TAXTABLE(data);
- pBook = qof_instance_get_book( QOF_INSTANCE(tt) );
- if ( guid != NULL )
+ tt = GNC_TAXTABLE (data);
+ pBook = qof_instance_get_book (QOF_INSTANCE (tt));
+ if (guid != NULL)
{
- parent = gncTaxTableLookup( pBook, guid );
- if ( parent != NULL )
+ parent = gncTaxTableLookup (pBook, guid);
+ if (parent != NULL)
{
- gncTaxTableSetParent( tt, parent );
- gncTaxTableSetChild( parent, tt );
+ gncTaxTableSetParent (tt, parent);
+ gncTaxTableSetChild (parent, tt);
}
}
}
static void
-tt_set_parent_guid( gpointer pObject, gpointer pValue )
+tt_set_parent_guid (gpointer pObject, gpointer pValue)
{
taxtable_parent_guid_struct* s = (taxtable_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pValue != NULL);
s->guid = *guid;
s->have_guid = TRUE;
}
static void
-load_single_ttentry( GncSqlBackend* be, GncSqlRow* row, GncTaxTable* tt )
+load_single_ttentry (GncSqlBackend* be, GncSqlRow* row, GncTaxTable* tt)
{
- GncTaxTableEntry* e = gncTaxTableEntryCreate();
+ GncTaxTableEntry* e = gncTaxTableEntryCreate ();
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( tt != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (tt != NULL);
- gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, e, ttentries_col_table );
- gncTaxTableAddEntry( tt, e );
+ gnc_sql_load_object (be, row, GNC_ID_TAXTABLE, e, ttentries_col_table);
+ gncTaxTableAddEntry (tt, e);
}
static void
-load_taxtable_entries( GncSqlBackend* be, GncTaxTable* tt )
+load_taxtable_entries (GncSqlBackend* be, GncTaxTable* tt)
{
GncSqlResult* result;
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
GValue value;
gchar* buf;
GncSqlStatement* stmt;
- g_return_if_fail( be != NULL );
- g_return_if_fail( tt != NULL );
-
- guid_to_string_buff( qof_instance_get_guid( QOF_INSTANCE(tt) ), guid_buf );
- memset( &value, 0, sizeof( GValue ) );
- g_value_init( &value, G_TYPE_STRING );
- g_value_set_string( &value, guid_buf );
- buf = g_strdup_printf( "SELECT * FROM %s WHERE taxtable='%s'", TTENTRIES_TABLE_NAME, guid_buf );
- stmt = gnc_sql_connection_create_statement_from_sql( be->conn, buf );
- g_free( buf );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (tt != NULL);
+
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (tt)), guid_buf);
+ memset (&value, 0, sizeof (GValue));
+ g_value_init (&value, G_TYPE_STRING);
+ g_value_set_string (&value, guid_buf);
+ buf = g_strdup_printf ("SELECT * FROM %s WHERE taxtable='%s'",
+ TTENTRIES_TABLE_NAME, guid_buf);
+ stmt = gnc_sql_connection_create_statement_from_sql (be->conn, buf);
+ g_free (buf);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- load_single_ttentry( be, row, tt );
- row = gnc_sql_result_get_next_row( result );
+ load_single_ttentry (be, row, tt);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
}
static void
-load_single_taxtable( GncSqlBackend* be, GncSqlRow* row,
- GList** l_tt_needing_parents )
+load_single_taxtable (GncSqlBackend* be, GncSqlRow* row,
+ GList** l_tt_needing_parents)
{
const GncGUID* guid;
GncTaxTable* tt;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
- guid = gnc_sql_load_guid( be, row );
- tt = gncTaxTableLookup( be->book, guid );
- if ( tt == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ tt = gncTaxTableLookup (be->book, guid);
+ if (tt == NULL)
{
- tt = gncTaxTableCreate( be->book );
+ tt = gncTaxTableCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, tt, tt_col_table );
- gnc_sql_slots_load( be, QOF_INSTANCE(tt) );
- load_taxtable_entries( be, tt );
+ gnc_sql_load_object (be, row, GNC_ID_TAXTABLE, tt, tt_col_table);
+ gnc_sql_slots_load (be, QOF_INSTANCE (tt));
+ load_taxtable_entries (be, tt);
/* If the tax table doesn't have a parent, it might be because it hasn't been loaded yet.
If so, add this tax table to the list of tax tables with no parent, along with the parent
GncGUID so that after they are all loaded, the parents can be fixed up. */
- if ( gncTaxTableGetParent( tt ) == NULL )
+ if (gncTaxTableGetParent (tt) == NULL)
{
- taxtable_parent_guid_struct* s = static_cast<decltype(s)>(
- g_malloc(sizeof(taxtable_parent_guid_struct)));
- g_assert( s != NULL );
+ taxtable_parent_guid_struct* s = static_cast<decltype (s)> (
+ g_malloc (sizeof (taxtable_parent_guid_struct)));
+ g_assert (s != NULL);
s->tt = tt;
s->have_guid = FALSE;
- gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, s, tt_parent_col_table );
- if ( s->have_guid )
+ gnc_sql_load_object (be, row, GNC_ID_TAXTABLE, s, tt_parent_col_table);
+ if (s->have_guid)
{
- *l_tt_needing_parents = g_list_prepend( *l_tt_needing_parents, s );
+ *l_tt_needing_parents = g_list_prepend (*l_tt_needing_parents, s);
}
else
{
- g_free( s );
+ g_free (s);
}
}
- qof_instance_mark_clean( QOF_INSTANCE(tt) );
+ qof_instance_mark_clean (QOF_INSTANCE (tt));
}
static void
-load_all_taxtables( GncSqlBackend* be )
+load_all_taxtables (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
/* First time, create the query */
- stmt = gnc_sql_create_select_statement( be, TT_TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TT_TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
GList* tt_needing_parents = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- load_single_taxtable( be, row, &tt_needing_parents );
- row = gnc_sql_result_get_next_row( result );
+ load_single_taxtable (be, row, &tt_needing_parents);
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
/* While there are items on the list of taxtables needing parents,
try to see if the parent has now been loaded. Theory says that if
items are removed from the front and added to the back if the
parent is still not available, then eventually, the list will
shrink to size 0. */
- if ( tt_needing_parents != NULL )
+ if (tt_needing_parents != NULL)
{
gboolean progress_made = TRUE;
GList* elem;
- while ( progress_made )
+ while (progress_made)
{
progress_made = FALSE;
- for ( elem = tt_needing_parents; elem != NULL; elem = g_list_next( elem ) )
+ for (elem = tt_needing_parents; elem != NULL; elem = g_list_next (elem))
{
taxtable_parent_guid_struct* s = (taxtable_parent_guid_struct*)elem->data;
- tt_set_parent( s->tt, &s->guid );
- tt_needing_parents = g_list_delete_link( tt_needing_parents, elem );
+ tt_set_parent (s->tt, &s->guid);
+ tt_needing_parents = g_list_delete_link (tt_needing_parents, elem);
progress_made = TRUE;
}
}
@@ -347,81 +348,84 @@ load_all_taxtables( GncSqlBackend* be )
/* ================================================================= */
static void
-create_taxtable_tables( GncSqlBackend* be )
+create_taxtable_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TT_TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TT_TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TT_TABLE_NAME, TT_TABLE_VERSION, tt_col_table );
+ gnc_sql_create_table (be, TT_TABLE_NAME, TT_TABLE_VERSION, tt_col_table);
}
- else if ( version == 1 )
+ else if (version == 1)
{
/* Upgrade 64 bit int handling */
- gnc_sql_upgrade_table( be, TT_TABLE_NAME, tt_col_table );
- gnc_sql_set_table_version( be, TT_TABLE_NAME, TT_TABLE_VERSION );
- PINFO("Taxtables table upgraded from version 1 to version %d\n", TT_TABLE_VERSION);
+ gnc_sql_upgrade_table (be, TT_TABLE_NAME, tt_col_table);
+ gnc_sql_set_table_version (be, TT_TABLE_NAME, TT_TABLE_VERSION);
+ PINFO ("Taxtables table upgraded from version 1 to version %d\n",
+ TT_TABLE_VERSION);
}
- version = gnc_sql_get_table_version( be, TTENTRIES_TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TTENTRIES_TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TTENTRIES_TABLE_NAME, TTENTRIES_TABLE_VERSION, ttentries_col_table );
+ gnc_sql_create_table (be, TTENTRIES_TABLE_NAME, TTENTRIES_TABLE_VERSION,
+ ttentries_col_table);
}
- else if ( version == 1 )
+ else if (version == 1)
{
/* Upgrade 64 bit int handling */
- gnc_sql_upgrade_table( be, TTENTRIES_TABLE_NAME, ttentries_col_table );
- gnc_sql_set_table_version( be, TTENTRIES_TABLE_NAME, TTENTRIES_TABLE_VERSION );
- PINFO("Taxtable entries table upgraded from version 1 to version %d\n", TTENTRIES_TABLE_VERSION);
+ gnc_sql_upgrade_table (be, TTENTRIES_TABLE_NAME, ttentries_col_table);
+ gnc_sql_set_table_version (be, TTENTRIES_TABLE_NAME, TTENTRIES_TABLE_VERSION);
+ PINFO ("Taxtable entries table upgraded from version 1 to version %d\n",
+ TTENTRIES_TABLE_VERSION);
}
}
/* ================================================================= */
static gboolean
-delete_all_tt_entries( GncSqlBackend* be, const GncGUID* guid )
+delete_all_tt_entries (GncSqlBackend* be, const GncGUID* guid)
{
guid_info_t guid_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (guid != NULL, FALSE);
guid_info.be = be;
guid_info.guid = guid;
- return gnc_sql_do_db_operation( be, OP_DB_DELETE, TTENTRIES_TABLE_NAME,
- TTENTRIES_TABLE_NAME, &guid_info, guid_col_table );
+ return gnc_sql_do_db_operation (be, OP_DB_DELETE, TTENTRIES_TABLE_NAME,
+ TTENTRIES_TABLE_NAME, &guid_info, guid_col_table);
}
static gboolean
-save_tt_entries( GncSqlBackend* be, const GncGUID* guid, GList* entries )
+save_tt_entries (GncSqlBackend* be, const GncGUID* guid, GList* entries)
{
GList* entry;
gboolean is_ok;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( guid != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (guid != NULL, FALSE);
/* First, delete the old entries for this object */
- is_ok = delete_all_tt_entries( be, guid );
+ is_ok = delete_all_tt_entries (be, guid);
- for ( entry = entries; entry != NULL && is_ok; entry = entry->next )
+ for (entry = entries; entry != NULL && is_ok; entry = entry->next)
{
GncTaxTableEntry* e = (GncTaxTableEntry*)entry->data;
- is_ok = gnc_sql_do_db_operation( be,
+ is_ok = gnc_sql_do_db_operation (be,
OP_DB_INSERT,
TTENTRIES_TABLE_NAME,
GNC_ID_TAXTABLE, e,
- ttentries_col_table );
+ ttentries_col_table);
}
return is_ok;
}
static gboolean
-save_taxtable( GncSqlBackend* be, QofInstance* inst )
+save_taxtable (GncSqlBackend* be, QofInstance* inst)
{
GncTaxTable* tt;
const GncGUID* guid;
@@ -429,18 +433,18 @@ save_taxtable( GncSqlBackend* be, QofInstance* inst )
gboolean is_infant;
gboolean is_ok;
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_TAXTABLE(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_TAXTABLE (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- tt = GNC_TAXTABLE(inst);
+ tt = GNC_TAXTABLE (inst);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -448,26 +452,27 @@ save_taxtable( GncSqlBackend* be, QofInstance* inst )
{
op = OP_DB_UPDATE;
}
- is_ok = gnc_sql_do_db_operation( be, op, TT_TABLE_NAME, GNC_ID_TAXTABLE, tt, tt_col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, TT_TABLE_NAME, GNC_ID_TAXTABLE, tt,
+ tt_col_table);
- if ( is_ok )
+ if (is_ok)
{
// Now, commit or delete any slots and tax table entries
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
- if ( is_ok )
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
+ if (is_ok)
{
- is_ok = save_tt_entries( be, guid, gncTaxTableGetEntries( tt ) );
+ is_ok = save_tt_entries (be, guid, gncTaxTableGetEntries (tt));
}
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
- if ( is_ok )
+ is_ok = gnc_sql_slots_delete (be, guid);
+ if (is_ok)
{
- is_ok = delete_all_tt_entries( be, guid );
+ is_ok = delete_all_tt_entries (be, guid);
}
}
}
@@ -477,66 +482,67 @@ save_taxtable( GncSqlBackend* be, QofInstance* inst )
/* ================================================================= */
static void
-save_next_taxtable( QofInstance* inst, gpointer data )
+save_next_taxtable (QofInstance* inst, gpointer data)
{
write_objects_t* s = (write_objects_t*)data;
- if ( s->is_ok )
+ if (s->is_ok)
{
- s->is_ok = save_taxtable( s->be, inst );
+ s->is_ok = save_taxtable (s->be, inst);
}
}
static gboolean
-write_taxtables( GncSqlBackend* be )
+write_taxtables (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_TAXTABLE, be->book, save_next_taxtable, &data );
+ qof_object_foreach (GNC_ID_TAXTABLE, be->book, save_next_taxtable, &data);
return data.is_ok;
}
/* ================================================================= */
static void
-load_taxtable_guid( const GncSqlBackend* be, GncSqlRow* row,
+load_taxtable_guid (const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
GncTaxTable* taxtable = NULL;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ if (val != NULL && G_VALUE_HOLDS_STRING (val) &&
+ g_value_get_string (val) != NULL)
{
- string_to_guid( g_value_get_string( val ), &guid );
- taxtable = gncTaxTableLookup( be->book, &guid );
- if ( taxtable != NULL )
+ string_to_guid (g_value_get_string (val), &guid);
+ taxtable = gncTaxTableLookup (be->book, &guid);
+ if (taxtable != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, taxtable, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, taxtable, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- (*setter)( pObject, (const gpointer)taxtable );
+ (*setter) (pObject, (const gpointer)taxtable);
}
}
else
{
- PWARN( "Taxtable ref '%s' not found", g_value_get_string( val ) );
+ PWARN ("Taxtable ref '%s' not found", g_value_get_string (val));
}
}
}
@@ -549,21 +555,21 @@ static GncSqlColumnTypeHandler taxtable_guid_handler
};
/* ================================================================= */
void
-gnc_taxtable_sql_initialize( void )
+gnc_taxtable_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_TAXTABLE,
- save_taxtable, /* commit */
- load_all_taxtables, /* initial_load */
- create_taxtable_tables, /* create_tables */
+ save_taxtable, /* commit */
+ load_all_taxtables, /* initial_load */
+ create_taxtable_tables, /* create_tables */
NULL, NULL, NULL,
- write_taxtables /* write */
+ write_taxtables /* write */
};
- qof_object_register_backend( GNC_ID_TAXTABLE, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_TAXTABLE, GNC_SQL_BACKEND, &be_data);
- gnc_sql_register_col_type_handler( CT_TAXTABLEREF, &taxtable_guid_handler );
+ gnc_sql_register_col_type_handler (CT_TAXTABLEREF, &taxtable_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-tax-table-sql.h b/src/backend/sql/gnc-tax-table-sql.h
index 25c0ae6..c99afba 100644
--- a/src/backend/sql/gnc-tax-table-sql.h
+++ b/src/backend/sql/gnc-tax-table-sql.h
@@ -32,6 +32,6 @@
#define CT_TAXTABLEREF "tax-table"
-void gnc_taxtable_sql_initialize( void );
+void gnc_taxtable_sql_initialize (void);
#endif /* GNC_TAXTABLE_SQL_H */
diff --git a/src/backend/sql/gnc-transaction-sql.cpp b/src/backend/sql/gnc-transaction-sql.cpp
index 07231ed..ec8ad34 100644
--- a/src/backend/sql/gnc-transaction-sql.cpp
+++ b/src/backend/sql/gnc-transaction-sql.cpp
@@ -66,7 +66,7 @@ static QofLogModule log_module = G_LOG_DOMAIN;
typedef struct
{
- GncSqlBackend* be;
+ GncSqlBackend* be;
const GncGUID* guid;
gboolean is_ok;
} split_info_t;
@@ -85,9 +85,9 @@ static const GncSqlColumnTableEntry tx_col_table[] =
{ NULL }
};
-static gpointer get_split_reconcile_state( gpointer pObject );
-static void set_split_reconcile_state( gpointer pObject, gpointer pValue );
-static void set_split_lot( gpointer pObject, gpointer pLot );
+static gpointer get_split_reconcile_state (gpointer pObject);
+static void set_split_reconcile_state (gpointer pObject, gpointer pValue);
+static void set_split_lot (gpointer pObject, gpointer pLot);
#define SPLIT_MAX_MEMO_LEN 2048
#define SPLIT_MAX_ACTION_LEN 2048
@@ -134,172 +134,174 @@ static const GncSqlColumnTableEntry tx_guid_col_table[] =
/* ================================================================= */
static gpointer
-get_split_reconcile_state( gpointer pObject )
+get_split_reconcile_state (gpointer pObject)
{
static gchar c[2];
- g_return_val_if_fail( pObject != NULL, NULL );
- g_return_val_if_fail( GNC_IS_SPLIT(pObject), NULL );
+ g_return_val_if_fail (pObject != NULL, NULL);
+ g_return_val_if_fail (GNC_IS_SPLIT (pObject), NULL);
- c[0] = xaccSplitGetReconcile( GNC_SPLIT(pObject) );
+ c[0] = xaccSplitGetReconcile (GNC_SPLIT (pObject));
c[1] = '\0';
return (gpointer)c;
}
static void
-set_split_reconcile_state( gpointer pObject, gpointer pValue )
+set_split_reconcile_state (gpointer pObject, gpointer pValue)
{
const gchar* s = (const gchar*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_SPLIT(pObject) );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (GNC_IS_SPLIT (pObject));
+ g_return_if_fail (pValue != NULL);
- xaccSplitSetReconcile( GNC_SPLIT(pObject), s[0] );
+ xaccSplitSetReconcile (GNC_SPLIT (pObject), s[0]);
}
static void
-set_split_lot( gpointer pObject, gpointer pLot )
+set_split_lot (gpointer pObject, gpointer pLot)
{
GNCLot* lot;
Split* split;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( GNC_IS_SPLIT(pObject) );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (GNC_IS_SPLIT (pObject));
- if ( pLot == NULL ) return;
+ if (pLot == NULL) return;
- g_return_if_fail( GNC_IS_LOT(pLot) );
+ g_return_if_fail (GNC_IS_LOT (pLot));
- split = GNC_SPLIT(pObject);
- lot = GNC_LOT(pLot);
- gnc_lot_add_split( lot, split );
+ split = GNC_SPLIT (pObject);
+ lot = GNC_LOT (pLot);
+ gnc_lot_add_split (lot, split);
}
static Split*
-load_single_split( GncSqlBackend* be, GncSqlRow* row )
+load_single_split (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncGUID split_guid;
Split* pSplit = NULL;
gboolean bad_guid = FALSE;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- if ( guid == NULL ) return NULL;
- if (guid_equal(guid, guid_null()))
+ guid = gnc_sql_load_guid (be, row);
+ if (guid == NULL) return NULL;
+ if (guid_equal (guid, guid_null ()))
{
- PWARN("Bad GUID, creating new");
- bad_guid = TRUE;
- split_guid = guid_new_return();
+ PWARN ("Bad GUID, creating new");
+ bad_guid = TRUE;
+ split_guid = guid_new_return ();
}
else
{
- split_guid = *guid;
- pSplit = xaccSplitLookup( &split_guid, be->book );
+ split_guid = *guid;
+ pSplit = xaccSplitLookup (&split_guid, be->book);
}
- if ( pSplit == NULL )
+ if (pSplit == NULL)
{
- pSplit = xaccMallocSplit( be->book );
+ pSplit = xaccMallocSplit (be->book);
}
/* If the split is dirty, don't overwrite it */
- if ( !qof_instance_is_dirty( QOF_INSTANCE(pSplit) ) )
+ if (!qof_instance_is_dirty (QOF_INSTANCE (pSplit)))
{
- gnc_sql_load_object( be, row, GNC_ID_SPLIT, pSplit, split_col_table );
+ gnc_sql_load_object (be, row, GNC_ID_SPLIT, pSplit, split_col_table);
}
/*# -ifempty */
- if (pSplit != xaccSplitLookup( &split_guid, be->book ))
+ if (pSplit != xaccSplitLookup (&split_guid, be->book))
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(pSplit), guidstr);
- PERR("A malformed split with id %s was found in the dataset.", guidstr);
- qof_backend_set_error( &be->be, ERR_BACKEND_DATA_CORRUPT);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (pSplit), guidstr);
+ PERR ("A malformed split with id %s was found in the dataset.", guidstr);
+ qof_backend_set_error (&be->be, ERR_BACKEND_DATA_CORRUPT);
pSplit = NULL;
}
return pSplit;
}
static void
-load_splits_for_tx_list( GncSqlBackend* be, GList* list )
+load_splits_for_tx_list (GncSqlBackend* be, GList* list)
{
GString* sql;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- if ( list == NULL ) return;
+ if (list == NULL) return;
- sql = g_string_sized_new( 40 + (GUID_ENCODING_LENGTH + 3) * g_list_length( list ) );
- g_string_append_printf( sql, "SELECT * FROM %s WHERE %s IN (", SPLIT_TABLE, tx_guid_col_table[0].col_name );
- (void)gnc_sql_append_guid_list_to_sql( sql, list, G_MAXUINT );
- (void)g_string_append( sql, ")" );
+ sql = g_string_sized_new (40 + (GUID_ENCODING_LENGTH + 3) * g_list_length (
+ list));
+ g_string_append_printf (sql, "SELECT * FROM %s WHERE %s IN (", SPLIT_TABLE,
+ tx_guid_col_table[0].col_name);
+ (void)gnc_sql_append_guid_list_to_sql (sql, list, G_MAXUINT);
+ (void)g_string_append (sql, ")");
// Execute the query and load the splits
- result = gnc_sql_execute_select_sql( be, sql->str );
- if ( result != NULL )
+ result = gnc_sql_execute_select_sql (be, sql->str);
+ if (result != NULL)
{
GList* split_list = NULL;
GncSqlRow* row;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
Split* s;
- s = load_single_split( be, row );
- if ( s != NULL )
+ s = load_single_split (be, row);
+ if (s != NULL)
{
- split_list = g_list_prepend( split_list, s );
+ split_list = g_list_prepend (split_list, s);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- if ( split_list != NULL )
+ if (split_list != NULL)
{
- gnc_sql_slots_load_for_list( be, split_list );
- g_list_free( split_list );
+ gnc_sql_slots_load_for_list (be, split_list);
+ g_list_free (split_list);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
- (void)g_string_free( sql, TRUE );
+ (void)g_string_free (sql, TRUE);
}
static Transaction*
-load_single_tx( GncSqlBackend* be, GncSqlRow* row )
+load_single_tx (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncGUID tx_guid;
Transaction* pTx;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- if ( guid == NULL ) return NULL;
+ guid = gnc_sql_load_guid (be, row);
+ if (guid == NULL) return NULL;
tx_guid = *guid;
// Don't overwrite the transaction if it's already been loaded (and possibly modified).
- pTx = xaccTransLookup( &tx_guid, be->book );
- if ( pTx != NULL )
+ pTx = xaccTransLookup (&tx_guid, be->book);
+ if (pTx != NULL)
{
return NULL;
}
- pTx = xaccMallocTransaction( be->book );
- xaccTransBeginEdit( pTx );
- gnc_sql_load_object( be, row, GNC_ID_TRANS, pTx, tx_col_table );
+ pTx = xaccMallocTransaction (be->book);
+ xaccTransBeginEdit (pTx);
+ gnc_sql_load_object (be, row, GNC_ID_TRANS, pTx, tx_col_table);
- if (pTx != xaccTransLookup( &tx_guid, be->book ))
+ if (pTx != xaccTransLookup (&tx_guid, be->book))
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(pTx), guidstr);
- PERR("A malformed transaction with id %s was found in the dataset.", guidstr);
- qof_backend_set_error( &be->be, ERR_BACKEND_DATA_CORRUPT);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (pTx), guidstr);
+ PERR ("A malformed transaction with id %s was found in the dataset.", guidstr);
+ qof_backend_set_error (&be->be, ERR_BACKEND_DATA_CORRUPT);
pTx = NULL;
}
@@ -314,7 +316,7 @@ load_single_tx( GncSqlBackend* be, GncSqlRow* row )
*/
typedef struct
{
- Account* acc;
+ Account* acc;
gnc_numeric start_bal;
gnc_numeric end_bal;
gnc_numeric start_cleared_bal;
@@ -331,15 +333,15 @@ typedef struct
* @param stmt SQL statement
*/
static void
-query_transactions( GncSqlBackend* be, GncSqlStatement* stmt )
+query_transactions (GncSqlBackend* be, GncSqlStatement* stmt)
{
GncSqlResult* result;
- g_return_if_fail( be != NULL );
- g_return_if_fail( stmt != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (stmt != NULL);
- result = gnc_sql_execute_select_statement( be, stmt );
- if ( result != NULL )
+ result = gnc_sql_execute_select_statement (be, stmt);
+ if (result != NULL)
{
GList* tx_list = NULL;
GList* node;
@@ -348,52 +350,52 @@ query_transactions( GncSqlBackend* be, GncSqlStatement* stmt )
#if LOAD_TRANSACTIONS_AS_NEEDED
GSList* bal_list = NULL;
GSList* nextbal;
- Account* root = gnc_book_get_root_account( be->book );
+ Account* root = gnc_book_get_root_account (be->book);
- qof_event_suspend();
- xaccAccountBeginEdit( root );
+ qof_event_suspend ();
+ xaccAccountBeginEdit (root);
// Save the start/ending balances (balance, cleared and reconciled) for
// every account.
- gnc_account_foreach_descendant( gnc_book_get_root_account( be->primary_book ),
+ gnc_account_foreach_descendant (gnc_book_get_root_account (be->primary_book),
save_account_balances,
- &bal_list );
+ &bal_list);
#endif
// Load the transactions
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- tx = load_single_tx( be, row );
- if ( tx != NULL )
+ tx = load_single_tx (be, row);
+ if (tx != NULL)
{
- tx_list = g_list_prepend( tx_list, tx );
+ tx_list = g_list_prepend (tx_list, tx);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
// Load all splits and slots for the transactions
- if ( tx_list != NULL )
+ if (tx_list != NULL)
{
- gnc_sql_slots_load_for_list( be, tx_list );
- load_splits_for_tx_list( be, tx_list );
+ gnc_sql_slots_load_for_list (be, tx_list);
+ load_splits_for_tx_list (be, tx_list);
}
// Commit all of the transactions
- for ( node = tx_list; node != NULL; node = node->next )
+ for (node = tx_list; node != NULL; node = node->next)
{
- Transaction* pTx = GNC_TRANSACTION(node->data);
- xaccTransCommitEdit( pTx );
+ Transaction* pTx = GNC_TRANSACTION (node->data);
+ xaccTransCommitEdit (pTx);
}
- g_list_free( tx_list );
+ g_list_free (tx_list);
#if LOAD_TRANSACTIONS_AS_NEEDED
// Update the account balances based on the loaded splits. If the end
// balance has changed, update the start balance so that the end
// balance is the same as it was before the splits were loaded.
// Repeat for cleared and reconciled balances.
- for ( nextbal = bal_list; nextbal != NULL; nextbal = nextbal->next )
+ for (nextbal = bal_list; nextbal != NULL; nextbal = nextbal->next)
{
full_acct_balances_t* balns = (full_acct_balances_t*)nextbal->data;
gnc_numeric* pnew_end_bal;
@@ -401,52 +403,55 @@ query_transactions( GncSqlBackend* be, GncSqlStatement* stmt )
gnc_numeric* pnew_end_r_bal;
gnc_numeric adj;
- g_object_get( balns->acc,
+ g_object_get (balns->acc,
"end-balance", &pnew_end_bal,
"end-cleared-balance", &pnew_end_c_bal,
"end-reconciled-balance", &pnew_end_r_bal,
- NULL );
+ NULL);
- qof_instance_increase_editlevel (balns-acc);
- if ( !gnc_numeric_eq( *pnew_end_bal, balns->end_bal ) )
+ qof_instance_increase_editlevel (balns - acc);
+ if (!gnc_numeric_eq (*pnew_end_bal, balns->end_bal))
{
- adj = gnc_numeric_sub( balns->end_bal, *pnew_end_bal,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- balns->start_bal = gnc_numeric_add( balns->start_bal, adj,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- g_object_set( balns->acc, "start-balance", &balns->start_bal, NULL );
- qof_instance_decrease_editlevel (balns-acc);
+ adj = gnc_numeric_sub (balns->end_bal, *pnew_end_bal,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ balns->start_bal = gnc_numeric_add (balns->start_bal, adj,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ g_object_set (balns->acc, "start-balance", &balns->start_bal, NULL);
+ qof_instance_decrease_editlevel (balns - acc);
}
- if ( !gnc_numeric_eq( *pnew_end_c_bal, balns->end_cleared_bal ) )
+ if (!gnc_numeric_eq (*pnew_end_c_bal, balns->end_cleared_bal))
{
- adj = gnc_numeric_sub( balns->end_cleared_bal, *pnew_end_c_bal,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- balns->start_cleared_bal = gnc_numeric_add( balns->start_cleared_bal, adj,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- g_object_set( balns->acc, "start-cleared-balance", &balns->start_cleared_bal, NULL );
+ adj = gnc_numeric_sub (balns->end_cleared_bal, *pnew_end_c_bal,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ balns->start_cleared_bal = gnc_numeric_add (balns->start_cleared_bal, adj,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ g_object_set (balns->acc, "start-cleared-balance", &balns->start_cleared_bal,
+ NULL);
}
- if ( !gnc_numeric_eq( *pnew_end_r_bal, balns->end_reconciled_bal ) )
+ if (!gnc_numeric_eq (*pnew_end_r_bal, balns->end_reconciled_bal))
{
- adj = gnc_numeric_sub( balns->end_reconciled_bal, *pnew_end_r_bal,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- balns->start_reconciled_bal = gnc_numeric_add( balns->start_reconciled_bal, adj,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- g_object_set( balns->acc, "start-reconciled-balance", &balns->start_reconciled_bal, NULL );
+ adj = gnc_numeric_sub (balns->end_reconciled_bal, *pnew_end_r_bal,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ balns->start_reconciled_bal = gnc_numeric_add (balns->start_reconciled_bal,
+ adj,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ g_object_set (balns->acc, "start-reconciled-balance",
+ &balns->start_reconciled_bal, NULL);
}
- qof_instance_decrease_editlevel (balns-acc);
- xaccAccountRecomputeBalance( balns->acc );
- g_free( pnew_end_bal );
- g_free( pnew_end_c_bal );
- g_free( pnew_end_r_bal );
- g_free( balns );
+ qof_instance_decrease_editlevel (balns - acc);
+ xaccAccountRecomputeBalance (balns->acc);
+ g_free (pnew_end_bal);
+ g_free (pnew_end_c_bal);
+ g_free (pnew_end_r_bal);
+ g_free (balns);
}
- if ( bal_list != NULL )
+ if (bal_list != NULL)
{
- g_slist_free( bal_list );
+ g_slist_free (bal_list);
}
- xaccAccountCommitEdit( root );
- qof_event_resume();
+ xaccAccountCommitEdit (root);
+ qof_event_resume ();
#endif
}
}
@@ -458,68 +463,77 @@ query_transactions( GncSqlBackend* be, GncSqlStatement* stmt )
* @param be SQL backend
*/
static void
-create_transaction_tables( GncSqlBackend* be )
+create_transaction_tables (GncSqlBackend* be)
{
gint version;
gboolean ok;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TRANSACTION_TABLE );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TRANSACTION_TABLE);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, TRANSACTION_TABLE, TX_TABLE_VERSION, tx_col_table );
- ok = gnc_sql_create_index( be, "tx_post_date_index", TRANSACTION_TABLE, post_date_col_table );
- if ( !ok )
+ (void)gnc_sql_create_table (be, TRANSACTION_TABLE, TX_TABLE_VERSION,
+ tx_col_table);
+ ok = gnc_sql_create_index (be, "tx_post_date_index", TRANSACTION_TABLE,
+ post_date_col_table);
+ if (!ok)
{
- PERR( "Unable to create index\n" );
+ PERR ("Unable to create index\n");
}
}
- else if ( version < TX_TABLE_VERSION )
+ else if (version < TX_TABLE_VERSION)
{
/* Upgrade:
1->2: 64 bit int handling
- 2->3: allow dates to be NULL
+ 2->3: allow dates to be NULL
*/
- gnc_sql_upgrade_table( be, TRANSACTION_TABLE, tx_col_table );
- (void)gnc_sql_set_table_version( be, TRANSACTION_TABLE, TX_TABLE_VERSION );
- PINFO("Transactions table upgraded from version %d to version %d\n", version, TX_TABLE_VERSION);
+ gnc_sql_upgrade_table (be, TRANSACTION_TABLE, tx_col_table);
+ (void)gnc_sql_set_table_version (be, TRANSACTION_TABLE, TX_TABLE_VERSION);
+ PINFO ("Transactions table upgraded from version %d to version %d\n", version,
+ TX_TABLE_VERSION);
}
- version = gnc_sql_get_table_version( be, SPLIT_TABLE );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, SPLIT_TABLE);
+ if (version == 0)
{
- (void)gnc_sql_create_table( be, SPLIT_TABLE, SPLIT_TABLE_VERSION, split_col_table );
- ok = gnc_sql_create_index( be, "splits_tx_guid_index", SPLIT_TABLE, tx_guid_col_table );
- if ( !ok )
+ (void)gnc_sql_create_table (be, SPLIT_TABLE, SPLIT_TABLE_VERSION,
+ split_col_table);
+ ok = gnc_sql_create_index (be, "splits_tx_guid_index", SPLIT_TABLE,
+ tx_guid_col_table);
+ if (!ok)
{
- PERR( "Unable to create index\n" );
+ PERR ("Unable to create index\n");
}
- ok = gnc_sql_create_index( be, "splits_account_guid_index", SPLIT_TABLE, account_guid_col_table );
- if ( !ok )
+ ok = gnc_sql_create_index (be, "splits_account_guid_index", SPLIT_TABLE,
+ account_guid_col_table);
+ if (!ok)
{
- PERR( "Unable to create index\n" );
+ PERR ("Unable to create index\n");
}
}
- else if ( version < SPLIT_TABLE_VERSION )
+ else if (version < SPLIT_TABLE_VERSION)
{
/* Upgrade:
1->2: 64 bit int handling
3->4: Split reconcile date can be NULL */
- gnc_sql_upgrade_table( be, SPLIT_TABLE, split_col_table );
- ok = gnc_sql_create_index( be, "splits_tx_guid_index", SPLIT_TABLE, tx_guid_col_table );
- if ( !ok )
+ gnc_sql_upgrade_table (be, SPLIT_TABLE, split_col_table);
+ ok = gnc_sql_create_index (be, "splits_tx_guid_index", SPLIT_TABLE,
+ tx_guid_col_table);
+ if (!ok)
{
- PERR( "Unable to create index\n" );
+ PERR ("Unable to create index\n");
}
- ok = gnc_sql_create_index( be, "splits_account_guid_index", SPLIT_TABLE, account_guid_col_table );
- if ( !ok )
+ ok = gnc_sql_create_index (be, "splits_account_guid_index", SPLIT_TABLE,
+ account_guid_col_table);
+ if (!ok)
{
- PERR( "Unable to create index\n" );
+ PERR ("Unable to create index\n");
}
- (void)gnc_sql_set_table_version( be, SPLIT_TABLE, SPLIT_TABLE_VERSION );
- PINFO("Splits table upgraded from version %d to version %d\n", version, SPLIT_TABLE_VERSION);
+ (void)gnc_sql_set_table_version (be, SPLIT_TABLE, SPLIT_TABLE_VERSION);
+ PINFO ("Splits table upgraded from version %d to version %d\n", version,
+ SPLIT_TABLE_VERSION);
}
}
/* ================================================================= */
@@ -530,19 +544,19 @@ create_transaction_tables( GncSqlBackend* be )
* @param user_data split_info_t structure contain operation info
*/
static void
-delete_split_slots_cb( gpointer data, gpointer user_data )
+delete_split_slots_cb (gpointer data, gpointer user_data)
{
split_info_t* split_info = (split_info_t*)user_data;
- Split* pSplit = GNC_SPLIT(data);
+ Split* pSplit = GNC_SPLIT (data);
- g_return_if_fail( data != NULL );
- g_return_if_fail( GNC_IS_SPLIT(data) );
- g_return_if_fail( user_data != NULL );
+ g_return_if_fail (data != NULL);
+ g_return_if_fail (GNC_IS_SPLIT (data));
+ g_return_if_fail (user_data != NULL);
- if ( split_info->is_ok )
+ if (split_info->is_ok)
{
- split_info->is_ok = gnc_sql_slots_delete( split_info->be,
- qof_instance_get_guid( QOF_INSTANCE(pSplit) ) );
+ split_info->is_ok = gnc_sql_slots_delete (split_info->be,
+ qof_instance_get_guid (QOF_INSTANCE (pSplit)));
}
}
@@ -554,22 +568,23 @@ delete_split_slots_cb( gpointer data, gpointer user_data )
* @return TRUE if successful, FALSE if unsuccessful
*/
static gboolean
-delete_splits( GncSqlBackend* be, Transaction* pTx )
+delete_splits (GncSqlBackend* be, Transaction* pTx)
{
split_info_t split_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( pTx != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (pTx != NULL, FALSE);
- if ( !gnc_sql_do_db_operation( be, OP_DB_DELETE, SPLIT_TABLE,
- SPLIT_TABLE, pTx, tx_guid_col_table ) )
+ if (!gnc_sql_do_db_operation (be, OP_DB_DELETE, SPLIT_TABLE,
+ SPLIT_TABLE, pTx, tx_guid_col_table))
{
return FALSE;
}
split_info.be = be;
split_info.is_ok = TRUE;
- g_list_foreach( xaccTransGetSplitList( pTx ), delete_split_slots_cb, &split_info );
+ g_list_foreach (xaccTransGetSplitList (pTx), delete_split_slots_cb,
+ &split_info);
return split_info.is_ok;
}
@@ -582,22 +597,22 @@ delete_splits( GncSqlBackend* be, Transaction* pTx )
* @return TRUE if successful, FALSE if error
*/
static gboolean
-commit_split( GncSqlBackend* be, QofInstance* inst )
+commit_split (GncSqlBackend* be, QofInstance* inst)
{
E_DB_OPERATION op;
gboolean is_infant;
gboolean is_ok;
- GncGUID *guid = (GncGUID*)qof_instance_get_guid(inst);
+ GncGUID* guid = (GncGUID*)qof_instance_get_guid (inst);
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -608,56 +623,56 @@ commit_split( GncSqlBackend* be, QofInstance* inst )
if (guid_equal (guid, guid_null ()))
{
- *guid = guid_new_return ();
- qof_instance_set_guid (inst, guid);
+ *guid = guid_new_return ();
+ qof_instance_set_guid (inst, guid);
}
- is_ok = gnc_sql_do_db_operation( be, op, SPLIT_TABLE, GNC_ID_SPLIT,
- inst, split_col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, SPLIT_TABLE, GNC_ID_SPLIT,
+ inst, split_col_table);
- if ( is_ok && !qof_instance_get_destroying (inst))
+ if (is_ok && !qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
return is_ok;
}
static void
-save_split_cb( gpointer data, gpointer user_data )
+save_split_cb (gpointer data, gpointer user_data)
{
split_info_t* split_info = (split_info_t*)user_data;
- Split* pSplit = GNC_SPLIT(data);
+ Split* pSplit = GNC_SPLIT (data);
- g_return_if_fail( data != NULL );
- g_return_if_fail( GNC_IS_SPLIT(data) );
- g_return_if_fail( user_data != NULL );
+ g_return_if_fail (data != NULL);
+ g_return_if_fail (GNC_IS_SPLIT (data));
+ g_return_if_fail (user_data != NULL);
- if ( split_info->is_ok )
+ if (split_info->is_ok)
{
- split_info->is_ok = commit_split( split_info->be, QOF_INSTANCE(pSplit) );
+ split_info->is_ok = commit_split (split_info->be, QOF_INSTANCE (pSplit));
}
}
static gboolean
-save_splits( GncSqlBackend* be, const GncGUID* tx_guid, SplitList* pSplitList )
+save_splits (GncSqlBackend* be, const GncGUID* tx_guid, SplitList* pSplitList)
{
split_info_t split_info;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( tx_guid != NULL, FALSE );
- g_return_val_if_fail( pSplitList != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (tx_guid != NULL, FALSE);
+ g_return_val_if_fail (pSplitList != NULL, FALSE);
split_info.be = be;
split_info.guid = tx_guid;
split_info.is_ok = TRUE;
- g_list_foreach( pSplitList, save_split_cb, &split_info );
+ g_list_foreach (pSplitList, save_split_cb, &split_info);
return split_info.is_ok;
}
static gboolean
-save_transaction( GncSqlBackend* be, Transaction* pTx, gboolean do_save_splits )
+save_transaction (GncSqlBackend* be, Transaction* pTx, gboolean do_save_splits)
{
const GncGUID* guid;
E_DB_OPERATION op;
@@ -666,16 +681,16 @@ save_transaction( GncSqlBackend* be, Transaction* pTx, gboolean do_save_splits )
gboolean is_ok = TRUE;
const char* err = NULL;
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( pTx != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (pTx != NULL, FALSE);
- inst = QOF_INSTANCE(pTx);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ inst = QOF_INSTANCE (pTx);
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -684,42 +699,43 @@ save_transaction( GncSqlBackend* be, Transaction* pTx, gboolean do_save_splits )
op = OP_DB_UPDATE;
}
- if ( op != OP_DB_DELETE )
+ if (op != OP_DB_DELETE)
{
- gnc_commodity *commodity = xaccTransGetCurrency( pTx );
+ gnc_commodity* commodity = xaccTransGetCurrency (pTx);
// Ensure the commodity is in the db
- is_ok = gnc_sql_save_commodity( be, commodity );
- if ( ! is_ok )
+ is_ok = gnc_sql_save_commodity (be, commodity);
+ if (! is_ok)
{
err = "Commodity save failed: Probably an invalid or missing currency";
- qof_backend_set_error( &be->be, ERR_BACKEND_DATA_CORRUPT);
+ qof_backend_set_error (&be->be, ERR_BACKEND_DATA_CORRUPT);
}
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_do_db_operation( be, op, TRANSACTION_TABLE, GNC_ID_TRANS, pTx, tx_col_table );
- if ( ! is_ok )
+ is_ok = gnc_sql_do_db_operation (be, op, TRANSACTION_TABLE, GNC_ID_TRANS, pTx,
+ tx_col_table);
+ if (! is_ok)
{
err = "Transaction header save failed. Check trace log for SQL errors";
}
}
- if ( is_ok )
+ if (is_ok)
{
// Commit slots and splits
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
- if ( ! is_ok )
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
+ if (! is_ok)
{
err = "Slots save failed. Check trace log for SQL errors";
}
- if ( is_ok && do_save_splits )
+ if (is_ok && do_save_splits)
{
- is_ok = save_splits( be, guid, xaccTransGetSplitList( pTx ) );
- if ( ! is_ok )
+ is_ok = save_splits (be, guid, xaccTransGetSplitList (pTx));
+ if (! is_ok)
{
err = "Split save failed. Check trace log for SQL errors";
}
@@ -727,63 +743,63 @@ save_transaction( GncSqlBackend* be, Transaction* pTx, gboolean do_save_splits )
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
- if ( ! is_ok )
+ is_ok = gnc_sql_slots_delete (be, guid);
+ if (! is_ok)
{
err = "Slots delete failed. Check trace log for SQL errors";
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = delete_splits( be, pTx );
- if ( ! is_ok )
+ is_ok = delete_splits (be, pTx);
+ if (! is_ok)
{
err = "Split delete failed. Check trace log for SQL errors";
}
}
}
}
- if (! is_ok )
+ if (! is_ok)
{
- Split* split = xaccTransGetSplit( pTx, 0);
- Account *acc = xaccSplitGetAccount( split );
+ Split* split = xaccTransGetSplit (pTx, 0);
+ Account* acc = xaccSplitGetAccount (split);
/* FIXME: This needs to be implemented
const char *message1 = "Transaction %s dated %s in account %s not saved due to %s.%s";
const char *message2 = "\nDatabase may be corrupted, check your data carefully.";
qof_error_format_secondary_text( GTK_MESSAGE_DIALOG( msg ),
- message1,
- xaccTransGetDescription( pTx ),
- qof_print_date( xaccTransGetDate( pTx ) ),
- xaccAccountGetName( acc ),
- err,
- message2 );
+ message1,
+ xaccTransGetDescription( pTx ),
+ qof_print_date( xaccTransGetDate( pTx ) ),
+ xaccAccountGetName( acc ),
+ err,
+ message2 );
*/
- PERR( "Transaction %s dated %s in account %s not saved due to %s.\n",
- xaccTransGetDescription( pTx ),
- qof_print_date( xaccTransGetDate( pTx ) ),
- xaccAccountGetName( acc ),
- err );
+ PERR ("Transaction %s dated %s in account %s not saved due to %s.\n",
+ xaccTransGetDescription (pTx),
+ qof_print_date (xaccTransGetDate (pTx)),
+ xaccAccountGetName (acc),
+ err);
}
return is_ok;
}
gboolean
-gnc_sql_save_transaction( GncSqlBackend* be, QofInstance* inst )
+gnc_sql_save_transaction (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_TRANS(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_TRANS (inst), FALSE);
- return save_transaction( be, GNC_TRANS(inst), /* do_save_splits */TRUE );
+ return save_transaction (be, GNC_TRANS (inst), /* do_save_splits */TRUE);
}
static gboolean
-commit_transaction( GncSqlBackend* be, QofInstance* inst )
+commit_transaction (GncSqlBackend* be, QofInstance* inst)
{
- g_return_val_if_fail( be != NULL, FALSE );
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_TRANS(inst), FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_TRANS (inst), FALSE);
- return save_transaction( be, GNC_TRANS(inst), /* do_save_splits */FALSE );
+ return save_transaction (be, GNC_TRANS (inst), /* do_save_splits */FALSE);
}
/* ================================================================= */
@@ -793,27 +809,28 @@ commit_transaction( GncSqlBackend* be, QofInstance* inst )
* @param be SQL backend
* @param account Account
*/
-void gnc_sql_transaction_load_tx_for_account( GncSqlBackend* be, Account* account )
+void gnc_sql_transaction_load_tx_for_account (GncSqlBackend* be,
+ Account* account)
{
const GncGUID* guid;
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
gchar* query_sql;
GncSqlStatement* stmt;
- g_return_if_fail( be != NULL );
- g_return_if_fail( account != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (account != NULL);
- guid = qof_instance_get_guid( QOF_INSTANCE(account) );
- (void)guid_to_string_buff( guid, guid_buf );
- query_sql = g_strdup_printf(
+ guid = qof_instance_get_guid (QOF_INSTANCE (account));
+ (void)guid_to_string_buff (guid, guid_buf);
+ query_sql = g_strdup_printf (
"SELECT DISTINCT t.* FROM %s AS t, %s AS s WHERE s.tx_guid=t.guid AND s.account_guid ='%s'",
- TRANSACTION_TABLE, SPLIT_TABLE, guid_buf );
- stmt = gnc_sql_create_statement_from_sql( be, query_sql );
- g_free( query_sql );
- if ( stmt != NULL )
+ TRANSACTION_TABLE, SPLIT_TABLE, guid_buf);
+ stmt = gnc_sql_create_statement_from_sql (be, query_sql);
+ g_free (query_sql);
+ if (stmt != NULL)
{
- query_transactions( be, stmt );
- gnc_sql_statement_dispose( stmt );
+ query_transactions (be, stmt);
+ gnc_sql_statement_dispose (stmt);
}
}
@@ -823,239 +840,243 @@ void gnc_sql_transaction_load_tx_for_account( GncSqlBackend* be, Account* accoun
*
* @param be SQL backend
*/
-void gnc_sql_transaction_load_all_tx( GncSqlBackend* be )
+void gnc_sql_transaction_load_all_tx (GncSqlBackend* be)
{
gchar* query_sql;
GncSqlStatement* stmt;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
- stmt = gnc_sql_create_statement_from_sql( be, query_sql );
- g_free( query_sql );
- if ( stmt != NULL )
+ query_sql = g_strdup_printf ("SELECT * FROM %s", TRANSACTION_TABLE);
+ stmt = gnc_sql_create_statement_from_sql (be, query_sql);
+ g_free (query_sql);
+ if (stmt != NULL)
{
- query_transactions( be, stmt );
- gnc_sql_statement_dispose( stmt );
+ query_transactions (be, stmt);
+ gnc_sql_statement_dispose (stmt);
}
}
static void
-convert_query_comparison_to_sql( QofQueryPredData* pPredData, gboolean isInverted, GString* sql )
+convert_query_comparison_to_sql (QofQueryPredData* pPredData,
+ gboolean isInverted, GString* sql)
{
- if ( pPredData->how == QOF_COMPARE_LT
- || ( isInverted && pPredData->how == QOF_COMPARE_GTE ) )
+ if (pPredData->how == QOF_COMPARE_LT
+ || (isInverted && pPredData->how == QOF_COMPARE_GTE))
{
- g_string_append( sql, "<" );
+ g_string_append (sql, "<");
}
- else if ( pPredData->how == QOF_COMPARE_LTE
- || ( isInverted && pPredData->how == QOF_COMPARE_GT ) )
+ else if (pPredData->how == QOF_COMPARE_LTE
+ || (isInverted && pPredData->how == QOF_COMPARE_GT))
{
- g_string_append( sql, "<=" );
+ g_string_append (sql, "<=");
}
- else if ( pPredData->how == QOF_COMPARE_EQUAL
- || ( isInverted && pPredData->how == QOF_COMPARE_NEQ ) )
+ else if (pPredData->how == QOF_COMPARE_EQUAL
+ || (isInverted && pPredData->how == QOF_COMPARE_NEQ))
{
- g_string_append( sql, "=" );
+ g_string_append (sql, "=");
}
- else if ( pPredData->how == QOF_COMPARE_GT
- || ( isInverted && pPredData->how == QOF_COMPARE_LTE ) )
+ else if (pPredData->how == QOF_COMPARE_GT
+ || (isInverted && pPredData->how == QOF_COMPARE_LTE))
{
- g_string_append( sql, ">" );
+ g_string_append (sql, ">");
}
- else if ( pPredData->how == QOF_COMPARE_GTE
- || ( isInverted && pPredData->how == QOF_COMPARE_LT ) )
+ else if (pPredData->how == QOF_COMPARE_GTE
+ || (isInverted && pPredData->how == QOF_COMPARE_LT))
{
- g_string_append( sql, ">=" );
+ g_string_append (sql, ">=");
}
- else if ( pPredData->how == QOF_COMPARE_NEQ
- || ( isInverted && pPredData->how == QOF_COMPARE_EQUAL ) )
+ else if (pPredData->how == QOF_COMPARE_NEQ
+ || (isInverted && pPredData->how == QOF_COMPARE_EQUAL))
{
- g_string_append( sql, "~=" );
+ g_string_append (sql, "~=");
}
else
{
- PERR( "Unknown comparison type\n" );
- g_string_append( sql, "??" );
+ PERR ("Unknown comparison type\n");
+ g_string_append (sql, "??");
}
}
static void
-convert_query_term_to_sql( const GncSqlBackend* be, const gchar* fieldName, QofQueryTerm* pTerm, GString* sql )
+convert_query_term_to_sql (const GncSqlBackend* be, const gchar* fieldName,
+ QofQueryTerm* pTerm, GString* sql)
{
QofQueryPredData* pPredData;
gboolean isInverted;
- g_return_if_fail( pTerm != NULL );
- g_return_if_fail( sql != NULL );
+ g_return_if_fail (pTerm != NULL);
+ g_return_if_fail (sql != NULL);
- pPredData = qof_query_term_get_pred_data( pTerm );
- isInverted = qof_query_term_is_inverted( pTerm );
+ pPredData = qof_query_term_get_pred_data (pTerm);
+ isInverted = qof_query_term_is_inverted (pTerm);
- if ( g_strcmp0( pPredData->type_name, QOF_TYPE_GUID ) == 0 )
+ if (g_strcmp0 (pPredData->type_name, QOF_TYPE_GUID) == 0)
{
query_guid_t guid_data = (query_guid_t)pPredData;
GList* guid_entry;
- g_string_append( sql, "(" );
- g_string_append( sql, fieldName );
+ g_string_append (sql, "(");
+ g_string_append (sql, fieldName);
- switch ( guid_data->options )
+ switch (guid_data->options)
{
case QOF_GUID_MATCH_ANY:
- if ( isInverted ) g_string_append( sql, " NOT IN (" );
- else g_string_append( sql, " IN (" );
+ if (isInverted) g_string_append (sql, " NOT IN (");
+ else g_string_append (sql, " IN (");
break;
case QOF_GUID_MATCH_NONE:
- if ( isInverted ) g_string_append( sql, " IN (" );
- else g_string_append( sql, " NOT IN (" );
+ if (isInverted) g_string_append (sql, " IN (");
+ else g_string_append (sql, " NOT IN (");
break;
default:
- PERR( "Unexpected GncGUID match type: %d\n", guid_data->options );
+ PERR ("Unexpected GncGUID match type: %d\n", guid_data->options);
}
- for ( guid_entry = guid_data->guids; guid_entry != NULL; guid_entry = guid_entry->next )
+ for (guid_entry = guid_data->guids; guid_entry != NULL;
+ guid_entry = guid_entry->next)
{
- gchar guid_buf[GUID_ENCODING_LENGTH+1];
+ gchar guid_buf[GUID_ENCODING_LENGTH + 1];
- if ( guid_entry != guid_data->guids ) g_string_append( sql, "," );
- (void)guid_to_string_buff(static_cast<GncGUID*>(guid_entry->data),
- guid_buf );
- g_string_append_printf( sql, "'%s'", guid_buf );
+ if (guid_entry != guid_data->guids) g_string_append (sql, ",");
+ (void)guid_to_string_buff (static_cast<GncGUID*> (guid_entry->data),
+ guid_buf);
+ g_string_append_printf (sql, "'%s'", guid_buf);
}
- g_string_append( sql, "))" );
+ g_string_append (sql, "))");
}
- else if ( g_strcmp0( pPredData->type_name, QOF_TYPE_CHAR ) == 0 )
+ else if (g_strcmp0 (pPredData->type_name, QOF_TYPE_CHAR) == 0)
{
query_char_t char_data = (query_char_t)pPredData;
int i;
- if ( isInverted )
+ if (isInverted)
{
- g_string_append( sql, "NOT(" );
+ g_string_append (sql, "NOT(");
}
- if ( char_data->options == QOF_CHAR_MATCH_NONE )
+ if (char_data->options == QOF_CHAR_MATCH_NONE)
{
- g_string_append( sql, "NOT " );
+ g_string_append (sql, "NOT ");
}
- g_string_append( sql, "(" );
- for ( i = 0; char_data->char_list[i] != '\0'; i++ )
+ g_string_append (sql, "(");
+ for (i = 0; char_data->char_list[i] != '\0'; i++)
{
- if ( i != 0 )
+ if (i != 0)
{
- g_string_append( sql, " OR " );
+ g_string_append (sql, " OR ");
}
- g_string_append( sql, fieldName );
- g_string_append( sql, " = '" );
- g_string_append_c( sql, char_data->char_list[i] );
- g_string_append( sql, "'" );
+ g_string_append (sql, fieldName);
+ g_string_append (sql, " = '");
+ g_string_append_c (sql, char_data->char_list[i]);
+ g_string_append (sql, "'");
}
- g_string_append( sql, ") " );
- if ( isInverted )
+ g_string_append (sql, ") ");
+ if (isInverted)
{
- g_string_append( sql, ") " );
+ g_string_append (sql, ") ");
}
}
- else if ( g_strcmp0( pPredData->type_name, QOF_TYPE_STRING ) == 0 )
+ else if (g_strcmp0 (pPredData->type_name, QOF_TYPE_STRING) == 0)
{
query_string_t string_data = (query_string_t)pPredData;
- sqlEscape* escape = sqlEscape_new();
+ sqlEscape* escape = sqlEscape_new ();
- if ( isInverted )
+ if (isInverted)
{
- g_string_append( sql, "NOT(" );
+ g_string_append (sql, "NOT(");
}
- if ( pPredData->how == QOF_COMPARE_NEQ )
+ if (pPredData->how == QOF_COMPARE_NEQ)
{
- g_string_append( sql, "NOT(" );
+ g_string_append (sql, "NOT(");
}
- g_string_append( sql, fieldName );
- if ( string_data->is_regex || string_data->options == QOF_STRING_MATCH_CASEINSENSITIVE )
+ g_string_append (sql, fieldName);
+ if (string_data->is_regex ||
+ string_data->options == QOF_STRING_MATCH_CASEINSENSITIVE)
{
- PWARN( "String is_regex || option = QOF_STRING_MATCH_INSENSITIVE\n" );
+ PWARN ("String is_regex || option = QOF_STRING_MATCH_INSENSITIVE\n");
}
-// g_string_append( sql, " ~" );
-// } else {
- g_string_append( sql, " =" );
-// }
-// if( string_data->options == QOF_STRING_MATCH_CASEINSENSITIVE ) {
-// g_string_append( sql, "*" );
-// }
- g_string_append( sql, "'" );
- g_string_append( sql, sqlEscapeString( escape, string_data->matchstring ) );
- g_string_append( sql, "'" );
- if ( pPredData->how == QOF_COMPARE_NEQ )
+// g_string_append( sql, " ~" );
+// } else {
+ g_string_append (sql, " =");
+// }
+// if( string_data->options == QOF_STRING_MATCH_CASEINSENSITIVE ) {
+// g_string_append( sql, "*" );
+// }
+ g_string_append (sql, "'");
+ g_string_append (sql, sqlEscapeString (escape, string_data->matchstring));
+ g_string_append (sql, "'");
+ if (pPredData->how == QOF_COMPARE_NEQ)
{
- g_string_append( sql, ")" );
+ g_string_append (sql, ")");
}
- if ( isInverted )
+ if (isInverted)
{
- g_string_append( sql, ")" );
+ g_string_append (sql, ")");
}
- sqlEscape_destroy( escape );
+ sqlEscape_destroy (escape);
}
else
{
- g_string_append( sql, "(" );
- g_string_append( sql, fieldName );
- convert_query_comparison_to_sql( pPredData, isInverted, sql );
+ g_string_append (sql, "(");
+ g_string_append (sql, fieldName);
+ convert_query_comparison_to_sql (pPredData, isInverted, sql);
- if ( strcmp( pPredData->type_name, QOF_TYPE_NUMERIC ) == 0 )
+ if (strcmp (pPredData->type_name, QOF_TYPE_NUMERIC) == 0)
{
query_numeric_t pData = (query_numeric_t)pPredData;
- double d = gnc_numeric_to_double( pData->amount );
+ double d = gnc_numeric_to_double (pData->amount);
- g_string_append_printf( sql, "%f", d );
+ g_string_append_printf (sql, "%f", d);
}
- else if ( g_strcmp0( pPredData->type_name, QOF_TYPE_DATE ) == 0 )
+ else if (g_strcmp0 (pPredData->type_name, QOF_TYPE_DATE) == 0)
{
query_date_t date_data = (query_date_t)pPredData;
gchar* datebuf;
- datebuf = gnc_sql_convert_timespec_to_string( be, date_data->date );
- g_string_append_printf( sql, "'%s'", datebuf );
+ datebuf = gnc_sql_convert_timespec_to_string (be, date_data->date);
+ g_string_append_printf (sql, "'%s'", datebuf);
}
- else if ( strcmp( pPredData->type_name, QOF_TYPE_INT32 ) == 0 )
+ else if (strcmp (pPredData->type_name, QOF_TYPE_INT32) == 0)
{
query_int32_t pData = (query_int32_t)pPredData;
- g_string_append_printf( sql, "%d", pData->val );
+ g_string_append_printf (sql, "%d", pData->val);
}
- else if ( strcmp( pPredData->type_name, QOF_TYPE_INT64 ) == 0 )
+ else if (strcmp (pPredData->type_name, QOF_TYPE_INT64) == 0)
{
query_int64_t pData = (query_int64_t)pPredData;
- g_string_append_printf( sql, "%" G_GINT64_FORMAT, pData->val );
+ g_string_append_printf (sql, "%" G_GINT64_FORMAT, pData->val);
}
- else if ( strcmp( pPredData->type_name, QOF_TYPE_DOUBLE ) == 0 )
+ else if (strcmp (pPredData->type_name, QOF_TYPE_DOUBLE) == 0)
{
query_double_t pData = (query_double_t)pPredData;
- g_string_append_printf( sql, "%f", pData->val );
+ g_string_append_printf (sql, "%f", pData->val);
}
- else if ( strcmp( pPredData->type_name, QOF_TYPE_BOOLEAN ) == 0 )
+ else if (strcmp (pPredData->type_name, QOF_TYPE_BOOLEAN) == 0)
{
query_boolean_t pData = (query_boolean_t)pPredData;
- g_string_append_printf( sql, "%d", pData->val );
+ g_string_append_printf (sql, "%d", pData->val);
}
else
{
- PERR( "Unknown query predicate type: %s\n", pPredData->type_name );
+ PERR ("Unknown query predicate type: %s\n", pPredData->type_name);
}
- g_string_append( sql, ")" );
+ g_string_append (sql, ")");
}
}
@@ -1068,27 +1089,27 @@ typedef struct
#define TX_GUID_CHECK 0
G_GNUC_UNUSED static gpointer
-compile_split_query( GncSqlBackend* be, QofQuery* query )
+compile_split_query (GncSqlBackend* be, QofQuery* query)
{
split_query_info_t* query_info = NULL;
gchar* query_sql;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( query != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (query != NULL, NULL);
- query_info = static_cast<decltype(query_info)>(
- g_malloc(sizeof(split_query_info_t)));
- g_assert( query_info != NULL );
+ query_info = static_cast<decltype (query_info)> (
+ g_malloc (sizeof (split_query_info_t)));
+ g_assert (query_info != NULL);
query_info->has_been_run = FALSE;
- if ( qof_query_has_terms( query ) )
+ if (qof_query_has_terms (query))
{
- GList* orterms = qof_query_get_terms( query );
+ GList* orterms = qof_query_get_terms (query);
GList* orTerm;
- GString* sql = g_string_new( "" );
+ GString* sql = g_string_new ("");
gboolean need_OR = FALSE;
- for ( orTerm = orterms; orTerm != NULL; orTerm = orTerm->next )
+ for (orTerm = orterms; orTerm != NULL; orTerm = orTerm->next)
{
GList* andterms = (GList*)orTerm->data;
GList* andTerm;
@@ -1096,61 +1117,61 @@ compile_split_query( GncSqlBackend* be, QofQuery* query )
#if TX_GUID_CHECK
gboolean has_tx_guid_check = FALSE;
#endif
- if ( need_OR )
+ if (need_OR)
{
- g_string_append( sql, " OR " );
+ g_string_append (sql, " OR ");
}
- g_string_append( sql, "(" );
- for ( andTerm = andterms; andTerm != NULL; andTerm = andTerm->next )
+ g_string_append (sql, "(");
+ for (andTerm = andterms; andTerm != NULL; andTerm = andTerm->next)
{
QofQueryTerm* term;
GSList* paramPath;
gboolean unknownPath = FALSE;
term = (QofQueryTerm*)andTerm->data;
- paramPath = qof_query_term_get_param_path( term );
- const char *path = static_cast<decltype(path)>(paramPath->data);
- const char *next_path =
- static_cast<decltype(next_path)>(paramPath->next->data);
- if (strcmp(path, QOF_PARAM_BOOK) == 0) continue;
+ paramPath = qof_query_term_get_param_path (term);
+ const char* path = static_cast<decltype (path)> (paramPath->data);
+ const char* next_path =
+ static_cast<decltype (next_path)> (paramPath->next->data);
+ if (strcmp (path, QOF_PARAM_BOOK) == 0) continue;
#if SIMPLE_QUERY_COMPILATION
- if ( strcmp(path, SPLIT_ACCOUNT) != 0 ||
- strcmp(next_path, QOF_PARAM_GUID) != 0 ) continue;
+ if (strcmp (path, SPLIT_ACCOUNT) != 0 ||
+ strcmp (next_path, QOF_PARAM_GUID) != 0) continue;
#endif
- if ( need_AND ) g_string_append( sql, " AND " );
+ if (need_AND) g_string_append (sql, " AND ");
- if ( strcmp(path, SPLIT_ACCOUNT) == 0 &&
- strcmp(next_path, QOF_PARAM_GUID) == 0 )
+ if (strcmp (path, SPLIT_ACCOUNT) == 0 &&
+ strcmp (next_path, QOF_PARAM_GUID) == 0)
{
- convert_query_term_to_sql( be, "s.account_guid", term, sql );
+ convert_query_term_to_sql (be, "s.account_guid", term, sql);
#if SIMPLE_QUERY_COMPILATION
goto done_compiling_query;
#endif
}
- else if ( strcmp(path, SPLIT_RECONCILE) == 0 )
+ else if (strcmp (path, SPLIT_RECONCILE) == 0)
{
- convert_query_term_to_sql( be, "s.reconcile_state", term, sql );
+ convert_query_term_to_sql (be, "s.reconcile_state", term, sql);
}
- else if ( strcmp(path, SPLIT_TRANS) == 0 )
+ else if (strcmp (path, SPLIT_TRANS) == 0)
{
#if TX_GUID_CHECK
- if ( !has_tx_guid_check )
+ if (!has_tx_guid_check)
{
- g_string_append( sql, "(splits.tx_guid = transactions.guid) AND " );
+ g_string_append (sql, "(splits.tx_guid = transactions.guid) AND ");
has_tx_guid_check = TRUE;
}
#endif
- if (strcmp(next_path, TRANS_DATE_POSTED) == 0 )
+ if (strcmp (next_path, TRANS_DATE_POSTED) == 0)
{
- convert_query_term_to_sql( be, "t.post_date", term, sql );
+ convert_query_term_to_sql (be, "t.post_date", term, sql);
}
- else if (strcmp(next_path, TRANS_DESCRIPTION) == 0 )
+ else if (strcmp (next_path, TRANS_DESCRIPTION) == 0)
{
- convert_query_term_to_sql( be, "t.description", term, sql );
+ convert_query_term_to_sql (be, "t.description", term, sql);
}
else
{
@@ -1158,9 +1179,9 @@ compile_split_query( GncSqlBackend* be, QofQuery* query )
}
}
- else if ( strcmp(path, SPLIT_VALUE) == 0 )
+ else if (strcmp (path, SPLIT_VALUE) == 0)
{
- convert_query_term_to_sql( be, "s.value_num/s.value_denom", term, sql );
+ convert_query_term_to_sql (be, "s.value_num/s.value_denom", term, sql);
}
else
@@ -1168,31 +1189,31 @@ compile_split_query( GncSqlBackend* be, QofQuery* query )
unknownPath = TRUE;
}
- if ( unknownPath )
+ if (unknownPath)
{
- GString* name = g_string_new( (gchar*)paramPath->data );
- while ( paramPath->next != NULL )
+ GString* name = g_string_new ((gchar*)paramPath->data);
+ while (paramPath->next != NULL)
{
- g_string_append( name, "." );
- g_string_append( name, next_path );
+ g_string_append (name, ".");
+ g_string_append (name, next_path);
paramPath = paramPath->next;
}
- PERR( "Unknown SPLIT query field: %s\n", name->str );
- g_string_free( name, TRUE );
+ PERR ("Unknown SPLIT query field: %s\n", name->str);
+ g_string_free (name, TRUE);
}
need_AND = TRUE;
}
/* If the last char in the string is a '(', then for some reason, there were
no terms added to the SQL. If so, remove it and ignore the OR term. */
- if ( sql->str[sql->len-1] == '(' )
+ if (sql->str[sql->len - 1] == '(')
{
- g_string_truncate( sql, sql->len - 1 );
+ g_string_truncate (sql, sql->len - 1);
need_OR = FALSE;
}
else
{
- g_string_append( sql, ")" );
+ g_string_append (sql, ")");
need_OR = TRUE;
}
}
@@ -1200,100 +1221,100 @@ compile_split_query( GncSqlBackend* be, QofQuery* query )
#if SIMPLE_QUERY_COMPILATION
done_compiling_query:
#endif
- if ( sql->len != 0 )
+ if (sql->len != 0)
{
#if SIMPLE_QUERY_COMPILATION
- g_string_append( sql, ")" );
+ g_string_append (sql, ")");
#endif
- query_sql = g_strdup_printf(
+ query_sql = g_strdup_printf (
"SELECT DISTINCT t.* FROM %s AS t, %s AS s WHERE s.tx_guid=t.guid AND %s",
- TRANSACTION_TABLE, SPLIT_TABLE, sql->str );
+ TRANSACTION_TABLE, SPLIT_TABLE, sql->str);
}
else
{
- query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
+ query_sql = g_strdup_printf ("SELECT * FROM %s", TRANSACTION_TABLE);
}
- query_info->stmt = gnc_sql_create_statement_from_sql( be, query_sql );
+ query_info->stmt = gnc_sql_create_statement_from_sql (be, query_sql);
- g_string_free( sql, TRUE );
- g_free( query_sql );
+ g_string_free (sql, TRUE);
+ g_free (query_sql);
}
else
{
- query_sql = g_strdup_printf( "SELECT * FROM %s", TRANSACTION_TABLE );
- query_info->stmt = gnc_sql_create_statement_from_sql( be, query_sql );
- g_free( query_sql );
+ query_sql = g_strdup_printf ("SELECT * FROM %s", TRANSACTION_TABLE);
+ query_info->stmt = gnc_sql_create_statement_from_sql (be, query_sql);
+ g_free (query_sql);
}
return query_info;
}
G_GNUC_UNUSED static void
-run_split_query( GncSqlBackend* be, gpointer pQuery )
+run_split_query (GncSqlBackend* be, gpointer pQuery)
{
split_query_info_t* query_info = (split_query_info_t*)pQuery;
- g_return_if_fail( be != NULL );
- g_return_if_fail( pQuery != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (pQuery != NULL);
- if ( !query_info->has_been_run )
+ if (!query_info->has_been_run)
{
- query_transactions( be, query_info->stmt );
+ query_transactions (be, query_info->stmt);
query_info->has_been_run = TRUE;
- gnc_sql_statement_dispose( query_info->stmt );
+ gnc_sql_statement_dispose (query_info->stmt);
query_info->stmt = NULL;
}
}
G_GNUC_UNUSED static void
-free_split_query( GncSqlBackend* be, gpointer pQuery )
+free_split_query (GncSqlBackend* be, gpointer pQuery)
{
- g_return_if_fail( be != NULL );
- g_return_if_fail( pQuery != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (pQuery != NULL);
- g_free( pQuery );
+ g_free (pQuery);
}
/* ----------------------------------------------------------------- */
typedef struct
{
- const GncSqlBackend* be;
+ const GncSqlBackend* be;
Account* acct;
char reconcile_state;
gnc_numeric balance;
} single_acct_balance_t;
static void
-set_acct_bal_account_from_guid( gpointer pObject, gpointer pValue )
+set_acct_bal_account_from_guid (gpointer pObject, gpointer pValue)
{
single_acct_balance_t* bal = (single_acct_balance_t*)pObject;
const GncGUID* guid = (const GncGUID*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pValue != NULL);
- bal->acct = xaccAccountLookup( guid, bal->be->book );
+ bal->acct = xaccAccountLookup (guid, bal->be->book);
}
static void
-set_acct_bal_reconcile_state( gpointer pObject, gpointer pValue )
+set_acct_bal_reconcile_state (gpointer pObject, gpointer pValue)
{
single_acct_balance_t* bal = (single_acct_balance_t*)pObject;
const gchar* s = (const gchar*)pValue;
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( pValue != NULL );
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (pValue != NULL);
bal->reconcile_state = s[0];
}
static void
-set_acct_bal_balance( gpointer pObject, gnc_numeric value )
+set_acct_bal_balance (gpointer pObject, gnc_numeric value)
{
single_acct_balance_t* bal = (single_acct_balance_t*)pObject;
- g_return_if_fail( pObject != NULL );
+ g_return_if_fail (pObject != NULL);
bal->balance = value;
}
@@ -1307,24 +1328,24 @@ static const GncSqlColumnTableEntry acct_balances_col_table[] =
};
G_GNUC_UNUSED static single_acct_balance_t*
-load_single_acct_balances( const GncSqlBackend* be, GncSqlRow* row )
+load_single_acct_balances (const GncSqlBackend* be, GncSqlRow* row)
{
single_acct_balance_t* bal = NULL;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- bal = static_cast<decltype(bal)>(g_malloc(sizeof(single_acct_balance_t)));
- g_assert( bal != NULL );
+ bal = static_cast<decltype (bal)> (g_malloc (sizeof (single_acct_balance_t)));
+ g_assert (bal != NULL);
bal->be = be;
- gnc_sql_load_object( be, row, NULL, bal, acct_balances_col_table );
+ gnc_sql_load_object (be, row, NULL, bal, acct_balances_col_table);
return bal;
}
- GSList*
-gnc_sql_get_account_balances_slist( GncSqlBackend* be )
+GSList*
+gnc_sql_get_account_balances_slist (GncSqlBackend* be)
{
#if LOAD_TRANSACTIONS_AS_NEEDED
GncSqlResult* result;
@@ -1332,78 +1353,82 @@ gnc_sql_get_account_balances_slist( GncSqlBackend* be )
gchar* buf;
GSList* bal_slist = NULL;
- g_return_val_if_fail( be != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
- buf = g_strdup_printf( "SELECT account_guid, reconcile_state, sum(quantity_num) as quantity_num, quantity_denom FROM %s GROUP BY account_guid, reconcile_state, quantity_denom ORDER BY account_guid, reconcile_state",
- SPLIT_TABLE );
- stmt = gnc_sql_create_statement_from_sql( be, buf );
- g_assert( stmt != NULL );
- g_free( buf );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ buf = g_strdup_printf ("SELECT account_guid, reconcile_state, sum(quantity_num) as quantity_num, quantity_denom FROM %s GROUP BY account_guid, reconcile_state, quantity_denom ORDER BY account_guid, reconcile_state",
+ SPLIT_TABLE);
+ stmt = gnc_sql_create_statement_from_sql (be, buf);
+ g_assert (stmt != NULL);
+ g_free (buf);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
acct_balances_t* bal = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
single_acct_balance_t* single_bal;
// Get the next reconcile state balance and merge with other balances
- single_bal = load_single_acct_balances( be, row );
- if ( single_bal != NULL )
+ single_bal = load_single_acct_balances (be, row);
+ if (single_bal != NULL)
{
- if ( bal != NULL && bal->acct != single_bal->acct )
+ if (bal != NULL && bal->acct != single_bal->acct)
{
- bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, bal->reconciled_balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- bal->balance = gnc_numeric_add( bal->balance, bal->cleared_balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- bal_slist = g_slist_append( bal_slist, bal );
+ bal->cleared_balance = gnc_numeric_add (bal->cleared_balance,
+ bal->reconciled_balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ bal->balance = gnc_numeric_add (bal->balance, bal->cleared_balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ bal_slist = g_slist_append (bal_slist, bal);
bal = NULL;
}
- if ( bal == NULL )
+ if (bal == NULL)
{
- bal = g_malloc( (gsize)sizeof(acct_balances_t) );
- g_assert( bal != NULL );
+ bal = g_malloc ((gsize)sizeof (acct_balances_t));
+ g_assert (bal != NULL);
bal->acct = single_bal->acct;
- bal->balance = gnc_numeric_zero();
- bal->cleared_balance = gnc_numeric_zero();
- bal->reconciled_balance = gnc_numeric_zero();
+ bal->balance = gnc_numeric_zero ();
+ bal->cleared_balance = gnc_numeric_zero ();
+ bal->reconciled_balance = gnc_numeric_zero ();
}
- if ( single_bal->reconcile_state == 'n' )
+ if (single_bal->reconcile_state == 'n')
{
- bal->balance = gnc_numeric_add( bal->balance, single_bal->balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ bal->balance = gnc_numeric_add (bal->balance, single_bal->balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
- else if ( single_bal->reconcile_state == 'c' )
+ else if (single_bal->reconcile_state == 'c')
{
- bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, single_bal->balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ bal->cleared_balance = gnc_numeric_add (bal->cleared_balance,
+ single_bal->balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
- else if ( single_bal->reconcile_state == 'y' )
+ else if (single_bal->reconcile_state == 'y')
{
- bal->reconciled_balance = gnc_numeric_add( bal->reconciled_balance, single_bal->balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
+ bal->reconciled_balance = gnc_numeric_add (bal->reconciled_balance,
+ single_bal->balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
- g_free( single_bal );
+ g_free (single_bal);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
// Add the final balance
- if ( bal != NULL )
+ if (bal != NULL)
{
- bal->cleared_balance = gnc_numeric_add( bal->cleared_balance, bal->reconciled_balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- bal->balance = gnc_numeric_add( bal->balance, bal->cleared_balance,
- GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD );
- bal_slist = g_slist_append( bal_slist, bal );
+ bal->cleared_balance = gnc_numeric_add (bal->cleared_balance,
+ bal->reconciled_balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ bal->balance = gnc_numeric_add (bal->balance, bal->cleared_balance,
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ bal_slist = g_slist_append (bal_slist, bal);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
}
return bal_slist;
@@ -1414,54 +1439,54 @@ gnc_sql_get_account_balances_slist( GncSqlBackend* be )
/* ----------------------------------------------------------------- */
static void
-load_tx_guid( const GncSqlBackend* be, GncSqlRow* row,
- QofSetterFunc setter, gpointer pObject,
- const GncSqlColumnTableEntry* table_row )
+load_tx_guid (const GncSqlBackend* be, GncSqlRow* row,
+ QofSetterFunc setter, gpointer pObject,
+ const GncSqlColumnTableEntry* table_row)
{
const GValue* val;
GncGUID guid;
Transaction* tx;
const gchar* guid_str;
- g_return_if_fail( be != NULL );
- g_return_if_fail( row != NULL );
- g_return_if_fail( pObject != NULL );
- g_return_if_fail( table_row != NULL );
+ g_return_if_fail (be != NULL);
+ g_return_if_fail (row != NULL);
+ g_return_if_fail (pObject != NULL);
+ g_return_if_fail (table_row != NULL);
- val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
- g_assert( val != NULL );
- guid_str = g_value_get_string(val);
- if ( guid_str != NULL )
+ val = gnc_sql_row_get_value_at_col_name (row, table_row->col_name);
+ g_assert (val != NULL);
+ guid_str = g_value_get_string (val);
+ if (guid_str != NULL)
{
- (void)string_to_guid( guid_str, &guid );
- tx = xaccTransLookup( &guid, be->book );
+ (void)string_to_guid (guid_str, &guid);
+ tx = xaccTransLookup (&guid, be->book);
// If the transaction is not found, try loading it
- if ( tx == NULL )
+ if (tx == NULL)
{
gchar* buf;
GncSqlStatement* stmt;
- buf = g_strdup_printf( "SELECT * FROM %s WHERE guid='%s'",
- TRANSACTION_TABLE, guid_str );
- stmt = gnc_sql_create_statement_from_sql( (GncSqlBackend*)be, buf );
- g_free( buf );
- query_transactions( (GncSqlBackend*)be, stmt );
- tx = xaccTransLookup( &guid, be->book );
+ buf = g_strdup_printf ("SELECT * FROM %s WHERE guid='%s'",
+ TRANSACTION_TABLE, guid_str);
+ stmt = gnc_sql_create_statement_from_sql ((GncSqlBackend*)be, buf);
+ g_free (buf);
+ query_transactions ((GncSqlBackend*)be, stmt);
+ tx = xaccTransLookup (&guid, be->book);
}
- if ( tx != NULL )
+ if (tx != NULL)
{
- if ( table_row->gobj_param_name != NULL )
+ if (table_row->gobj_param_name != NULL)
{
- qof_instance_increase_editlevel (pObject);
- g_object_set( pObject, table_row->gobj_param_name, tx, NULL );
- qof_instance_decrease_editlevel (pObject);
+ qof_instance_increase_editlevel (pObject);
+ g_object_set (pObject, table_row->gobj_param_name, tx, NULL);
+ qof_instance_decrease_editlevel (pObject);
}
else
{
- g_return_if_fail( setter != NULL );
- (*setter)( pObject, (const gpointer)tx );
+ g_return_if_fail (setter != NULL);
+ (*setter) (pObject, (const gpointer)tx);
}
}
}
@@ -1475,7 +1500,7 @@ static GncSqlColumnTypeHandler tx_guid_handler
};
/* ================================================================= */
void
-gnc_sql_init_transaction_handler( void )
+gnc_sql_init_transaction_handler (void)
{
static GncSqlObjectBackend be_data_tx =
{
@@ -1512,10 +1537,11 @@ gnc_sql_init_transaction_handler( void )
NULL /* write */
};
- (void)qof_object_register_backend( GNC_ID_TRANS, GNC_SQL_BACKEND, &be_data_tx );
- (void)qof_object_register_backend( GNC_ID_SPLIT, GNC_SQL_BACKEND, &be_data_split );
+ (void)qof_object_register_backend (GNC_ID_TRANS, GNC_SQL_BACKEND, &be_data_tx);
+ (void)qof_object_register_backend (GNC_ID_SPLIT, GNC_SQL_BACKEND,
+ &be_data_split);
- gnc_sql_register_col_type_handler( CT_TXREF, &tx_guid_handler );
+ gnc_sql_register_col_type_handler (CT_TXREF, &tx_guid_handler);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-transaction-sql.h b/src/backend/sql/gnc-transaction-sql.h
index d2332fb..eae7e63 100644
--- a/src/backend/sql/gnc-transaction-sql.h
+++ b/src/backend/sql/gnc-transaction-sql.h
@@ -36,7 +36,7 @@ extern "C"
#include "qof.h"
#include "Account.h"
}
-void gnc_sql_init_transaction_handler( void );
+void gnc_sql_init_transaction_handler (void);
/**
* Commits all of the splits for a transaction.
@@ -44,7 +44,7 @@ void gnc_sql_init_transaction_handler( void );
* @param be SQL backend
* @param pTx Transaction
*/
-void gnc_sql_transaction_commit_splits( GncSqlBackend* be, Transaction* pTx );
+void gnc_sql_transaction_commit_splits (GncSqlBackend* be, Transaction* pTx);
/**
* Saves a transaction to the db.
@@ -53,7 +53,7 @@ void gnc_sql_transaction_commit_splits( GncSqlBackend* be, Transaction* pTx );
* @param inst Transaction instance
* @return TRUE if successful, FALSE if unsuccessful
*/
-gboolean gnc_sql_save_transaction( GncSqlBackend* be, QofInstance* inst );
+gboolean gnc_sql_save_transaction (GncSqlBackend* be, QofInstance* inst);
/**
* Loads all transactions which have splits for a specific account.
@@ -61,14 +61,15 @@ gboolean gnc_sql_save_transaction( GncSqlBackend* be, QofInstance* inst );
* @param be SQL backend
* @param account Account
*/
-void gnc_sql_transaction_load_tx_for_account( GncSqlBackend* be, Account* account );
+void gnc_sql_transaction_load_tx_for_account (GncSqlBackend* be,
+ Account* account);
/**
* Loads all transactions.
*
* @param be SQL backend
*/
-void gnc_sql_transaction_load_all_tx( GncSqlBackend* be );
+void gnc_sql_transaction_load_all_tx (GncSqlBackend* be);
typedef struct
{
@@ -85,6 +86,6 @@ typedef struct
* @param be SQL backend
* @return GSList of acct_balances_t structures
*/
-GSList* gnc_sql_get_account_balances_slist( GncSqlBackend* be );
+GSList* gnc_sql_get_account_balances_slist (GncSqlBackend* be);
#endif /* GNC_TRANSACTION_SQL_H */
diff --git a/src/backend/sql/gnc-vendor-sql.cpp b/src/backend/sql/gnc-vendor-sql.cpp
index 9711a2f..70935ed 100644
--- a/src/backend/sql/gnc-vendor-sql.cpp
+++ b/src/backend/sql/gnc-vendor-sql.cpp
@@ -49,7 +49,7 @@ extern "C"
#include "gnc-commodity-sql.h"
#include "gnc-slots-sql.h"
-#define _GNC_MOD_NAME GNC_ID_VENDOR
+#define _GNC_MOD_NAME GNC_ID_VENDOR
G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
@@ -78,80 +78,80 @@ static GncSqlColumnTableEntry col_table[] =
};
static GncVendor*
-load_single_vendor( GncSqlBackend* be, GncSqlRow* row )
+load_single_vendor (GncSqlBackend* be, GncSqlRow* row)
{
const GncGUID* guid;
GncVendor* pVendor;
- g_return_val_if_fail( be != NULL, NULL );
- g_return_val_if_fail( row != NULL, NULL );
+ g_return_val_if_fail (be != NULL, NULL);
+ g_return_val_if_fail (row != NULL, NULL);
- guid = gnc_sql_load_guid( be, row );
- pVendor = gncVendorLookup( be->book, guid );
- if ( pVendor == NULL )
+ guid = gnc_sql_load_guid (be, row);
+ pVendor = gncVendorLookup (be->book, guid);
+ if (pVendor == NULL)
{
- pVendor = gncVendorCreate( be->book );
+ pVendor = gncVendorCreate (be->book);
}
- gnc_sql_load_object( be, row, GNC_ID_VENDOR, pVendor, col_table );
- qof_instance_mark_clean( QOF_INSTANCE(pVendor) );
+ gnc_sql_load_object (be, row, GNC_ID_VENDOR, pVendor, col_table);
+ qof_instance_mark_clean (QOF_INSTANCE (pVendor));
return pVendor;
}
static void
-load_all_vendors( GncSqlBackend* be )
+load_all_vendors (GncSqlBackend* be)
{
GncSqlStatement* stmt;
GncSqlResult* result;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- stmt = gnc_sql_create_select_statement( be, TABLE_NAME );
- result = gnc_sql_execute_select_statement( be, stmt );
- gnc_sql_statement_dispose( stmt );
- if ( result != NULL )
+ stmt = gnc_sql_create_select_statement (be, TABLE_NAME);
+ result = gnc_sql_execute_select_statement (be, stmt);
+ gnc_sql_statement_dispose (stmt);
+ if (result != NULL)
{
GncSqlRow* row;
GList* list = NULL;
- row = gnc_sql_result_get_first_row( result );
- while ( row != NULL )
+ row = gnc_sql_result_get_first_row (result);
+ while (row != NULL)
{
- GncVendor* pVendor = load_single_vendor( be, row );
- if ( pVendor != NULL )
+ GncVendor* pVendor = load_single_vendor (be, row);
+ if (pVendor != NULL)
{
- list = g_list_append( list, pVendor );
+ list = g_list_append (list, pVendor);
}
- row = gnc_sql_result_get_next_row( result );
+ row = gnc_sql_result_get_next_row (result);
}
- gnc_sql_result_dispose( result );
+ gnc_sql_result_dispose (result);
- if ( list != NULL )
+ if (list != NULL)
{
- gnc_sql_slots_load_for_list( be, list );
- g_list_free( list );
+ gnc_sql_slots_load_for_list (be, list);
+ g_list_free (list);
}
}
}
/* ================================================================= */
static void
-create_vendor_tables( GncSqlBackend* be )
+create_vendor_tables (GncSqlBackend* be)
{
gint version;
- g_return_if_fail( be != NULL );
+ g_return_if_fail (be != NULL);
- version = gnc_sql_get_table_version( be, TABLE_NAME );
- if ( version == 0 )
+ version = gnc_sql_get_table_version (be, TABLE_NAME);
+ if (version == 0)
{
- gnc_sql_create_table( be, TABLE_NAME, TABLE_VERSION, col_table );
+ gnc_sql_create_table (be, TABLE_NAME, TABLE_VERSION, col_table);
}
}
/* ================================================================= */
static gboolean
-save_vendor( GncSqlBackend* be, QofInstance* inst )
+save_vendor (GncSqlBackend* be, QofInstance* inst)
{
GncVendor* v;
const GncGUID* guid;
@@ -159,18 +159,18 @@ save_vendor( GncSqlBackend* be, QofInstance* inst )
gboolean is_infant;
gboolean is_ok = TRUE;
- g_return_val_if_fail( inst != NULL, FALSE );
- g_return_val_if_fail( GNC_IS_VENDOR(inst), FALSE );
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (inst != NULL, FALSE);
+ g_return_val_if_fail (GNC_IS_VENDOR (inst), FALSE);
+ g_return_val_if_fail (be != NULL, FALSE);
- v = GNC_VENDOR(inst);
+ v = GNC_VENDOR (inst);
- is_infant = qof_instance_get_infant( inst );
- if ( qof_instance_get_destroying( inst ) )
+ is_infant = qof_instance_get_infant (inst);
+ if (qof_instance_get_destroying (inst))
{
op = OP_DB_DELETE;
}
- else if ( be->is_pristine_db || is_infant )
+ else if (be->is_pristine_db || is_infant)
{
op = OP_DB_INSERT;
}
@@ -178,27 +178,28 @@ save_vendor( GncSqlBackend* be, QofInstance* inst )
{
op = OP_DB_UPDATE;
}
- if ( op != OP_DB_DELETE )
+ if (op != OP_DB_DELETE)
{
// Ensure the commodity is in the db
- is_ok = gnc_sql_save_commodity( be, gncVendorGetCurrency( v ) );
+ is_ok = gnc_sql_save_commodity (be, gncVendorGetCurrency (v));
}
- if ( is_ok )
+ if (is_ok)
{
- is_ok = gnc_sql_do_db_operation( be, op, TABLE_NAME, GNC_ID_VENDOR, v, col_table );
+ is_ok = gnc_sql_do_db_operation (be, op, TABLE_NAME, GNC_ID_VENDOR, v,
+ col_table);
}
- if ( is_ok )
+ if (is_ok)
{
// Now, commit or delete any slots
- guid = qof_instance_get_guid( inst );
- if ( !qof_instance_get_destroying(inst) )
+ guid = qof_instance_get_guid (inst);
+ if (!qof_instance_get_destroying (inst))
{
- is_ok = gnc_sql_slots_save( be, guid, is_infant, inst);
+ is_ok = gnc_sql_slots_save (be, guid, is_infant, inst);
}
else
{
- is_ok = gnc_sql_slots_delete( be, guid );
+ is_ok = gnc_sql_slots_delete (be, guid);
}
}
@@ -207,15 +208,15 @@ save_vendor( GncSqlBackend* be, QofInstance* inst )
/* ================================================================= */
static gboolean
-vendor_should_be_saved( GncVendor *vendor )
+vendor_should_be_saved (GncVendor* vendor)
{
- const char *id;
+ const char* id;
- g_return_val_if_fail( vendor != NULL, FALSE );
+ g_return_val_if_fail (vendor != NULL, FALSE);
/* make sure this is a valid vendor before we save it -- should have an ID */
- id = gncVendorGetID( vendor );
- if ( id == NULL || *id == '\0' )
+ id = gncVendorGetID (vendor);
+ if (id == NULL || *id == '\0')
{
return FALSE;
}
@@ -224,49 +225,49 @@ vendor_should_be_saved( GncVendor *vendor )
}
static void
-write_single_vendor( QofInstance *term_p, gpointer data_p )
+write_single_vendor (QofInstance* term_p, gpointer data_p)
{
write_objects_t* s = (write_objects_t*)data_p;
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_VENDOR(term_p) );
- g_return_if_fail( data_p != NULL );
+ g_return_if_fail (term_p != NULL);
+ g_return_if_fail (GNC_IS_VENDOR (term_p));
+ g_return_if_fail (data_p != NULL);
- if ( s->is_ok && vendor_should_be_saved( GNC_VENDOR(term_p) ) )
+ if (s->is_ok && vendor_should_be_saved (GNC_VENDOR (term_p)))
{
- s->is_ok = save_vendor( s->be, term_p );
+ s->is_ok = save_vendor (s->be, term_p);
}
}
static gboolean
-write_vendors( GncSqlBackend* be )
+write_vendors (GncSqlBackend* be)
{
write_objects_t data;
- g_return_val_if_fail( be != NULL, FALSE );
+ g_return_val_if_fail (be != NULL, FALSE);
data.be = be;
data.is_ok = TRUE;
- qof_object_foreach( GNC_ID_VENDOR, be->book, write_single_vendor, &data );
+ qof_object_foreach (GNC_ID_VENDOR, be->book, write_single_vendor, &data);
return data.is_ok;
}
/* ================================================================= */
void
-gnc_vendor_sql_initialize( void )
+gnc_vendor_sql_initialize (void)
{
static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_VENDOR,
- save_vendor, /* commit */
- load_all_vendors, /* initial_load */
- create_vendor_tables, /* create_tables */
+ save_vendor, /* commit */
+ load_all_vendors, /* initial_load */
+ create_vendor_tables, /* create_tables */
NULL, NULL, NULL,
- write_vendors /* write */
+ write_vendors /* write */
};
- qof_object_register_backend( GNC_ID_VENDOR, GNC_SQL_BACKEND, &be_data );
+ qof_object_register_backend (GNC_ID_VENDOR, GNC_SQL_BACKEND, &be_data);
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/sql/gnc-vendor-sql.h b/src/backend/sql/gnc-vendor-sql.h
index daf93ca..a39b9c2 100644
--- a/src/backend/sql/gnc-vendor-sql.h
+++ b/src/backend/sql/gnc-vendor-sql.h
@@ -30,6 +30,6 @@
#ifndef GNC_VENDOR_SQL_H
#define GNC_VENDOR_SQL_H
-void gnc_vendor_sql_initialize( void );
+void gnc_vendor_sql_initialize (void);
#endif /* GNC_VENDOR_SQL_H */
diff --git a/src/backend/sql/test/test-column-types.cpp b/src/backend/sql/test/test-column-types.cpp
index ca5d576..0189001 100644
--- a/src/backend/sql/test/test-column-types.cpp
+++ b/src/backend/sql/test/test-column-types.cpp
@@ -32,16 +32,16 @@ extern "C"
}
#include "gnc-backend-sql.h"
-int main( int argc, char ** argv )
+int main (int argc, char** argv)
{
- qof_init();
- cashobjects_register();
- gnc_sql_init( NULL );
+ qof_init ();
+ cashobjects_register ();
+ gnc_sql_init (NULL);
/* do_test(
qof_load_backend_library ("../.libs/", GNC_LIB_NAME),
" loading gnc-backend-gda GModule failed");
*/
- print_test_results();
- qof_close();
- exit( get_rv() );
+ print_test_results ();
+ qof_close ();
+ exit (get_rv ());
}
diff --git a/src/backend/sql/test/test-sqlbe.cpp b/src/backend/sql/test/test-sqlbe.cpp
index 9690455..0b3d12e 100644
--- a/src/backend/sql/test/test-sqlbe.cpp
+++ b/src/backend/sql/test/test-sqlbe.cpp
@@ -1,6 +1,6 @@
/********************************************************************
- * testmain.c: GLib g_test test execution file. *
- * Copyright 2011 John Ralls <jralls at ceridwen.us> *
+ * testmain.c: GLib g_test test execution file. *
+ * Copyright 2011 John Ralls <jralls at ceridwen.us> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@@ -30,14 +30,14 @@ extern void test_suite_gnc_backend_sql ();
int
main (int argc,
- char *argv[])
+ char* argv[])
{
- qof_init(); /* Initialize the GObject system */
- qof_log_init_filename_special("stderr"); /* Init the log system */
- g_test_init ( &argc, &argv, NULL ); /* initialize test program */
- g_test_bug_base("https://bugzilla.gnome.org/show_bug.cgi?id="); /* init the bugzilla URL */
+ qof_init (); /* Initialize the GObject system */
+ qof_log_init_filename_special ("stderr"); /* Init the log system */
+ g_test_init (&argc, &argv, NULL); /* initialize test program */
+ g_test_bug_base ("https://bugzilla.gnome.org/show_bug.cgi?id="); /* init the bugzilla URL */
test_suite_gnc_backend_sql ();
- return g_test_run( );
+ return g_test_run ();
}
diff --git a/src/backend/sql/test/utest-gnc-backend-sql.cpp b/src/backend/sql/test/utest-gnc-backend-sql.cpp
index 0757883..566d3d6 100644
--- a/src/backend/sql/test/utest-gnc-backend-sql.cpp
+++ b/src/backend/sql/test/utest-gnc-backend-sql.cpp
@@ -1,7 +1,7 @@
/********************************************************************
* utest-gnc-backend-sql.c: *
- * GLib g_test test suite for gnc-backend-sql.c. *
- * Copyright 2012 John Ralls <jralls at ceridwen.us> *
+ * GLib g_test test suite for gnc-backend-sql.c. *
+ * Copyright 2012 John Ralls <jralls at ceridwen.us> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@@ -30,7 +30,7 @@ extern "C"
/* Add specific headers for this class */
#include "../gnc-backend-sql.h"
-static const gchar *suitename = "/backend/sql/gnc-backend-sql";
+static const gchar* suitename = "/backend/sql/gnc-backend-sql";
void test_suite_gnc_backend_sql (void);
/* gnc_sql_init
@@ -180,13 +180,13 @@ test_dirty_cb (QofBook* book, gboolean dirty, gpointer data)
{
g_assert (data != NULL);
if (dirty)
- ++*(guint*)data;
- else if (*(guint*)data)
- --*(guint*)data;
+ ++* (guint*)data;
+ else if (* (guint*)data)
+ --* (guint*)data;
}
static gboolean
-fake_connection_function (GncSqlConnection *conn)
+fake_connection_function (GncSqlConnection* conn)
{
return TRUE;
}
@@ -195,17 +195,22 @@ static void
test_gnc_sql_commit_edit (void)
{
GncSqlBackend be;
- QofInstance *inst;
+ QofInstance* inst;
guint dirty_called = 0;
GncSqlConnection conn;
- const char *msg1 = "[gnc_sql_commit_edit()] gnc_sql_commit_edit(): Unknown object type 'null'\n";
- const char *msg2 = "[gnc_sql_commit_edit()] gnc_sql_commit_edit(): Unknown object type 'Book'\n";
- GLogLevelFlags loglevel = static_cast<decltype(loglevel)>(G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL);
- const char *logdomain = "gnc.backend.sql";
- TestErrorStruct check1 = { loglevel, const_cast<char*>(logdomain),
- const_cast<char*>(msg1), 0 };
- TestErrorStruct check2 = { loglevel, const_cast<char*>(logdomain),
- const_cast<char*>(msg2), 0 };
+ const char* msg1 =
+ "[gnc_sql_commit_edit()] gnc_sql_commit_edit(): Unknown object type 'null'\n";
+ const char* msg2 =
+ "[gnc_sql_commit_edit()] gnc_sql_commit_edit(): Unknown object type 'Book'\n";
+ GLogLevelFlags loglevel = static_cast<decltype (loglevel)>
+ (G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL);
+ const char* logdomain = "gnc.backend.sql";
+ TestErrorStruct check1 = { loglevel, const_cast<char*> (logdomain),
+ const_cast<char*> (msg1), 0
+ };
+ TestErrorStruct check2 = { loglevel, const_cast<char*> (logdomain),
+ const_cast<char*> (msg2), 0
+ };
guint hdlr1;
test_add_error (&check1);
@@ -220,7 +225,7 @@ test_gnc_sql_commit_edit (void)
conn.beginTransaction = fake_connection_function;
conn.rollbackTransaction = fake_connection_function;
conn.commitTransaction = fake_connection_function;
- inst = static_cast<decltype(inst)>(g_object_new (QOF_TYPE_INSTANCE, NULL));
+ inst = static_cast<decltype (inst)> (g_object_new (QOF_TYPE_INSTANCE, NULL));
qof_instance_init_data (inst, QOF_ID_NULL, be.book);
be.loading = FALSE;
qof_book_set_dirty_cb (be.book, test_dirty_cb, &dirty_called);
@@ -234,8 +239,8 @@ test_gnc_sql_commit_edit (void)
g_assert (!qof_instance_get_dirty_flag (inst));
g_assert (!qof_book_session_not_saved (be.book));
g_assert_cmpint (dirty_called, == , 0);
- g_assert_cmpint (check1.hits, ==, 2);
- g_assert_cmpint (check2.hits, ==, 0);
+ g_assert_cmpint (check1.hits, == , 2);
+ g_assert_cmpint (check2.hits, == , 0);
qof_book_mark_session_dirty (be.book);
@@ -246,8 +251,8 @@ test_gnc_sql_commit_edit (void)
g_assert (!qof_instance_get_dirty_flag (QOF_INSTANCE (be.book)));
g_assert (qof_book_session_not_saved (be.book));
g_assert_cmpint (dirty_called, == , 1);
- g_assert_cmpint (check1.hits, ==, 2);
- g_assert_cmpint (check2.hits, ==, 0);
+ g_assert_cmpint (check1.hits, == , 2);
+ g_assert_cmpint (check2.hits, == , 0);
qof_instance_set_dirty_flag (QOF_INSTANCE (be.book), TRUE);
@@ -258,8 +263,8 @@ test_gnc_sql_commit_edit (void)
g_assert (!qof_instance_get_dirty_flag (QOF_INSTANCE (be.book)));
g_assert (!qof_book_session_not_saved (be.book));
g_assert_cmpint (dirty_called, == , 0);
- g_assert_cmpint (check1.hits, ==, 2);
- g_assert_cmpint (check2.hits, ==, 2);
+ g_assert_cmpint (check1.hits, == , 2);
+ g_assert_cmpint (check2.hits, == , 2);
g_log_remove_handler (logdomain, hdlr1);
g_object_unref (inst);
@@ -593,20 +598,20 @@ test_gnc_sql_convert_timespec_to_string ()
nullptr, nullptr, FALSE, FALSE, FALSE, 0, 0, nullptr,
"%4d-%02d-%02d %02d:%02d:%02d"
};
- const char *date[numtests] = {"1995-03-11 19:17:26",
+ const char* date[numtests] = {"1995-03-11 19:17:26",
"2001-04-20 11:44:07",
"1964-02-29 09:15:23",
"1959-04-02 00:00:00",
"2043-11-22 05:32:45",
"2153-12-18 01:15:30"
- };
+ };
int i;
for (i = 0; i < numtests; i++)
{
Timespec ts = gnc_iso8601_to_timespec_gmt (date[i]);
- gchar *datestr = gnc_sql_convert_timespec_to_string (&be, ts);
- g_assert_cmpstr (date[i], ==, datestr);
+ gchar* datestr = gnc_sql_convert_timespec_to_string (&be, ts);
+ g_assert_cmpstr (date[i], == , datestr);
g_free (datestr);
}
@@ -1003,7 +1008,8 @@ test_suite_gnc_backend_sql (void)
// GNC_TEST_ADD (suitename, "add gvalue guid to slist", Fixture, nullptr, test_add_gvalue_guid_to_slist, teardown);
// GNC_TEST_ADD (suitename, "gnc sql add gvalue objectref guid to slist", Fixture, nullptr, test_gnc_sql_add_gvalue_objectref_guid_to_slist, teardown);
// GNC_TEST_ADD (suitename, "gnc sql add objectref guid col info to list", Fixture, nullptr, test_gnc_sql_add_objectref_guid_col_info_to_list, teardown);
- GNC_TEST_ADD_FUNC (suitename, "gnc sql convert timespec to string", test_gnc_sql_convert_timespec_to_string);
+ GNC_TEST_ADD_FUNC (suitename, "gnc sql convert timespec to string",
+ test_gnc_sql_convert_timespec_to_string);
// GNC_TEST_ADD (suitename, "load timespec", Fixture, nullptr, test_load_timespec, teardown);
// GNC_TEST_ADD (suitename, "add timespec col info to list", Fixture, nullptr, test_add_timespec_col_info_to_list, teardown);
// GNC_TEST_ADD (suitename, "add gvalue timespec to slist", Fixture, nullptr, test_add_gvalue_timespec_to_slist, teardown);
diff --git a/src/backend/xml/gnc-account-xml-v2.cpp b/src/backend/xml/gnc-account-xml-v2.cpp
index f189779..72e70ba 100644
--- a/src/backend/xml/gnc-account-xml-v2.cpp
+++ b/src/backend/xml/gnc-account-xml-v2.cpp
@@ -49,7 +49,7 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *account_version_string = "2.0.0";
+const gchar* account_version_string = "2.0.0";
/* ids */
#define gnc_account_string "gnc:account"
@@ -74,95 +74,95 @@ const gchar *account_version_string = "2.0.0";
#define act_placeholder_string "act:placeholder"
xmlNodePtr
-gnc_account_dom_tree_create(Account *act,
- gboolean exporting,
- gboolean allow_incompat)
+gnc_account_dom_tree_create (Account* act,
+ gboolean exporting,
+ gboolean allow_incompat)
{
- const char *str;
+ const char* str;
xmlNodePtr ret;
- GList *lots, *n;
- Account *parent;
- gnc_commodity *acct_commodity;
+ GList* lots, *n;
+ Account* parent;
+ gnc_commodity* acct_commodity;
ENTER ("(account=%p)", act);
- ret = xmlNewNode(NULL, BAD_CAST gnc_account_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST account_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_account_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST account_version_string);
- xmlAddChild(ret, text_to_dom_tree(act_name_string,
- xaccAccountGetName(act)));
+ xmlAddChild (ret, text_to_dom_tree (act_name_string,
+ xaccAccountGetName (act)));
- xmlAddChild(ret, guid_to_dom_tree(act_id_string, xaccAccountGetGUID(act)));
+ xmlAddChild (ret, guid_to_dom_tree (act_id_string, xaccAccountGetGUID (act)));
- xmlAddChild(ret, text_to_dom_tree(
- act_type_string,
- xaccAccountTypeEnumAsString(xaccAccountGetType(act))));
+ xmlAddChild (ret, text_to_dom_tree (
+ act_type_string,
+ xaccAccountTypeEnumAsString (xaccAccountGetType (act))));
/* Don't write new XML tags in version 2.3.x and 2.4.x because it
would mean 2.2.x cannot read those files again. But we can
enable writing these tags in 2.5.x or late in 2.4.x. */
/*
xmlAddChild(ret, boolean_to_dom_tree(
- act_hidden_string,
- xaccAccountGetHidden(act)));
+ act_hidden_string,
+ xaccAccountGetHidden(act)));
xmlAddChild(ret, boolean_to_dom_tree(
- act_placeholder_string,
- xaccAccountGetPlaceholder(act)));
+ act_placeholder_string,
+ xaccAccountGetPlaceholder(act)));
*/
- acct_commodity = xaccAccountGetCommodity(act);
+ acct_commodity = xaccAccountGetCommodity (act);
if (acct_commodity != NULL)
{
- xmlAddChild(ret, commodity_ref_to_dom_tree(act_commodity_string,
- acct_commodity));
+ xmlAddChild (ret, commodity_ref_to_dom_tree (act_commodity_string,
+ acct_commodity));
- xmlAddChild(ret, int_to_dom_tree(act_commodity_scu_string,
- xaccAccountGetCommoditySCUi(act)));
+ xmlAddChild (ret, int_to_dom_tree (act_commodity_scu_string,
+ xaccAccountGetCommoditySCUi (act)));
- if (xaccAccountGetNonStdSCU(act))
- xmlNewChild(ret, NULL, BAD_CAST act_non_standard_scu_string, NULL);
+ if (xaccAccountGetNonStdSCU (act))
+ xmlNewChild (ret, NULL, BAD_CAST act_non_standard_scu_string, NULL);
}
- str = xaccAccountGetCode(act);
- if (str && strlen(str) > 0)
+ str = xaccAccountGetCode (act);
+ if (str && strlen (str) > 0)
{
- xmlAddChild(ret, text_to_dom_tree(act_code_string, str));
+ xmlAddChild (ret, text_to_dom_tree (act_code_string, str));
}
- str = xaccAccountGetDescription(act);
- if (str && strlen(str) > 0)
+ str = xaccAccountGetDescription (act);
+ if (str && strlen (str) > 0)
{
- xmlAddChild(ret, text_to_dom_tree(act_description_string, str));
+ xmlAddChild (ret, text_to_dom_tree (act_description_string, str));
}
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(act_slots_string,
- QOF_INSTANCE(act)));
- parent = gnc_account_get_parent(act);
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (act_slots_string,
+ QOF_INSTANCE (act)));
+ parent = gnc_account_get_parent (act);
if (parent)
{
- if (!gnc_account_is_root(parent) || allow_incompat)
- xmlAddChild(ret, guid_to_dom_tree(act_parent_string,
- xaccAccountGetGUID(parent)));
+ if (!gnc_account_is_root (parent) || allow_incompat)
+ xmlAddChild (ret, guid_to_dom_tree (act_parent_string,
+ xaccAccountGetGUID (parent)));
}
lots = xaccAccountGetLotList (act);
PINFO ("lot list=%p", lots);
if (lots && !exporting)
{
- xmlNodePtr toaddto = xmlNewChild(ret, NULL, BAD_CAST act_lots_string, NULL);
+ xmlNodePtr toaddto = xmlNewChild (ret, NULL, BAD_CAST act_lots_string, NULL);
- lots = g_list_sort(lots, qof_instance_guid_compare);
+ lots = g_list_sort (lots, qof_instance_guid_compare);
for (n = lots; n; n = n->next)
{
- GNCLot * lot = static_cast<decltype(lot)>(n->data);
- xmlAddChild(toaddto, gnc_lot_dom_tree_create(lot));
+ GNCLot* lot = static_cast<decltype (lot)> (n->data);
+ xmlAddChild (toaddto, gnc_lot_dom_tree_create (lot));
}
}
- g_list_free(lots);
+ g_list_free (lots);
- LEAVE("");
+ LEAVE ("");
return ret;
}
@@ -170,20 +170,20 @@ gnc_account_dom_tree_create(Account *act,
struct account_pdata
{
- Account *account;
- QofBook *book;
+ Account* account;
+ QofBook* book;
};
static inline gboolean
-set_string(xmlNodePtr node, Account* act,
- void (*func)(Account *act, const gchar *txt))
+set_string (xmlNodePtr node, Account* act,
+ void (*func) (Account* act, const gchar* txt))
{
- gchar* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ gchar* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(act, txt);
+ func (act, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
@@ -191,23 +191,23 @@ set_string(xmlNodePtr node, Account* act,
static gboolean
account_name_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
- return set_string(node, pdata->account, xaccAccountSetName);
+ return set_string (node, pdata->account, xaccAccountSetName);
}
static gboolean
account_id_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
- GncGUID *guid;
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
+ GncGUID* guid;
- guid = dom_tree_to_guid(node);
- g_return_val_if_fail(guid, FALSE);
+ guid = dom_tree_to_guid (node);
+ g_return_val_if_fail (guid, FALSE);
- xaccAccountSetGUID(pdata->account, guid);
+ xaccAccountSetGUID (pdata->account, guid);
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -215,15 +215,15 @@ account_id_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
account_type_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
GNCAccountType type = ACCT_TYPE_INVALID;
- char *string;
+ char* string;
string = (char*) xmlNodeGetContent (node->xmlChildrenNode);
- xaccAccountStringToType(string, &type);
+ xaccAccountStringToType (string, &type);
xmlFree (string);
- xaccAccountSetType(pdata->account, type);
+ xaccAccountSetType (pdata->account, type);
return TRUE;
}
@@ -231,12 +231,12 @@ account_type_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
account_commodity_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
- gnc_commodity *ref;
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
+ gnc_commodity* ref;
// ref = dom_tree_to_commodity_ref_no_engine(node, pdata->book);
- ref = dom_tree_to_commodity_ref(node, pdata->book);
- xaccAccountSetCommodity(pdata->account, ref);
+ ref = dom_tree_to_commodity_ref (node, pdata->book);
+ xaccAccountSetCommodity (pdata->account, ref);
return TRUE;
}
@@ -244,11 +244,11 @@ account_commodity_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
account_commodity_scu_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
gint64 val;
- dom_tree_to_integer(node, &val);
- xaccAccountSetCommoditySCU(pdata->account, val);
+ dom_tree_to_integer (node, &val);
+ xaccAccountSetCommoditySCU (pdata->account, val);
return TRUE;
}
@@ -256,11 +256,11 @@ account_commodity_scu_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
account_hidden_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
gboolean val;
- dom_tree_to_boolean(node, &val);
- xaccAccountSetHidden(pdata->account, val);
+ dom_tree_to_boolean (node, &val);
+ xaccAccountSetHidden (pdata->account, val);
return TRUE;
}
@@ -268,11 +268,11 @@ account_hidden_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
account_placeholder_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
gboolean val;
- dom_tree_to_boolean(node, &val);
- xaccAccountSetPlaceholder(pdata->account, val);
+ dom_tree_to_boolean (node, &val);
+ xaccAccountSetPlaceholder (pdata->account, val);
return TRUE;
}
@@ -280,9 +280,9 @@ account_placeholder_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
account_non_standard_scu_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
- xaccAccountSetNonStdSCU(pdata->account, TRUE);
+ xaccAccountSetNonStdSCU (pdata->account, TRUE);
return TRUE;
}
@@ -294,13 +294,13 @@ account_non_standard_scu_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
deprecated_account_currency_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
- gnc_commodity *ref;
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
+ gnc_commodity* ref;
- PWARN("Account %s: Obsolete xml tag 'act:currency' will not be preserved.",
- xaccAccountGetName( pdata->account ));
- ref = dom_tree_to_commodity_ref_no_engine(node, pdata->book);
- DxaccAccountSetCurrency(pdata->account, ref);
+ PWARN ("Account %s: Obsolete xml tag 'act:currency' will not be preserved.",
+ xaccAccountGetName (pdata->account));
+ ref = dom_tree_to_commodity_ref_no_engine (node, pdata->book);
+ DxaccAccountSetCurrency (pdata->account, ref);
return TRUE;
}
@@ -308,32 +308,32 @@ deprecated_account_currency_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
deprecated_account_currency_scu_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
- PWARN("Account %s: Obsolete xml tag 'act:currency-scu' will not be preserved.",
- xaccAccountGetName( pdata->account ));
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
+ PWARN ("Account %s: Obsolete xml tag 'act:currency-scu' will not be preserved.",
+ xaccAccountGetName (pdata->account));
return TRUE;
}
static gboolean
deprecated_account_security_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
- gnc_commodity *ref, *orig = xaccAccountGetCommodity(pdata->account);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
+ gnc_commodity* ref, *orig = xaccAccountGetCommodity (pdata->account);
- PWARN("Account %s: Obsolete xml tag 'act:security' will not be preserved.",
- xaccAccountGetName( pdata->account ));
+ PWARN ("Account %s: Obsolete xml tag 'act:security' will not be preserved.",
+ xaccAccountGetName (pdata->account));
/* If the account has both a commodity and a security elemet, and
the commodity is a currecny, then the commodity is probably
wrong. In that case we want to replace it with the
security. jralls 2010-11-02 */
- if (!orig || gnc_commodity_is_currency( orig ) )
+ if (!orig || gnc_commodity_is_currency (orig))
{
- ref = dom_tree_to_commodity_ref_no_engine(node, pdata->book);
- xaccAccountSetCommodity(pdata->account, ref);
+ ref = dom_tree_to_commodity_ref_no_engine (node, pdata->book);
+ xaccAccountSetCommodity (pdata->account, ref);
/* If the SCU was set, it was probably wrong, so zero it out
so that the SCU handler can fix it if there's a
security-scu element. jralls 2010-11-02 */
- xaccAccountSetCommoditySCU(pdata->account, 0);
+ xaccAccountSetCommoditySCU (pdata->account, 0);
}
return TRUE;
@@ -342,15 +342,15 @@ deprecated_account_security_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
deprecated_account_security_scu_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
gint64 val;
- PWARN("Account %s: Obsolete xml tag 'act:security-scu' will not be preserved.",
- xaccAccountGetName( pdata->account ));
- if (!xaccAccountGetCommoditySCU(pdata->account))
+ PWARN ("Account %s: Obsolete xml tag 'act:security-scu' will not be preserved.",
+ xaccAccountGetName (pdata->account));
+ if (!xaccAccountGetCommoditySCU (pdata->account))
{
- dom_tree_to_integer(node, &val);
- xaccAccountSetCommoditySCU(pdata->account, val);
+ dom_tree_to_integer (node, &val);
+ xaccAccountSetCommoditySCU (pdata->account, val);
}
return TRUE;
@@ -361,28 +361,28 @@ deprecated_account_security_scu_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
account_slots_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->account));
}
static gboolean
account_parent_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
- Account *parent;
- GncGUID *gid;
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
+ Account* parent;
+ GncGUID* gid;
- gid = dom_tree_to_guid(node);
- g_return_val_if_fail(gid, FALSE);
+ gid = dom_tree_to_guid (node);
+ g_return_val_if_fail (gid, FALSE);
- parent = xaccAccountLookup(gid, pdata->book);
+ parent = xaccAccountLookup (gid, pdata->book);
if (!parent)
{
g_free (gid);
- g_return_val_if_fail(parent, FALSE);
+ g_return_val_if_fail (parent, FALSE);
}
- gnc_account_append_child(parent, pdata->account);
+ gnc_account_append_child (parent, pdata->account);
g_free (gid);
@@ -390,38 +390,38 @@ account_parent_handler (xmlNodePtr node, gpointer act_pdata)
}
static gboolean
-account_code_handler(xmlNodePtr node, gpointer act_pdata)
+account_code_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
- return set_string(node, pdata->account, xaccAccountSetCode);
+ return set_string (node, pdata->account, xaccAccountSetCode);
}
static gboolean
-account_description_handler(xmlNodePtr node, gpointer act_pdata)
+account_description_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
- return set_string(node, pdata->account, xaccAccountSetDescription);
+ return set_string (node, pdata->account, xaccAccountSetDescription);
}
static gboolean
-account_lots_handler(xmlNodePtr node, gpointer act_pdata)
+account_lots_handler (xmlNodePtr node, gpointer act_pdata)
{
- struct account_pdata *pdata = static_cast<decltype(pdata)>(act_pdata);
+ struct account_pdata* pdata = static_cast<decltype (pdata)> (act_pdata);
xmlNodePtr mark;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(node->xmlChildrenNode, FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (node->xmlChildrenNode, FALSE);
for (mark = node->xmlChildrenNode; mark; mark = mark->next)
{
- GNCLot *lot;
+ GNCLot* lot;
- if (g_strcmp0("text", (char*) mark->name) == 0)
+ if (g_strcmp0 ("text", (char*) mark->name) == 0)
continue;
- lot = dom_tree_to_lot(mark, pdata->book);
+ lot = dom_tree_to_lot (mark, pdata->book);
if (lot)
{
@@ -462,15 +462,15 @@ static struct dom_tree_handler account_handlers_v2[] =
};
static gboolean
-gnc_account_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_account_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *acc, *parent, *root;
+ Account* acc, *parent, *root;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
int type;
@@ -486,52 +486,52 @@ gnc_account_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- acc = dom_tree_to_account(tree, book);
+ acc = dom_tree_to_account (tree, book);
if (acc != NULL)
{
- gdata->cb(tag, gdata->parsedata, acc);
+ gdata->cb (tag, gdata->parsedata, acc);
/*
* Now return the account to the "edit" state. At the end of reading
* all the transactions, we will Commit. This replaces #splits
* rebalances with #accounts rebalances at the end. A BIG win!
*/
- xaccAccountBeginEdit(acc);
+ xaccAccountBeginEdit (acc);
/* Backwards compatability. If there's no parent, see if this
* account is of type ROOT. If not, find or create a ROOT
* account and make that the parent. */
- parent = gnc_account_get_parent(acc);
+ parent = gnc_account_get_parent (acc);
if (parent == NULL)
{
- type = xaccAccountGetType(acc);
+ type = xaccAccountGetType (acc);
if (type != ACCT_TYPE_ROOT)
{
- root = gnc_book_get_root_account(book);
+ root = gnc_book_get_root_account (book);
if (root == NULL)
{
- root = gnc_account_create_root(book);
+ root = gnc_account_create_root (book);
}
- gnc_account_append_child(root, acc);
+ gnc_account_append_child (root, acc);
}
}
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return acc != NULL;
}
Account*
-dom_tree_to_account (xmlNodePtr node, QofBook *book)
+dom_tree_to_account (xmlNodePtr node, QofBook* book)
{
struct account_pdata act_pdata;
- Account *accToRet;
+ Account* accToRet;
gboolean successful;
- accToRet = xaccMallocAccount(book);
- xaccAccountBeginEdit(accToRet);
+ accToRet = xaccMallocAccount (book);
+ xaccAccountBeginEdit (accToRet);
act_pdata.account = accToRet;
act_pdata.book = book;
@@ -553,9 +553,9 @@ dom_tree_to_account (xmlNodePtr node, QofBook *book)
}
sixtp*
-gnc_account_sixtp_parser_create(void)
+gnc_account_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_account_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_account_end_handler, NULL, NULL);
}
/* ====================== END OF FILE ===================*/
diff --git a/src/backend/xml/gnc-address-xml-v2.cpp b/src/backend/xml/gnc-address-xml-v2.cpp
index 9295da3..90dcf69 100644
--- a/src/backend/xml/gnc-address-xml-v2.cpp
+++ b/src/backend/xml/gnc-address-xml-v2.cpp
@@ -46,33 +46,33 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *address_version_string = "2.0.0";
+const gchar* address_version_string = "2.0.0";
/* ids */
-#define addr_name_string "addr:name"
-#define addr_addr1_string "addr:addr1"
-#define addr_addr2_string "addr:addr2"
-#define addr_addr3_string "addr:addr3"
-#define addr_addr4_string "addr:addr4"
-#define addr_phone_string "addr:phone"
-#define addr_fax_string "addr:fax"
-#define addr_email_string "addr:email"
-#define addr_slots_string "addr:slots"
+#define addr_name_string "addr:name"
+#define addr_addr1_string "addr:addr1"
+#define addr_addr2_string "addr:addr2"
+#define addr_addr3_string "addr:addr3"
+#define addr_addr4_string "addr:addr4"
+#define addr_phone_string "addr:phone"
+#define addr_fax_string "addr:fax"
+#define addr_email_string "addr:email"
+#define addr_slots_string "addr:slots"
static void
-maybe_add_string (xmlNodePtr ptr, const char *tag, const char *str)
+maybe_add_string (xmlNodePtr ptr, const char* tag, const char* str)
{
- if (str && strlen(str) > 0)
+ if (str && strlen (str) > 0)
xmlAddChild (ptr, text_to_dom_tree (tag, str));
}
xmlNodePtr
-gnc_address_to_dom_tree (const char *tag, GncAddress *addr)
+gnc_address_to_dom_tree (const char* tag, GncAddress* addr)
{
xmlNodePtr ret;
- ret = xmlNewNode(NULL, BAD_CAST tag);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST address_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST tag);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST address_version_string);
maybe_add_string (ret, addr_name_string, gncAddressGetName (addr));
@@ -85,9 +85,9 @@ gnc_address_to_dom_tree (const char *tag, GncAddress *addr)
maybe_add_string (ret, addr_fax_string, gncAddressGetFax (addr));
maybe_add_string (ret, addr_email_string, gncAddressGetEmail (addr));
- /* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(addr_slots_string,
- QOF_INSTANCE(addr)));
+ /* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (addr_slots_string,
+ QOF_INSTANCE (addr)));
return ret;
}
@@ -95,19 +95,19 @@ gnc_address_to_dom_tree (const char *tag, GncAddress *addr)
struct address_pdata
{
- GncAddress *address;
+ GncAddress* address;
};
static gboolean
-set_string(xmlNodePtr node, GncAddress* addr,
- void (*func)(GncAddress *addr, const char *txt))
+set_string (xmlNodePtr node, GncAddress* addr,
+ void (*func) (GncAddress* addr, const char* txt))
{
- gchar* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ gchar* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(addr, txt);
+ func (addr, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
@@ -115,71 +115,71 @@ set_string(xmlNodePtr node, GncAddress* addr,
static gboolean
address_name_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
- return set_string(node, pdata->address, gncAddressSetName);
+ return set_string (node, pdata->address, gncAddressSetName);
}
static gboolean
address_addr1_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
- return set_string(node, pdata->address, gncAddressSetAddr1);
+ return set_string (node, pdata->address, gncAddressSetAddr1);
}
static gboolean
address_addr2_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
- return set_string(node, pdata->address, gncAddressSetAddr2);
+ return set_string (node, pdata->address, gncAddressSetAddr2);
}
static gboolean
address_addr3_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
- return set_string(node, pdata->address, gncAddressSetAddr3);
+ return set_string (node, pdata->address, gncAddressSetAddr3);
}
static gboolean
address_addr4_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
- return set_string(node, pdata->address, gncAddressSetAddr4);
+ return set_string (node, pdata->address, gncAddressSetAddr4);
}
static gboolean
address_phone_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
- return set_string(node, pdata->address, gncAddressSetPhone);
+ return set_string (node, pdata->address, gncAddressSetPhone);
}
static gboolean
address_fax_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
- return set_string(node, pdata->address, gncAddressSetFax);
+ return set_string (node, pdata->address, gncAddressSetFax);
}
static gboolean
address_email_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
- return set_string(node, pdata->address, gncAddressSetEmail);
+ return set_string (node, pdata->address, gncAddressSetEmail);
}
static gboolean
address_slots_handler (xmlNodePtr node, gpointer addr_pdata)
{
- struct address_pdata *pdata = static_cast<decltype(pdata)>(addr_pdata);
+ struct address_pdata* pdata = static_cast<decltype (pdata)> (addr_pdata);
return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->address));
}
@@ -198,7 +198,7 @@ static struct dom_tree_handler address_handlers_v2[] =
};
gboolean
-gnc_dom_tree_to_address (xmlNodePtr node, GncAddress *address)
+gnc_dom_tree_to_address (xmlNodePtr node, GncAddress* address)
{
struct address_pdata addr_pdata;
gboolean successful;
@@ -217,10 +217,10 @@ gnc_dom_tree_to_address (xmlNodePtr node, GncAddress *address)
}
static gboolean
-address_ns(FILE *out)
+address_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "addr");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "addr");
}
void
@@ -230,11 +230,11 @@ gnc_address_xml_initialize (void)
{
GNC_FILE_BACKEND_VERS,
"gnc:Address",
- NULL, /* parser_create */
- NULL, /* add_item */
- NULL, /* get_count */
- NULL, /* write */
- NULL, /* scrub */
+ NULL, /* parser_create */
+ NULL, /* add_item */
+ NULL, /* get_count */
+ NULL, /* write */
+ NULL, /* scrub */
address_ns,
};
diff --git a/src/backend/xml/gnc-address-xml-v2.h b/src/backend/xml/gnc-address-xml-v2.h
index 6c86484..d1ed84f 100644
--- a/src/backend/xml/gnc-address-xml-v2.h
+++ b/src/backend/xml/gnc-address-xml-v2.h
@@ -26,8 +26,8 @@ extern "C"
{
#include "gncAddress.h"
}
-gboolean gnc_dom_tree_to_address (xmlNodePtr node, GncAddress *address);
-xmlNodePtr gnc_address_to_dom_tree (const char *tag, GncAddress *addr);
+gboolean gnc_dom_tree_to_address (xmlNodePtr node, GncAddress* address);
+xmlNodePtr gnc_address_to_dom_tree (const char* tag, GncAddress* addr);
void gnc_address_xml_initialize (void);
#endif /* GNC_ADDRESS_XML_V2_H */
diff --git a/src/backend/xml/gnc-backend-xml.cpp b/src/backend/xml/gnc-backend-xml.cpp
index 823c5c8..259e1e3 100644
--- a/src/backend/xml/gnc-backend-xml.cpp
+++ b/src/backend/xml/gnc-backend-xml.cpp
@@ -50,7 +50,7 @@ extern "C"
# include <unistd.h>
#else
# ifdef _MSC_VER
-typedef int ssize_t;
+ typedef int ssize_t;
# endif
#endif
#include <errno.h>
@@ -103,16 +103,16 @@ typedef int ssize_t;
static QofLogModule log_module = GNC_MOD_BACKEND;
-static gboolean save_may_clobber_data (QofBackend *bend);
+static gboolean save_may_clobber_data (QofBackend* bend);
/* ================================================================= */
static gboolean
-gnc_xml_be_get_file_lock (FileBackend *be)
+gnc_xml_be_get_file_lock (FileBackend* be)
{
struct stat statbuf;
#ifndef G_OS_WIN32
- char *pathbuf = NULL, *path = NULL, *tmpbuf = NULL;
+ char* pathbuf = NULL, *path = NULL, *tmpbuf = NULL;
size_t pathbuf_size = 0;
#endif
int rc;
@@ -126,7 +126,8 @@ gnc_xml_be_get_file_lock (FileBackend *be)
return FALSE;
}
- be->lockfd = g_open (be->lockfile, O_RDWR | O_CREAT | O_EXCL , S_IRUSR | S_IWUSR);
+ be->lockfd = g_open (be->lockfile, O_RDWR | O_CREAT | O_EXCL ,
+ S_IRUSR | S_IWUSR);
if (be->lockfd < 0)
{
/* oops .. we can't create the lockfile .. */
@@ -135,8 +136,8 @@ gnc_xml_be_get_file_lock (FileBackend *be)
case EACCES:
case EROFS:
case ENOSPC:
- PWARN( "Unable to create the lockfile %s; may not have write priv",
- be->lockfile );
+ PWARN ("Unable to create the lockfile %s; may not have write priv",
+ be->lockfile);
be_err = ERR_BACKEND_READONLY;
break;
default:
@@ -165,22 +166,27 @@ gnc_xml_be_get_file_lock (FileBackend *be)
#ifndef G_OS_WIN32
pathbuf_size = strlen (be->lockfile) + 100;
- pathbuf = (char *) malloc (pathbuf_size);
- if (pathbuf == NULL) {
- return FALSE;
+ pathbuf = (char*) malloc (pathbuf_size);
+ if (pathbuf == NULL)
+ {
+ return FALSE;
}
strcpy (pathbuf, be->lockfile);
path = strrchr (pathbuf, '.');
- while (snprintf (path, pathbuf_size - (path - pathbuf), ".%lx.%d.LNK", gethostid(), getpid())
- >= static_cast<int>(pathbuf_size - (path - pathbuf)))
+ while (snprintf (path, pathbuf_size - (path - pathbuf), ".%lx.%d.LNK",
+ gethostid (), getpid ())
+ >= static_cast<int> (pathbuf_size - (path - pathbuf)))
{
pathbuf_size += 100;
- tmpbuf = (char *) realloc (pathbuf, pathbuf_size);
- if (tmpbuf == NULL) {
- free(pathbuf);
- return FALSE;
- } else {
- pathbuf = tmpbuf;
+ tmpbuf = (char*) realloc (pathbuf, pathbuf_size);
+ if (tmpbuf == NULL)
+ {
+ free (pathbuf);
+ return FALSE;
+ }
+ else
+ {
+ pathbuf = tmpbuf;
}
}
@@ -190,10 +196,10 @@ gnc_xml_be_get_file_lock (FileBackend *be)
/* If hard links aren't supported, just allow the lock. */
if (errno == EPERM || errno == ENOSYS
# ifdef EOPNOTSUPP
- || errno == EOPNOTSUPP
+ || errno == EOPNOTSUPP
# endif
# ifdef ENOTSUP
- || errno == ENOTSUP
+ || errno == ENOTSUP
# endif
)
{
@@ -217,7 +223,7 @@ gnc_xml_be_get_file_lock (FileBackend *be)
/* oops .. stat failed! This can't happen! */
qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_LOCKED);
qof_backend_set_message ((QofBackend*)be, "Failed to stat lockfile %s",
- be->lockfile );
+ be->lockfile);
g_unlink (pathbuf);
free (pathbuf);
close (be->lockfd);
@@ -253,11 +259,11 @@ gnc_xml_be_get_file_lock (FileBackend *be)
#define FILE_URI_PREFIX "file://"
static void
-xml_session_begin(QofBackend *be_start, QofSession *session,
- const char *book_id, gboolean ignore_lock,
- gboolean create, gboolean force)
+xml_session_begin (QofBackend* be_start, QofSession* session,
+ const char* book_id, gboolean ignore_lock,
+ gboolean create, gboolean force)
{
- FileBackend *be = (FileBackend*) be_start;
+ FileBackend* be = (FileBackend*) be_start;
ENTER (" ");
@@ -268,13 +274,13 @@ xml_session_begin(QofBackend *be_start, QofSession *session,
{
qof_backend_set_error (be_start, ERR_FILEIO_FILE_NOT_FOUND);
qof_backend_set_message (be_start, "No path specified");
- LEAVE("");
+ LEAVE ("");
return;
}
- if (create && !force && save_may_clobber_data( be_start ) )
+ if (create && !force && save_may_clobber_data (be_start))
{
qof_backend_set_error (be_start, ERR_BACKEND_STORE_EXISTS);
- LEAVE("Might clobber, no force");
+ LEAVE ("Might clobber, no force");
return;
}
@@ -289,22 +295,23 @@ xml_session_begin(QofBackend *be_start, QofSession *session,
rc = g_stat (be->dirname, &statbuf);
if (rc != 0
#if COMPILER(MSVC)
- || (statbuf.st_mode & _S_IFDIR) == 0
+ || (statbuf.st_mode & _S_IFDIR) == 0
#else
- || !S_ISDIR(statbuf.st_mode)
+ || !S_ISDIR (statbuf.st_mode)
#endif
)
{
/* Error on stat or if it isn't a directory means we
cannot find this filename */
qof_backend_set_error (be_start, ERR_FILEIO_FILE_NOT_FOUND);
- qof_backend_set_message (be_start, "Couldn't find directory for %s", be->fullpath);
+ qof_backend_set_message (be_start, "Couldn't find directory for %s",
+ be->fullpath);
PWARN ("Couldn't find directory for %s", be->fullpath);
g_free (be->fullpath);
be->fullpath = NULL;
g_free (be->dirname);
be->dirname = NULL;
- LEAVE("");
+ LEAVE ("");
return;
}
@@ -320,26 +327,26 @@ xml_session_begin(QofBackend *be_start, QofSession *session,
be->fullpath = NULL;
g_free (be->dirname);
be->dirname = NULL;
- LEAVE("");
+ LEAVE ("");
return;
}
if (rc == 0
#if COMPILER(MSVC)
- && (statbuf.st_mode & _S_IFDIR) != 0
+ && (statbuf.st_mode & _S_IFDIR) != 0
#else
- && S_ISDIR(statbuf.st_mode)
+ && S_ISDIR (statbuf.st_mode)
#endif
)
{
qof_backend_set_error (be_start, ERR_FILEIO_UNKNOWN_FILE_TYPE);
- qof_backend_set_message(be_start, "Path %s is a directory",
- be->fullpath);
- PWARN("Path %s is a directory", be->fullpath);
+ qof_backend_set_message (be_start, "Path %s is a directory",
+ be->fullpath);
+ PWARN ("Path %s is a directory", be->fullpath);
g_free (be->fullpath);
be->fullpath = NULL;
g_free (be->dirname);
be->dirname = NULL;
- LEAVE("");
+ LEAVE ("");
return;
}
}
@@ -352,7 +359,7 @@ xml_session_begin(QofBackend *be_start, QofSession *session,
PINFO ("logpath=%s", be->fullpath ? be->fullpath : "(null)");
/* And let's see if we can get a lock on it. */
- be->lockfile = g_strconcat(be->fullpath, ".LCK", NULL);
+ be->lockfile = g_strconcat (be->fullpath, ".LCK", NULL);
if (!ignore_lock && !gnc_xml_be_get_file_lock (be))
{
@@ -364,7 +371,7 @@ xml_session_begin(QofBackend *be_start, QofSession *session,
if (force)
{
- QofBackendError berror = qof_backend_get_error(be_start);
+ QofBackendError berror = qof_backend_get_error (be_start);
if (berror == ERR_BACKEND_LOCKED || berror == ERR_BACKEND_READONLY)
{
// Even though we couldn't get the lock, we were told to force
@@ -374,11 +381,11 @@ xml_session_begin(QofBackend *be_start, QofSession *session,
else
{
// Unknown error. Push it again on the error stack.
- qof_backend_set_error(be_start, berror);
+ qof_backend_set_error (be_start, berror);
}
}
- LEAVE("");
+ LEAVE ("");
return;
}
@@ -389,14 +396,14 @@ xml_session_begin(QofBackend *be_start, QofSession *session,
/* ================================================================= */
static void
-xml_session_end(QofBackend *be_start)
+xml_session_end (QofBackend* be_start)
{
- FileBackend *be = (FileBackend*)be_start;
+ FileBackend* be = (FileBackend*)be_start;
ENTER (" ");
- if ( be->book && qof_book_is_readonly( be->book ) )
+ if (be->book && qof_book_is_readonly (be->book))
{
- qof_backend_set_error( (QofBackend*)be, ERR_BACKEND_READONLY );
+ qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_READONLY);
return;
}
@@ -417,8 +424,8 @@ xml_session_end(QofBackend *be_start)
rv = g_unlink (be->lockfile);
if (rv)
{
- PWARN("Error on g_unlink(%s): %d: %s", be->lockfile,
- errno, g_strerror(errno) ? g_strerror(errno) : "");
+ PWARN ("Error on g_unlink(%s): %d: %s", be->lockfile,
+ errno, g_strerror (errno) ? g_strerror (errno) : "");
}
}
@@ -437,13 +444,13 @@ xml_session_end(QofBackend *be_start)
}
static void
-xml_destroy_backend(QofBackend *be)
+xml_destroy_backend (QofBackend* be)
{
/* Stop transaction logging */
xaccLogSetBaseName (NULL);
- qof_backend_destroy(be);
- g_free(be);
+ qof_backend_destroy (be);
+ g_free (be);
}
/* ================================================================= */
@@ -461,7 +468,7 @@ xml_destroy_backend(QofBackend *be)
#define buf_size 1024
static gboolean
-copy_file(const char *orig, const char *bkup)
+copy_file (const char* orig, const char* bkup)
{
char buf[buf_size];
int orig_fd;
@@ -474,43 +481,43 @@ copy_file(const char *orig, const char *bkup)
flags = O_BINARY;
#endif
- orig_fd = g_open(orig, O_RDONLY | flags, 0);
+ orig_fd = g_open (orig, O_RDONLY | flags, 0);
if (orig_fd == -1)
{
return FALSE;
}
- bkup_fd = g_open(bkup, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL | flags, 0600);
+ bkup_fd = g_open (bkup, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL | flags, 0600);
if (bkup_fd == -1)
{
- close(orig_fd);
+ close (orig_fd);
return FALSE;
}
do
{
- count_read = read(orig_fd, buf, buf_size);
+ count_read = read (orig_fd, buf, buf_size);
if (count_read == -1 && errno != EINTR)
{
- close(orig_fd);
- close(bkup_fd);
+ close (orig_fd);
+ close (bkup_fd);
return FALSE;
}
if (count_read > 0)
{
- count_write = write(bkup_fd, buf, count_read);
+ count_write = write (bkup_fd, buf, count_read);
if (count_write == -1)
{
- close(orig_fd);
- close(bkup_fd);
+ close (orig_fd);
+ close (bkup_fd);
return FALSE;
}
}
}
while (count_read > 0);
- close(orig_fd);
- close(bkup_fd);
+ close (orig_fd);
+ close (bkup_fd);
return TRUE;
}
@@ -518,7 +525,8 @@ copy_file(const char *orig, const char *bkup)
/* ================================================================= */
static gboolean
-gnc_int_link_or_make_backup(FileBackend *be, const char *orig, const char *bkup)
+gnc_int_link_or_make_backup (FileBackend* be, const char* orig,
+ const char* bkup)
{
gboolean copy_success = FALSE;
int err_ret =
@@ -533,25 +541,25 @@ gnc_int_link_or_make_backup(FileBackend *be, const char *orig, const char *bkup)
#ifdef HAVE_LINK
if (errno == EPERM || errno == ENOSYS
# ifdef EOPNOTSUPP
- || errno == EOPNOTSUPP
+ || errno == EOPNOTSUPP
# endif
# ifdef ENOTSUP
- || errno == ENOTSUP
+ || errno == ENOTSUP
# endif
# ifdef ENOSYS
- || errno == ENOSYS
+ || errno == ENOSYS
# endif
)
#endif
{
- copy_success = copy_file(orig, bkup);
+ copy_success = copy_file (orig, bkup);
}
if (!copy_success)
{
- qof_backend_set_error((QofBackend*)be, ERR_FILEIO_BACKUP_ERROR);
+ qof_backend_set_error ((QofBackend*)be, ERR_FILEIO_BACKUP_ERROR);
PWARN ("unable to make file backup from %s to %s: %s",
- orig, bkup, g_strerror(errno) ? g_strerror(errno) : "");
+ orig, bkup, g_strerror (errno) ? g_strerror (errno) : "");
return FALSE;
}
}
@@ -562,12 +570,12 @@ gnc_int_link_or_make_backup(FileBackend *be, const char *orig, const char *bkup)
/* ================================================================= */
static QofBookFileType
-gnc_xml_be_determine_file_type(const char *path)
+gnc_xml_be_determine_file_type (const char* path)
{
gboolean with_encoding;
QofBookFileType v2type;
- v2type = gnc_is_xml_data_file_v2(path, &with_encoding);
+ v2type = gnc_is_xml_data_file_v2 (path, &with_encoding);
if (v2type == GNC_BOOK_XML2_FILE)
{
if (with_encoding)
@@ -591,12 +599,12 @@ gnc_xml_be_determine_file_type(const char *path)
}
static gboolean
-gnc_determine_file_type (const char *uri)
+gnc_determine_file_type (const char* uri)
{
struct stat sbuf;
int rc;
- FILE *t;
- gchar *filename;
+ FILE* t;
+ gchar* filename;
QofBookFileType xml_type;
gboolean result;
@@ -605,21 +613,21 @@ gnc_determine_file_type (const char *uri)
return FALSE;
}
- filename = gnc_uri_get_path ( uri );
- if (0 == g_strcmp0(filename, QOF_STDOUT))
+ filename = gnc_uri_get_path (uri);
+ if (0 == g_strcmp0 (filename, QOF_STDOUT))
{
result = FALSE;
goto det_exit;
}
- t = g_fopen( filename, "r" );
+ t = g_fopen (filename, "r");
if (!t)
{
PINFO (" new file");
result = TRUE;
goto det_exit;
}
- fclose(t);
- rc = g_stat(filename, &sbuf);
+ fclose (t);
+ rc = g_stat (filename, &sbuf);
if (rc < 0)
{
result = FALSE;
@@ -631,10 +639,10 @@ gnc_determine_file_type (const char *uri)
result = TRUE;
goto det_exit;
}
- xml_type = gnc_is_xml_data_file_v2(filename, NULL);
+ xml_type = gnc_is_xml_data_file_v2 (filename, NULL);
if ((xml_type == GNC_BOOK_XML2_FILE) ||
- (xml_type == GNC_BOOK_XML1_FILE) ||
- (xml_type == GNC_BOOK_POST_XML2_0_0_FILE))
+ (xml_type == GNC_BOOK_XML1_FILE) ||
+ (xml_type == GNC_BOOK_POST_XML2_0_0_FILE))
{
result = TRUE;
goto det_exit;
@@ -643,17 +651,17 @@ gnc_determine_file_type (const char *uri)
result = FALSE;
det_exit:
- g_free ( filename );
+ g_free (filename);
return result;
}
static gboolean
-gnc_xml_be_backup_file(FileBackend *be)
+gnc_xml_be_backup_file (FileBackend* be)
{
gboolean bkup_ret;
- char *timestamp;
- char *backup;
- const char *datafile;
+ char* timestamp;
+ char* backup;
+ const char* datafile;
struct stat statbuf;
int rc;
@@ -663,15 +671,15 @@ gnc_xml_be_backup_file(FileBackend *be)
if (rc)
return (errno == ENOENT);
- if (gnc_xml_be_determine_file_type(datafile) == GNC_BOOK_BIN_FILE)
+ if (gnc_xml_be_determine_file_type (datafile) == GNC_BOOK_BIN_FILE)
{
/* make a more permanent safer backup */
- const char *back = "-binfmt.bkup";
- char *bin_bkup = g_new(char, strlen(datafile) + strlen(back) + 1);
- strcpy(bin_bkup, datafile);
- strcat(bin_bkup, back);
- bkup_ret = gnc_int_link_or_make_backup(be, datafile, bin_bkup);
- g_free(bin_bkup);
+ const char* back = "-binfmt.bkup";
+ char* bin_bkup = g_new (char, strlen (datafile) + strlen (back) + 1);
+ strcpy (bin_bkup, datafile);
+ strcat (bin_bkup, back);
+ bkup_ret = gnc_int_link_or_make_backup (be, datafile, bin_bkup);
+ g_free (bin_bkup);
if (!bkup_ret)
{
return FALSE;
@@ -679,11 +687,11 @@ gnc_xml_be_backup_file(FileBackend *be)
}
timestamp = gnc_date_timestamp ();
- backup = g_strconcat( datafile, ".", timestamp, GNC_DATAFILE_EXT, NULL );
+ backup = g_strconcat (datafile, ".", timestamp, GNC_DATAFILE_EXT, NULL);
g_free (timestamp);
- bkup_ret = gnc_int_link_or_make_backup(be, datafile, backup);
- g_free(backup);
+ bkup_ret = gnc_int_link_or_make_backup (be, datafile, backup);
+ g_free (backup);
return bkup_ret;
}
@@ -691,24 +699,24 @@ gnc_xml_be_backup_file(FileBackend *be)
/* ================================================================= */
static gboolean
-gnc_xml_be_write_to_file(FileBackend *fbe,
- QofBook *book,
- const gchar *datafile,
- gboolean make_backup)
+gnc_xml_be_write_to_file (FileBackend* fbe,
+ QofBook* book,
+ const gchar* datafile,
+ gboolean make_backup)
{
- QofBackend *be = &fbe->be;
- char *tmp_name;
+ QofBackend* be = &fbe->be;
+ char* tmp_name;
struct stat statbuf;
int rc;
QofBackendError be_err;
ENTER (" book=%p file=%s", book, datafile);
- if (book && qof_book_is_readonly(book))
+ if (book && qof_book_is_readonly (book))
{
/* Are we read-only? Don't continue in this case. */
- qof_backend_set_error( (QofBackend*)be, ERR_BACKEND_READONLY );
- LEAVE("");
+ qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_READONLY);
+ LEAVE ("");
return FALSE;
}
@@ -716,38 +724,39 @@ gnc_xml_be_write_to_file(FileBackend *fbe,
/* XXX this is currently broken due to faulty 'Save As' logic. */
/* if (FALSE == qof_book_session_not_saved (book)) return FALSE; */
- tmp_name = g_new(char, strlen(datafile) + 12);
- strcpy(tmp_name, datafile);
- strcat(tmp_name, ".tmp-XXXXXX");
+ tmp_name = g_new (char, strlen (datafile) + 12);
+ strcpy (tmp_name, datafile);
+ strcat (tmp_name, ".tmp-XXXXXX");
- if (!mktemp(tmp_name))
+ if (!mktemp (tmp_name))
{
- qof_backend_set_error(be, ERR_BACKEND_MISC);
- qof_backend_set_message( be, "Failed to make temp file" );
- LEAVE("");
+ qof_backend_set_error (be, ERR_BACKEND_MISC);
+ qof_backend_set_message (be, "Failed to make temp file");
+ LEAVE ("");
return FALSE;
}
if (make_backup)
{
- if (!gnc_xml_be_backup_file(fbe))
+ if (!gnc_xml_be_backup_file (fbe))
{
- LEAVE("");
+ LEAVE ("");
return FALSE;
}
}
- if (gnc_book_write_to_xml_file_v2(book, tmp_name, gnc_prefs_get_file_save_compressed()))
+ if (gnc_book_write_to_xml_file_v2 (book, tmp_name,
+ gnc_prefs_get_file_save_compressed ()))
{
/* Record the file's permissions before g_unlinking it */
- rc = g_stat(datafile, &statbuf);
+ rc = g_stat (datafile, &statbuf);
if (rc == 0)
{
/* We must never chmod the file /dev/null */
- g_assert(g_strcmp0(tmp_name, "/dev/null") != 0);
+ g_assert (g_strcmp0 (tmp_name, "/dev/null") != 0);
/* Use the permissions from the original data file */
- if (g_chmod(tmp_name, statbuf.st_mode) != 0)
+ if (g_chmod (tmp_name, statbuf.st_mode) != 0)
{
/* qof_backend_set_error(be, ERR_BACKEND_PERM); */
/* qof_backend_set_message( be, "Failed to chmod filename %s", tmp_name ); */
@@ -756,9 +765,9 @@ gnc_xml_be_write_to_file(FileBackend *fbe,
therefore wrong to signal the ERR_BACKEND_PERM
error here which implies that the saving itself
failed. Instead, we simply ignore this. */
- PWARN("unable to chmod filename %s: %s",
- tmp_name ? tmp_name : "(null)",
- g_strerror(errno) ? g_strerror(errno) : "");
+ PWARN ("unable to chmod filename %s: %s",
+ tmp_name ? tmp_name : "(null)",
+ g_strerror (errno) ? g_strerror (errno) : "");
#if VFAT_DOESNT_SUCK /* chmod always fails on vfat/samba fs */
/* g_free(tmp_name); */
/* return FALSE; */
@@ -767,15 +776,15 @@ gnc_xml_be_write_to_file(FileBackend *fbe,
#ifdef HAVE_CHOWN
/* Don't try to change the owner. Only root can do
that. */
- if (chown(tmp_name, -1, statbuf.st_gid) != 0)
+ if (chown (tmp_name, -1, statbuf.st_gid) != 0)
{
/* qof_backend_set_error(be, ERR_BACKEND_PERM); */
/* qof_backend_set_message( be, "Failed to chown filename %s", tmp_name ); */
/* A failed chown doesn't mean that the saving itself
failed. So don't abort with an error here! */
- PWARN("unable to chown filename %s: %s",
- tmp_name ? tmp_name : "(null)",
- strerror(errno) ? strerror(errno) : "");
+ PWARN ("unable to chown filename %s: %s",
+ tmp_name ? tmp_name : "(null)",
+ strerror (errno) ? strerror (errno) : "");
#if VFAT_DOESNT_SUCK /* chown always fails on vfat fs */
/* g_free(tmp_name);
return FALSE; */
@@ -783,36 +792,36 @@ gnc_xml_be_write_to_file(FileBackend *fbe,
}
#endif
}
- if (g_unlink(datafile) != 0 && errno != ENOENT)
+ if (g_unlink (datafile) != 0 && errno != ENOENT)
{
- qof_backend_set_error(be, ERR_BACKEND_READONLY);
- PWARN("unable to unlink filename %s: %s",
- datafile ? datafile : "(null)",
- g_strerror(errno) ? g_strerror(errno) : "");
- g_free(tmp_name);
- LEAVE("");
+ qof_backend_set_error (be, ERR_BACKEND_READONLY);
+ PWARN ("unable to unlink filename %s: %s",
+ datafile ? datafile : "(null)",
+ g_strerror (errno) ? g_strerror (errno) : "");
+ g_free (tmp_name);
+ LEAVE ("");
return FALSE;
}
- if (!gnc_int_link_or_make_backup(fbe, tmp_name, datafile))
+ if (!gnc_int_link_or_make_backup (fbe, tmp_name, datafile))
{
- qof_backend_set_error(be, ERR_FILEIO_BACKUP_ERROR);
- qof_backend_set_message( be, "Failed to make backup file %s",
- datafile ? datafile : "NULL" );
- g_free(tmp_name);
- LEAVE("");
+ qof_backend_set_error (be, ERR_FILEIO_BACKUP_ERROR);
+ qof_backend_set_message (be, "Failed to make backup file %s",
+ datafile ? datafile : "NULL");
+ g_free (tmp_name);
+ LEAVE ("");
return FALSE;
}
- if (g_unlink(tmp_name) != 0)
+ if (g_unlink (tmp_name) != 0)
{
- qof_backend_set_error(be, ERR_BACKEND_PERM);
- PWARN("unable to unlink temp filename %s: %s",
- tmp_name ? tmp_name : "(null)",
- g_strerror(errno) ? g_strerror(errno) : "");
- g_free(tmp_name);
- LEAVE("");
+ qof_backend_set_error (be, ERR_BACKEND_PERM);
+ PWARN ("unable to unlink temp filename %s: %s",
+ tmp_name ? tmp_name : "(null)",
+ g_strerror (errno) ? g_strerror (errno) : "");
+ g_free (tmp_name);
+ LEAVE ("");
return FALSE;
}
- g_free(tmp_name);
+ g_free (tmp_name);
/* Since we successfully saved the book,
* we should mark it clean. */
@@ -822,7 +831,7 @@ gnc_xml_be_write_to_file(FileBackend *fbe,
}
else
{
- if (g_unlink(tmp_name) != 0)
+ if (g_unlink (tmp_name) != 0)
{
switch (errno)
{
@@ -837,24 +846,24 @@ gnc_xml_be_write_to_file(FileBackend *fbe,
be_err = ERR_BACKEND_MISC;
break;
}
- qof_backend_set_error(be, be_err);
- PWARN("unable to unlink temp_filename %s: %s",
- tmp_name ? tmp_name : "(null)",
- g_strerror(errno) ? g_strerror(errno) : "");
+ qof_backend_set_error (be, be_err);
+ PWARN ("unable to unlink temp_filename %s: %s",
+ tmp_name ? tmp_name : "(null)",
+ g_strerror (errno) ? g_strerror (errno) : "");
/* already in an error just flow on through */
}
else
{
/* Use a generic write error code */
- qof_backend_set_error(be, ERR_FILEIO_WRITE_ERROR);
- qof_backend_set_message( be, "Unable to write to temp file %s",
- tmp_name ? tmp_name : "NULL" );
+ qof_backend_set_error (be, ERR_FILEIO_WRITE_ERROR);
+ qof_backend_set_message (be, "Unable to write to temp file %s",
+ tmp_name ? tmp_name : "NULL");
}
- g_free(tmp_name);
- LEAVE("");
+ g_free (tmp_name);
+ LEAVE ("");
return FALSE;
}
- LEAVE("");
+ LEAVE ("");
return TRUE;
}
@@ -866,10 +875,10 @@ gnc_xml_be_write_to_file(FileBackend *fbe,
*/
static void
-gnc_xml_be_remove_old_files(FileBackend *be)
+gnc_xml_be_remove_old_files (FileBackend* be)
{
- const gchar *dent;
- GDir *dir;
+ const gchar* dent;
+ GDir* dir;
struct stat lockstatbuf, statbuf;
time64 now;
@@ -880,48 +889,48 @@ gnc_xml_be_remove_old_files(FileBackend *be)
if (!dir)
return;
- now = gnc_time(NULL);
- while ((dent = g_dir_read_name(dir)) != NULL)
+ now = gnc_time (NULL);
+ while ((dent = g_dir_read_name (dir)) != NULL)
{
- gchar *name;
+ gchar* name;
/* Ensure we only evaluate GnuCash related files. */
- if ( !(g_str_has_suffix(dent, ".LNK") ||
- g_str_has_suffix(dent, ".xac") /* old data file extension */ ||
- g_str_has_suffix(dent, GNC_DATAFILE_EXT) ||
- g_str_has_suffix(dent, GNC_LOGFILE_EXT)) )
+ if (! (g_str_has_suffix (dent, ".LNK") ||
+ g_str_has_suffix (dent, ".xac") /* old data file extension */ ||
+ g_str_has_suffix (dent, GNC_DATAFILE_EXT) ||
+ g_str_has_suffix (dent, GNC_LOGFILE_EXT)))
continue;
- name = g_build_filename(be->dirname, dent, (gchar*)NULL);
+ name = g_build_filename (be->dirname, dent, (gchar*)NULL);
/* Only evaluate files associated with the current data file. */
- if (!g_str_has_prefix(name, be->fullpath))
+ if (!g_str_has_prefix (name, be->fullpath))
{
- g_free(name);
+ g_free (name);
continue;
}
/* Never remove the current data file itself */
- if (g_strcmp0(name, be->fullpath) == 0)
+ if (g_strcmp0 (name, be->fullpath) == 0)
{
- g_free(name);
+ g_free (name);
continue;
}
/* Test if the current file is a lock file */
- if (g_str_has_suffix(name, ".LNK"))
+ if (g_str_has_suffix (name, ".LNK"))
{
/* Is a lock file. Skip the active lock file */
- if ((g_strcmp0(name, be->linkfile) != 0) &&
- /* Only delete lock files older than the active one */
- (g_stat(name, &statbuf) == 0) &&
- (statbuf.st_mtime < lockstatbuf.st_mtime))
+ if ((g_strcmp0 (name, be->linkfile) != 0) &&
+ /* Only delete lock files older than the active one */
+ (g_stat (name, &statbuf) == 0) &&
+ (statbuf.st_mtime < lockstatbuf.st_mtime))
{
PINFO ("remove stale lock file: %s", name);
- g_unlink(name);
+ g_unlink (name);
}
- g_free(name);
+ g_free (name);
continue;
}
@@ -939,22 +948,22 @@ gnc_xml_be_remove_old_files(FileBackend *be)
* juggling, but considering the above tests, this should always
* be safe */
regex_t pattern;
- gchar *stamp_start = name + strlen(be->fullpath);
- gchar *expression = g_strdup_printf ("^\\.[[:digit:]]{14}(\\%s|\\%s|\\.xac)$",
+ gchar* stamp_start = name + strlen (be->fullpath);
+ gchar* expression = g_strdup_printf ("^\\.[[:digit:]]{14}(\\%s|\\%s|\\.xac)$",
GNC_DATAFILE_EXT, GNC_LOGFILE_EXT);
gboolean got_date_stamp = FALSE;
- if (regcomp(&pattern, expression, REG_EXTENDED | REG_ICASE) != 0)
- PWARN("Cannot compile regex for date stamp");
- else if (regexec(&pattern, stamp_start, 0, NULL, 0) == 0)
+ if (regcomp (&pattern, expression, REG_EXTENDED | REG_ICASE) != 0)
+ PWARN ("Cannot compile regex for date stamp");
+ else if (regexec (&pattern, stamp_start, 0, NULL, 0) == 0)
got_date_stamp = TRUE;
- regfree(&pattern);
- g_free(expression);
+ regfree (&pattern);
+ g_free (expression);
if (!got_date_stamp) /* Not a gnucash created file after all... */
{
- g_free(name);
+ g_free (name);
continue;
}
}
@@ -962,40 +971,40 @@ gnc_xml_be_remove_old_files(FileBackend *be)
/* The file is a backup or log file. Check the user's retention preference
* to determine if we should keep it or not
*/
- if (gnc_prefs_get_file_retention_policy() == XML_RETAIN_NONE)
+ if (gnc_prefs_get_file_retention_policy () == XML_RETAIN_NONE)
{
PINFO ("remove stale file: %s - reason: preference XML_RETAIN_NONE", name);
- g_unlink(name);
+ g_unlink (name);
}
- else if ((gnc_prefs_get_file_retention_policy() == XML_RETAIN_DAYS) &&
- (gnc_prefs_get_file_retention_days() > 0))
+ else if ((gnc_prefs_get_file_retention_policy () == XML_RETAIN_DAYS) &&
+ (gnc_prefs_get_file_retention_days () > 0))
{
int days;
/* Is the backup file old enough to delete */
- if (g_stat(name, &statbuf) != 0)
+ if (g_stat (name, &statbuf) != 0)
{
- g_free(name);
+ g_free (name);
continue;
}
- days = (int)(difftime(now, statbuf.st_mtime) / 86400);
+ days = (int) (difftime (now, statbuf.st_mtime) / 86400);
- PINFO ("file retention = %d days", gnc_prefs_get_file_retention_days());
- if (days >= gnc_prefs_get_file_retention_days())
+ PINFO ("file retention = %d days", gnc_prefs_get_file_retention_days ());
+ if (days >= gnc_prefs_get_file_retention_days ())
{
PINFO ("remove stale file: %s - reason: more than %d days old", name, days);
- g_unlink(name);
+ g_unlink (name);
}
}
- g_free(name);
+ g_free (name);
}
g_dir_close (dir);
}
static void
-xml_sync_all(QofBackend* be, QofBook *book)
+xml_sync_all (QofBackend* be, QofBook* book)
{
- FileBackend *fbe = (FileBackend *) be;
+ FileBackend* fbe = (FileBackend*) be;
ENTER ("book=%p, fbe->book=%p", book, fbe->book);
/* We make an important assumption here, that we might want to change
@@ -1007,10 +1016,10 @@ xml_sync_all(QofBackend* be, QofBook *book)
if (NULL == fbe->book) fbe->book = book;
if (book != fbe->book) return;
- if (qof_book_is_readonly( fbe->book ) )
+ if (qof_book_is_readonly (fbe->book))
{
/* Are we read-only? Don't continue in this case. */
- qof_backend_set_error( (QofBackend*)be, ERR_BACKEND_READONLY );
+ qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_READONLY);
return;
}
@@ -1027,11 +1036,11 @@ xml_sync_all(QofBackend* be, QofBook *book)
* designed to do anything other than this. (Although they could be).
*/
-static char *
-build_period_filepath (FileBackend *fbe, QofBook *book)
+static char*
+build_period_filepath (FileBackend* fbe, QofBook* book)
{
int len;
- char *str, *p, *q;
+ char* str, *p, *q;
len = strlen (fbe->fullpath) + GUID_ENCODING_LENGTH + 14;
str = g_new (char, len);
@@ -1042,7 +1051,7 @@ build_period_filepath (FileBackend *fbe, QofBook *book)
p = strrchr (str, G_DIR_SEPARATOR);
p++;
p = stpcpy (p, "book-");
- p = guid_to_string_buff (qof_book_get_guid(book), p);
+ p = guid_to_string_buff (qof_book_get_guid (book), p);
p = stpcpy (p, "-");
q = strrchr (fbe->fullpath, G_DIR_SEPARATOR);
q++;
@@ -1053,17 +1062,17 @@ build_period_filepath (FileBackend *fbe, QofBook *book)
}
static void
-xml_begin_edit (QofBackend *be, QofInstance *inst)
+xml_begin_edit (QofBackend* be, QofInstance* inst)
{
- if (0) build_period_filepath(0, 0);
+ if (0) build_period_filepath (0, 0);
#if BORKEN_FOR_NOW
- FileBackend *fbe = (FileBackend *) be;
- QofBook *book = gp;
- const char * filepath;
+ FileBackend* fbe = (FileBackend*) be;
+ QofBook* book = gp;
+ const char* filepath;
- QofIdTypeConst typ = QOF_INSTANCE(inst)->e_type;
+ QofIdTypeConst typ = QOF_INSTANCE (inst)->e_type;
if (strcmp (GNC_ID_PERIOD, typ)) return;
- filepath = build_period_filepath(fbe, book);
+ filepath = build_period_filepath (fbe, book);
PINFO (" ====================== book=%p filepath=%s\n", book, filepath);
if (NULL == fbe->primary_book)
@@ -1081,10 +1090,10 @@ xml_begin_edit (QofBackend *be, QofInstance *inst)
}
static void
-xml_rollback_edit (QofBackend *be, QofInstance *inst)
+xml_rollback_edit (QofBackend* be, QofInstance* inst)
{
#if BORKEN_FOR_NOW
- QofBook *book = gp;
+ QofBook* book = gp;
if (strcmp (GNC_ID_PERIOD, typ)) return;
PINFO ("book=%p", book);
@@ -1101,43 +1110,44 @@ xml_rollback_edit (QofBackend *be, QofInstance *inst)
way. */
static void
-gnc_xml_be_load_from_file (QofBackend *bend, QofBook *book, QofBackendLoadType loadType)
+gnc_xml_be_load_from_file (QofBackend* bend, QofBook* book,
+ QofBackendLoadType loadType)
{
QofBackendError error;
gboolean rc;
- FileBackend *be = (FileBackend *) bend;
+ FileBackend* be = (FileBackend*) bend;
if (loadType != LOAD_TYPE_INITIAL_LOAD) return;
error = ERR_BACKEND_NO_ERR;
be->book = book;
- switch (gnc_xml_be_determine_file_type(be->fullpath))
+ switch (gnc_xml_be_determine_file_type (be->fullpath))
{
case GNC_BOOK_XML2_FILE:
rc = qof_session_load_from_xml_file_v2 (be, book, GNC_BOOK_XML2_FILE);
if (FALSE == rc)
{
- PWARN( "Syntax error in Xml File %s", be->fullpath );
+ PWARN ("Syntax error in Xml File %s", be->fullpath);
error = ERR_FILEIO_PARSE_ERROR;
}
break;
case GNC_BOOK_XML2_FILE_NO_ENCODING:
error = ERR_FILEIO_NO_ENCODING;
- PWARN( "No character encoding in Xml File %s", be->fullpath );
+ PWARN ("No character encoding in Xml File %s", be->fullpath);
break;
case GNC_BOOK_XML1_FILE:
rc = qof_session_load_from_xml_file (book, be->fullpath);
if (FALSE == rc)
{
- PWARN( "Syntax error in Xml File %s", be->fullpath );
+ PWARN ("Syntax error in Xml File %s", be->fullpath);
error = ERR_FILEIO_PARSE_ERROR;
}
break;
case GNC_BOOK_POST_XML2_0_0_FILE:
error = ERR_BACKEND_TOO_NEW;
- PWARN( "Version of Xml file %s is newer than what we can read", be->fullpath );
+ PWARN ("Version of Xml file %s is newer than what we can read", be->fullpath);
break;
default:
/* If file type wasn't known, check errno again to give the
@@ -1146,15 +1156,15 @@ gnc_xml_be_load_from_file (QofBackend *bend, QofBook *book, QofBackendLoadType l
switch (errno)
{
case EACCES: /* No read permission */
- PWARN("No read permission to file");
+ PWARN ("No read permission to file");
error = ERR_FILEIO_FILE_EACCES;
break;
case EISDIR: /* File is a directory - but on this error we don't arrive here */
- PWARN("Filename is a directory");
+ PWARN ("Filename is a directory");
error = ERR_FILEIO_FILE_NOT_FOUND;
break;
default:
- PWARN("File not any known type");
+ PWARN ("File not any known type");
error = ERR_FILEIO_UNKNOWN_FILE_TYPE;
break;
}
@@ -1163,7 +1173,7 @@ gnc_xml_be_load_from_file (QofBackend *bend, QofBook *book, QofBackendLoadType l
if (error != ERR_BACKEND_NO_ERR)
{
- qof_backend_set_error(bend, error);
+ qof_backend_set_error (bend, error);
}
/* We just got done loading, it can't possibly be dirty !! */
@@ -1173,38 +1183,38 @@ gnc_xml_be_load_from_file (QofBackend *bend, QofBook *book, QofBackendLoadType l
/* ---------------------------------------------------------------------- */
static gboolean
-save_may_clobber_data (QofBackend *bend)
+save_may_clobber_data (QofBackend* bend)
{
struct stat statbuf;
if (!bend->fullpath) return FALSE;
/* FIXME: Make sure this doesn't need more sophisticated semantics
* in the face of special file, devices, pipes, symlinks, etc. */
- if (g_stat(bend->fullpath, &statbuf) == 0) return TRUE;
+ if (g_stat (bend->fullpath, &statbuf) == 0) return TRUE;
return FALSE;
}
static void
-gnc_xml_be_write_accounts_to_file(QofBackend *be, QofBook *book)
+gnc_xml_be_write_accounts_to_file (QofBackend* be, QofBook* book)
{
- const gchar *datafile;
+ const gchar* datafile;
- datafile = ((FileBackend *)be)->fullpath;
- gnc_book_write_accounts_to_xml_file_v2(be, book, datafile);
+ datafile = ((FileBackend*)be)->fullpath;
+ gnc_book_write_accounts_to_xml_file_v2 (be, book, datafile);
}
/* ================================================================= */
static QofBackend*
-gnc_backend_new(void)
+gnc_backend_new (void)
{
- FileBackend *gnc_be;
- QofBackend *be;
+ FileBackend* gnc_be;
+ QofBackend* be;
- gnc_be = g_new0(FileBackend, 1);
+ gnc_be = g_new0 (FileBackend, 1);
be = (QofBackend*) gnc_be;
- qof_backend_init(be);
+ qof_backend_init (be);
be->session_begin = xml_session_begin;
be->session_end = xml_session_end;
@@ -1242,7 +1252,7 @@ gnc_backend_new(void)
}
static void
-business_core_xml_init(void)
+business_core_xml_init (void)
{
/* Initialize our pointers into the backend subsystem */
gnc_address_xml_initialize ();
@@ -1259,7 +1269,7 @@ business_core_xml_init(void)
}
static void
-gnc_provider_free (QofBackendProvider *prov)
+gnc_provider_free (QofBackendProvider* prov)
{
prov->provider_name = NULL;
prov->access_method = NULL;
@@ -1268,16 +1278,16 @@ gnc_provider_free (QofBackendProvider *prov)
#ifndef GNC_NO_LOADABLE_MODULES
G_MODULE_EXPORT void
-qof_backend_module_init(void)
+qof_backend_module_init (void)
{
- gnc_module_init_backend_xml();
+ gnc_module_init_backend_xml ();
}
#endif
void
-gnc_module_init_backend_xml(void)
+gnc_module_init_backend_xml (void)
{
- QofBackendProvider *prov;
+ QofBackendProvider* prov;
prov = g_new0 (QofBackendProvider, 1);
prov->provider_name = "GnuCash File Backend Version 2";
prov->access_method = "file";
@@ -1295,7 +1305,7 @@ gnc_module_init_backend_xml(void)
qof_backend_register_provider (prov);
/* And the business objects */
- business_core_xml_init();
+ business_core_xml_init ();
}
/* ========================== END OF FILE ===================== */
diff --git a/src/backend/xml/gnc-backend-xml.h b/src/backend/xml/gnc-backend-xml.h
index 73a1c29..7271e83 100644
--- a/src/backend/xml/gnc-backend-xml.h
+++ b/src/backend/xml/gnc-backend-xml.h
@@ -44,7 +44,8 @@ typedef enum
XML_RETAIN_NONE,
XML_RETAIN_DAYS,
XML_RETAIN_ALL
-} XMLFileRetentionType;
+}
+XMLFileRetentionType;
typedef enum
{
@@ -60,13 +61,13 @@ struct FileBackend_struct
{
QofBackend be;
- char *dirname;
- char *fullpath; /* Fully qualified path to book */
- char *lockfile;
- char *linkfile;
+ char* dirname;
+ char* fullpath; /* Fully qualified path to book */
+ char* lockfile;
+ char* linkfile;
int lockfd;
- QofBook *book; /* The primary, main open book */
+ QofBook* book; /* The primary, main open book */
};
typedef struct FileBackend_struct FileBackend;
@@ -76,7 +77,7 @@ typedef struct FileBackend_struct FileBackend;
/** Initialization function which can be used when this module is
* statically linked into the application. */
-void gnc_module_init_backend_xml(void);
+void gnc_module_init_backend_xml (void);
#ifndef GNC_NO_LOADABLE_MODULES
/** This is the standarized initialization function of a qof_backend
@@ -84,7 +85,7 @@ void gnc_module_init_backend_xml(void);
* GNC_NO_LOADABLE_MODULES. This one simply calls
* gnc_module_init_backend_file(). */
G_MODULE_EXPORT
-void qof_backend_module_init(void);
+void qof_backend_module_init (void);
#endif
#ifdef __cplusplus
}
diff --git a/src/backend/xml/gnc-bill-term-xml-v2.cpp b/src/backend/xml/gnc-bill-term-xml-v2.cpp
index b0f66d6..5bee3cd 100644
--- a/src/backend/xml/gnc-bill-term-xml-v2.cpp
+++ b/src/backend/xml/gnc-bill-term-xml-v2.cpp
@@ -50,11 +50,11 @@ extern "C"
#include "xml-helpers.h"
-#define _GNC_MOD_NAME GNC_ID_BILLTERM
+#define _GNC_MOD_NAME GNC_ID_BILLTERM
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *billterm_version_string = "2.0.0";
+const gchar* billterm_version_string = "2.0.0";
/* ids */
#define gnc_billterm_string "gnc:GncBillTerm"
@@ -79,35 +79,35 @@ const gchar *billterm_version_string = "2.0.0";
#define prox_cutoff_string "bt-prox:cutoff-day"
static xmlNodePtr
-billterm_dom_tree_create (GncBillTerm *term)
+billterm_dom_tree_create (GncBillTerm* term)
{
xmlNodePtr ret, data;
- ret = xmlNewNode(NULL, BAD_CAST gnc_billterm_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST billterm_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_billterm_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST billterm_version_string);
- maybe_add_guid(ret, billterm_guid_string, QOF_INSTANCE(term));
- xmlAddChild(ret, text_to_dom_tree (billterm_name_string,
- gncBillTermGetName (term)));
- xmlAddChild(ret, text_to_dom_tree (billterm_desc_string,
- gncBillTermGetDescription (term)));
+ maybe_add_guid (ret, billterm_guid_string, QOF_INSTANCE (term));
+ xmlAddChild (ret, text_to_dom_tree (billterm_name_string,
+ gncBillTermGetName (term)));
+ xmlAddChild (ret, text_to_dom_tree (billterm_desc_string,
+ gncBillTermGetDescription (term)));
- xmlAddChild(ret, int_to_dom_tree (billterm_refcount_string,
- gncBillTermGetRefcount (term)));
- xmlAddChild(ret, int_to_dom_tree (billterm_invisible_string,
- gncBillTermGetInvisible (term)));
+ xmlAddChild (ret, int_to_dom_tree (billterm_refcount_string,
+ gncBillTermGetRefcount (term)));
+ xmlAddChild (ret, int_to_dom_tree (billterm_invisible_string,
+ gncBillTermGetInvisible (term)));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(billterm_slots_string,
- QOF_INSTANCE(term)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (billterm_slots_string,
+ QOF_INSTANCE (term)));
/* We should not be our own child */
- if (gncBillTermGetChild(term) != term)
- maybe_add_guid(ret, billterm_child_string,
- QOF_INSTANCE(gncBillTermGetChild (term)));
+ if (gncBillTermGetChild (term) != term)
+ maybe_add_guid (ret, billterm_child_string,
+ QOF_INSTANCE (gncBillTermGetChild (term)));
- maybe_add_guid(ret, billterm_parent_string,
- QOF_INSTANCE(gncBillTermGetParent (term)));
+ maybe_add_guid (ret, billterm_parent_string,
+ QOF_INSTANCE (gncBillTermGetParent (term)));
switch (gncBillTermGetType (term))
{
@@ -138,13 +138,13 @@ billterm_dom_tree_create (GncBillTerm *term)
struct billterm_pdata
{
- GncBillTerm *term;
- QofBook *book;
+ GncBillTerm* term;
+ QofBook* book;
};
static gboolean
-set_int (xmlNodePtr node, GncBillTerm *term,
- void (*func)(GncBillTerm *, gint))
+set_int (xmlNodePtr node, GncBillTerm* term,
+ void (*func) (GncBillTerm*, gint))
{
gint64 val;
dom_tree_to_integer (node, &val);
@@ -153,8 +153,8 @@ set_int (xmlNodePtr node, GncBillTerm *term,
}
static gboolean
-set_numeric (xmlNodePtr node, GncBillTerm *term,
- void (*func)(GncBillTerm *, gnc_numeric))
+set_numeric (xmlNodePtr node, GncBillTerm* term,
+ void (*func) (GncBillTerm*, gnc_numeric))
{
gnc_numeric* num = dom_tree_to_gnc_numeric (node);
g_return_val_if_fail (num, FALSE);
@@ -169,21 +169,21 @@ set_numeric (xmlNodePtr node, GncBillTerm *term,
static gboolean
days_duedays_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_int (node, pdata->term, gncBillTermSetDueDays);
}
static gboolean
days_discdays_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_int (node, pdata->term, gncBillTermSetDiscountDays);
}
static gboolean
days_discount_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_numeric (node, pdata->term, gncBillTermSetDiscount);
}
@@ -196,7 +196,7 @@ static struct dom_tree_handler days_data_handlers_v2[] =
};
static gboolean
-dom_tree_to_days_data (xmlNodePtr node, struct billterm_pdata *pdata)
+dom_tree_to_days_data (xmlNodePtr node, struct billterm_pdata* pdata)
{
gboolean successful;
@@ -213,28 +213,28 @@ dom_tree_to_days_data (xmlNodePtr node, struct billterm_pdata *pdata)
static gboolean
prox_dueday_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_int (node, pdata->term, gncBillTermSetDueDays);
}
static gboolean
prox_discday_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_int (node, pdata->term, gncBillTermSetDiscountDays);
}
static gboolean
prox_discount_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_numeric (node, pdata->term, gncBillTermSetDiscount);
}
static gboolean
prox_cutoff_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_int (node, pdata->term, gncBillTermSetCutoff);
}
@@ -248,7 +248,7 @@ static struct dom_tree_handler prox_data_handlers_v2[] =
};
static gboolean
-dom_tree_to_prox_data (xmlNodePtr node, struct billterm_pdata *pdata)
+dom_tree_to_prox_data (xmlNodePtr node, struct billterm_pdata* pdata)
{
gboolean successful;
@@ -263,13 +263,13 @@ dom_tree_to_prox_data (xmlNodePtr node, struct billterm_pdata *pdata)
/***********************************************************************/
static gboolean
-set_parent_child (xmlNodePtr node, struct billterm_pdata *pdata,
- void (*func)(GncBillTerm *, GncBillTerm *))
+set_parent_child (xmlNodePtr node, struct billterm_pdata* pdata,
+ void (*func) (GncBillTerm*, GncBillTerm*))
{
- GncGUID *guid;
- GncBillTerm *term;
+ GncGUID* guid;
+ GncBillTerm* term;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
term = gncBillTermLookup (pdata->book, guid);
if (!term)
@@ -287,24 +287,24 @@ set_parent_child (xmlNodePtr node, struct billterm_pdata *pdata,
}
static gboolean
-set_string (xmlNodePtr node, GncBillTerm *term,
- void (*func)(GncBillTerm *, const char *))
+set_string (xmlNodePtr node, GncBillTerm* term,
+ void (*func) (GncBillTerm*, const char*))
{
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
func (term, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
static gboolean
billterm_guid_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
- GncGUID *guid;
- GncBillTerm *term;
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
+ GncGUID* guid;
+ GncBillTerm* term;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
term = gncBillTermLookup (pdata->book, guid);
if (term)
@@ -315,10 +315,10 @@ billterm_guid_handler (xmlNodePtr node, gpointer billterm_pdata)
}
else
{
- gncBillTermSetGUID(pdata->term, guid);
+ gncBillTermSetGUID (pdata->term, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -326,24 +326,24 @@ billterm_guid_handler (xmlNodePtr node, gpointer billterm_pdata)
static gboolean
billterm_name_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_string (node, pdata->term, gncBillTermSetName);
}
static gboolean
billterm_desc_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_string (node, pdata->term, gncBillTermSetDescription);
}
static gboolean
billterm_refcount_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
gint64 val;
- dom_tree_to_integer(node, &val);
+ dom_tree_to_integer (node, &val);
gncBillTermSetRefcount (pdata->term, val);
return TRUE;
}
@@ -351,10 +351,10 @@ billterm_refcount_handler (xmlNodePtr node, gpointer billterm_pdata)
static gboolean
billterm_invisible_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
gint64 val;
- dom_tree_to_integer(node, &val);
+ dom_tree_to_integer (node, &val);
if (val)
gncBillTermMakeInvisible (pdata->term);
return TRUE;
@@ -363,21 +363,21 @@ billterm_invisible_handler (xmlNodePtr node, gpointer billterm_pdata)
static gboolean
billterm_parent_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_parent_child (node, pdata, gncBillTermSetParent);
}
static gboolean
billterm_child_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
return set_parent_child (node, pdata, gncBillTermSetChild);
}
static gboolean
billterm_days_data_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
g_return_val_if_fail (node, FALSE);
g_return_val_if_fail (gncBillTermGetType (pdata->term) == 0, FALSE);
@@ -389,7 +389,7 @@ billterm_days_data_handler (xmlNodePtr node, gpointer billterm_pdata)
static gboolean
billterm_prox_data_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
g_return_val_if_fail (node, FALSE);
g_return_val_if_fail (gncBillTermGetType (pdata->term) == 0, FALSE);
@@ -401,8 +401,8 @@ billterm_prox_data_handler (xmlNodePtr node, gpointer billterm_pdata)
static gboolean
billterm_slots_handler (xmlNodePtr node, gpointer billterm_pdata)
{
- struct billterm_pdata *pdata = static_cast<decltype(pdata)>(billterm_pdata);
- return dom_tree_create_instance_slots (node, QOF_INSTANCE(pdata->term));
+ struct billterm_pdata* pdata = static_cast<decltype (pdata)> (billterm_pdata);
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->term));
}
static struct dom_tree_handler billterm_handlers_v2[] =
@@ -421,7 +421,7 @@ static struct dom_tree_handler billterm_handlers_v2[] =
};
static GncBillTerm*
-dom_tree_to_billterm (xmlNodePtr node, QofBook *book)
+dom_tree_to_billterm (xmlNodePtr node, QofBook* book)
{
struct billterm_pdata billterm_pdata;
gboolean successful;
@@ -448,15 +448,15 @@ dom_tree_to_billterm (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_billterm_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_billterm_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncBillTerm *term;
+ GncBillTerm* term;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
@@ -471,34 +471,34 @@ gnc_billterm_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
term = dom_tree_to_billterm (tree, book);
if (term != NULL)
{
- gdata->cb(tag, gdata->parsedata, term);
+ gdata->cb (tag, gdata->parsedata, term);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return term != NULL;
}
-static sixtp *
-billterm_sixtp_parser_create(void)
+static sixtp*
+billterm_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_billterm_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_billterm_end_handler, NULL, NULL);
}
static void
-do_count (QofInstance *term_p, gpointer count_p)
+do_count (QofInstance* term_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
+ int* count = static_cast<decltype (count)> (count_p);
(*count)++;
}
static int
-billterm_get_count (QofBook *book)
+billterm_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -506,48 +506,49 @@ billterm_get_count (QofBook *book)
}
static void
-xml_add_billterm (QofInstance *term_p, gpointer out_p)
+xml_add_billterm (QofInstance* term_p, gpointer out_p)
{
xmlNodePtr node;
- GncBillTerm *term = (GncBillTerm *) term_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncBillTerm* term = (GncBillTerm*) term_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
node = billterm_dom_tree_create (term);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-billterm_write (FILE *out, QofBook *book)
+billterm_write (FILE* out, QofBook* book)
{
- qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_billterm, (gpointer) out);
- return ferror(out) == 0;
+ qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_billterm,
+ (gpointer) out);
+ return ferror (out) == 0;
}
static gboolean
-billterm_is_grandchild (GncBillTerm *term)
+billterm_is_grandchild (GncBillTerm* term)
{
- return (gncBillTermGetParent(gncBillTermGetParent(term)) != NULL);
+ return (gncBillTermGetParent (gncBillTermGetParent (term)) != NULL);
}
-static GncBillTerm *
-billterm_find_senior (GncBillTerm *term)
+static GncBillTerm*
+billterm_find_senior (GncBillTerm* term)
{
- GncBillTerm *temp, *parent, *gp = NULL;
+ GncBillTerm* temp, *parent, *gp = NULL;
temp = term;
do
{
/* See if "temp" is a grandchild */
- parent = gncBillTermGetParent(temp);
+ parent = gncBillTermGetParent (temp);
if (!parent)
break;
- gp = gncBillTermGetParent(parent);
+ gp = gncBillTermGetParent (parent);
if (!gp)
break;
@@ -572,39 +573,39 @@ billterm_find_senior (GncBillTerm *term)
/* build a list of bill terms that are grandchildren or bogus (empty entry list). */
static void
-billterm_scrub_cb (QofInstance *term_p, gpointer list_p)
+billterm_scrub_cb (QofInstance* term_p, gpointer list_p)
{
- GncBillTerm *term = GNC_BILLTERM(term_p);
- GList **list = static_cast<decltype(list)>(list_p);
+ GncBillTerm* term = GNC_BILLTERM (term_p);
+ GList** list = static_cast<decltype (list)> (list_p);
- if (billterm_is_grandchild(term))
+ if (billterm_is_grandchild (term))
{
- *list = g_list_prepend(*list, term);
+ *list = g_list_prepend (*list, term);
}
- else if (!gncBillTermGetType(term))
+ else if (!gncBillTermGetType (term))
{
- GncBillTerm *t = gncBillTermGetParent(term);
+ GncBillTerm* t = gncBillTermGetParent (term);
if (t)
{
/* Fix up the broken "copy" function */
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(term)),guidstr);
- PWARN("Fixing broken child billterm: %s", guidstr);
-
- gncBillTermBeginEdit(term);
- gncBillTermSetType(term, gncBillTermGetType(t));
- gncBillTermSetDueDays (term, gncBillTermGetDueDays(t));
- gncBillTermSetDiscountDays (term, gncBillTermGetDiscountDays(t));
- gncBillTermSetDiscount (term, gncBillTermGetDiscount(t));
- gncBillTermSetCutoff (term, gncBillTermGetCutoff(t));
- gncBillTermCommitEdit(term);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (term)), guidstr);
+ PWARN ("Fixing broken child billterm: %s", guidstr);
+
+ gncBillTermBeginEdit (term);
+ gncBillTermSetType (term, gncBillTermGetType (t));
+ gncBillTermSetDueDays (term, gncBillTermGetDueDays (t));
+ gncBillTermSetDiscountDays (term, gncBillTermGetDiscountDays (t));
+ gncBillTermSetDiscount (term, gncBillTermGetDiscount (t));
+ gncBillTermSetCutoff (term, gncBillTermGetCutoff (t));
+ gncBillTermCommitEdit (term);
}
else
{
/* No parent? Must be a standalone */
- *list = g_list_prepend(*list, term);
+ *list = g_list_prepend (*list, term);
}
}
}
@@ -613,82 +614,82 @@ billterm_scrub_cb (QofInstance *term_p, gpointer list_p)
* grandchildren, then fix them to point to the most senior child
*/
static void
-billterm_scrub_invoices (QofInstance * invoice_p, gpointer ht_p)
+billterm_scrub_invoices (QofInstance* invoice_p, gpointer ht_p)
{
- GHashTable *ht = static_cast<decltype(ht)>(ht_p);
- GncInvoice *invoice = GNC_INVOICE(invoice_p);
- GncBillTerm *term, *new_bt;
+ GHashTable* ht = static_cast<decltype (ht)> (ht_p);
+ GncInvoice* invoice = GNC_INVOICE (invoice_p);
+ GncBillTerm* term, *new_bt;
gint32 count;
- term = gncInvoiceGetTerms(invoice);
+ term = gncInvoiceGetTerms (invoice);
if (term)
{
- if (billterm_is_grandchild(term))
+ if (billterm_is_grandchild (term))
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(invoice)),guidstr);
- PWARN("Fixing i-billterm on invoice %s\n", guidstr);
- new_bt = billterm_find_senior(term);
- gncInvoiceBeginEdit(invoice);
- gncInvoiceSetTerms(invoice, new_bt);
- gncInvoiceCommitEdit(invoice);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (invoice)), guidstr);
+ PWARN ("Fixing i-billterm on invoice %s\n", guidstr);
+ new_bt = billterm_find_senior (term);
+ gncInvoiceBeginEdit (invoice);
+ gncInvoiceSetTerms (invoice, new_bt);
+ gncInvoiceCommitEdit (invoice);
term = new_bt;
}
if (term)
{
- count = GPOINTER_TO_INT(g_hash_table_lookup(ht, term));
+ count = GPOINTER_TO_INT (g_hash_table_lookup (ht, term));
count++;
- g_hash_table_insert(ht, term, GINT_TO_POINTER(count));
+ g_hash_table_insert (ht, term, GINT_TO_POINTER (count));
}
}
}
static void
-billterm_scrub_cust (QofInstance * cust_p, gpointer ht_p)
+billterm_scrub_cust (QofInstance* cust_p, gpointer ht_p)
{
- GHashTable *ht = static_cast<decltype(ht)>(ht_p);
- GncCustomer *cust = GNC_CUSTOMER(cust_p);
- GncBillTerm *term;
+ GHashTable* ht = static_cast<decltype (ht)> (ht_p);
+ GncCustomer* cust = GNC_CUSTOMER (cust_p);
+ GncBillTerm* term;
gint32 count;
- term = gncCustomerGetTerms(cust);
+ term = gncCustomerGetTerms (cust);
if (term)
{
- count = GPOINTER_TO_INT(g_hash_table_lookup(ht, term));
+ count = GPOINTER_TO_INT (g_hash_table_lookup (ht, term));
count++;
- g_hash_table_insert(ht, term, GINT_TO_POINTER(count));
- if (billterm_is_grandchild(term))
+ g_hash_table_insert (ht, term, GINT_TO_POINTER (count));
+ if (billterm_is_grandchild (term))
{
- gchar custstr[GUID_ENCODING_LENGTH+1];
- gchar termstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(cust)),custstr);
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(term)),termstr);
- PWARN("customer %s has grandchild billterm %s\n", custstr,termstr);
+ gchar custstr[GUID_ENCODING_LENGTH + 1];
+ gchar termstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (cust)), custstr);
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (term)), termstr);
+ PWARN ("customer %s has grandchild billterm %s\n", custstr, termstr);
}
}
}
static void
-billterm_scrub_vendor (QofInstance * vendor_p, gpointer ht_p)
+billterm_scrub_vendor (QofInstance* vendor_p, gpointer ht_p)
{
- GHashTable *ht = static_cast<decltype(ht)>(ht_p);
- GncVendor *vendor = GNC_VENDOR(vendor_p);
- GncBillTerm *term;
+ GHashTable* ht = static_cast<decltype (ht)> (ht_p);
+ GncVendor* vendor = GNC_VENDOR (vendor_p);
+ GncBillTerm* term;
gint32 count;
- term = gncVendorGetTerms(vendor);
+ term = gncVendorGetTerms (vendor);
if (term)
{
- count = GPOINTER_TO_INT(g_hash_table_lookup(ht, term));
+ count = GPOINTER_TO_INT (g_hash_table_lookup (ht, term));
count++;
- g_hash_table_insert(ht, term, GINT_TO_POINTER(count));
- if (billterm_is_grandchild(term))
+ g_hash_table_insert (ht, term, GINT_TO_POINTER (count));
+ if (billterm_is_grandchild (term))
{
- gchar vendstr[GUID_ENCODING_LENGTH+1];
- gchar termstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(vendor)),vendstr);
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(term)),termstr);
- PWARN("vendor %s has grandchild billterm %s\n", vendstr, termstr);
+ gchar vendstr[GUID_ENCODING_LENGTH + 1];
+ gchar termstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (vendor)), vendstr);
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (term)), termstr);
+ PWARN ("vendor %s has grandchild billterm %s\n", vendstr, termstr);
}
}
}
@@ -696,28 +697,28 @@ billterm_scrub_vendor (QofInstance * vendor_p, gpointer ht_p)
static void
billterm_reset_refcount (gpointer key, gpointer value, gpointer notused)
{
- GncBillTerm *term = static_cast<decltype(term)>(key);
- gint32 count = GPOINTER_TO_INT(value);
+ GncBillTerm* term = static_cast<decltype (term)> (key);
+ gint32 count = GPOINTER_TO_INT (value);
- if (count != gncBillTermGetRefcount(term) && !gncBillTermGetInvisible(term))
+ if (count != gncBillTermGetRefcount (term) && !gncBillTermGetInvisible (term))
{
- gchar termstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(term)),termstr);
- PWARN("Fixing refcount on billterm %s (%" G_GINT64_FORMAT " -> %d)\n",
- termstr, gncBillTermGetRefcount(term), count);
- gncBillTermSetRefcount(term, count);
+ gchar termstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (term)), termstr);
+ PWARN ("Fixing refcount on billterm %s (%" G_GINT64_FORMAT " -> %d)\n",
+ termstr, gncBillTermGetRefcount (term), count);
+ gncBillTermSetRefcount (term, count);
}
}
static void
-billterm_scrub (QofBook *book)
+billterm_scrub (QofBook* book)
{
- GList *list = NULL;
- GList *node;
- GncBillTerm *parent, *term;
- GHashTable *ht = g_hash_table_new(g_direct_hash, g_direct_equal);
+ GList* list = NULL;
+ GList* node;
+ GncBillTerm* parent, *term;
+ GHashTable* ht = g_hash_table_new (g_direct_hash, g_direct_equal);
- DEBUG("scrubbing billterms...");
+ DEBUG ("scrubbing billterms...");
qof_object_foreach (GNC_ID_INVOICE, book, billterm_scrub_invoices, ht);
qof_object_foreach (GNC_ID_CUSTOMER, book, billterm_scrub_cust, ht);
qof_object_foreach (GNC_ID_VENDOR, book, billterm_scrub_vendor, ht);
@@ -726,36 +727,36 @@ billterm_scrub (QofBook *book)
/* destroy the list of "grandchildren" bill terms */
for (node = list; node; node = node->next)
{
- gchar termstr[GUID_ENCODING_LENGTH+1];
- term = static_cast<decltype(term)>(node->data);
+ gchar termstr[GUID_ENCODING_LENGTH + 1];
+ term = static_cast<decltype (term)> (node->data);
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(term)), termstr);
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (term)), termstr);
PWARN ("deleting grandchild billterm: %s\n", termstr);
/* Make sure the parent has no children */
- parent = gncBillTermGetParent(term);
- gncBillTermSetChild(parent, NULL);
+ parent = gncBillTermGetParent (term);
+ gncBillTermSetChild (parent, NULL);
/* Destroy this bill term */
- gncBillTermBeginEdit(term);
- gncBillTermDestroy(term);
+ gncBillTermBeginEdit (term);
+ gncBillTermDestroy (term);
}
/* reset the refcounts as necessary */
- g_hash_table_foreach(ht, billterm_reset_refcount, NULL);
+ g_hash_table_foreach (ht, billterm_reset_refcount, NULL);
- g_list_free(list);
- g_hash_table_destroy(ht);
+ g_list_free (list);
+ g_hash_table_destroy (ht);
}
static gboolean
-billterm_ns(FILE *out)
+billterm_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
+ g_return_val_if_fail (out, FALSE);
return
- gnc_xml2_write_namespace_decl(out, "billterm")
- && gnc_xml2_write_namespace_decl(out, "bt-days")
- && gnc_xml2_write_namespace_decl(out, "bt-prox");
+ gnc_xml2_write_namespace_decl (out, "billterm")
+ && gnc_xml2_write_namespace_decl (out, "bt-days")
+ && gnc_xml2_write_namespace_decl (out, "bt-prox");
}
void
@@ -766,7 +767,7 @@ gnc_billterm_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_billterm_string,
billterm_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
billterm_get_count,
billterm_write,
billterm_scrub,
@@ -778,27 +779,27 @@ gnc_billterm_xml_initialize (void)
&be_data);
}
-GncBillTerm *
-gnc_billterm_xml_find_or_create(QofBook *book, GncGUID *guid)
+GncBillTerm*
+gnc_billterm_xml_find_or_create (QofBook* book, GncGUID* guid)
{
- GncBillTerm *term;
- gchar guidstr[GUID_ENCODING_LENGTH+1];
+ GncBillTerm* term;
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
- guid_to_string_buff(guid, guidstr);
- g_return_val_if_fail(book, NULL);
- g_return_val_if_fail(guid, NULL);
- term = gncBillTermLookup(book, guid);
- DEBUG("looking for billterm %s, found %p", guidstr, term);
+ guid_to_string_buff (guid, guidstr);
+ g_return_val_if_fail (book, NULL);
+ g_return_val_if_fail (guid, NULL);
+ term = gncBillTermLookup (book, guid);
+ DEBUG ("looking for billterm %s, found %p", guidstr, term);
if (!term)
{
- term = gncBillTermCreate(book);
- gncBillTermBeginEdit(term);
- gncBillTermSetGUID(term, guid);
- gncBillTermCommitEdit(term);
- DEBUG("Created term: %p", term);
+ term = gncBillTermCreate (book);
+ gncBillTermBeginEdit (term);
+ gncBillTermSetGUID (term, guid);
+ gncBillTermCommitEdit (term);
+ DEBUG ("Created term: %p", term);
}
else
- gncBillTermDecRef(term);
+ gncBillTermDecRef (term);
return term;
}
diff --git a/src/backend/xml/gnc-bill-term-xml-v2.h b/src/backend/xml/gnc-bill-term-xml-v2.h
index 41f771b..8c00776 100644
--- a/src/backend/xml/gnc-bill-term-xml-v2.h
+++ b/src/backend/xml/gnc-bill-term-xml-v2.h
@@ -29,6 +29,6 @@ extern "C"
}
void gnc_billterm_xml_initialize (void);
-GncBillTerm *gnc_billterm_xml_find_or_create(QofBook *book, GncGUID *guid);
+GncBillTerm* gnc_billterm_xml_find_or_create (QofBook* book, GncGUID* guid);
#endif /* GNC_BILLTERM_XML_V2_H */
diff --git a/src/backend/xml/gnc-book-xml-v2.cpp b/src/backend/xml/gnc-book-xml-v2.cpp
index e3d2718..868dc35 100644
--- a/src/backend/xml/gnc-book-xml-v2.cpp
+++ b/src/backend/xml/gnc-book-xml-v2.cpp
@@ -49,7 +49,7 @@ extern "C"
#include "sixtp-dom-parsers.h"
/* non-static because it's used in io-gncxml-v2.c */
-const gchar *gnc_v2_book_version_string = "2.0.0";
+const gchar* gnc_v2_book_version_string = "2.0.0";
/* ids */
#define gnc_book_string "gnc:book"
@@ -64,33 +64,33 @@ static QofLogModule log_module = GNC_MOD_IO;
static void
append_account_tree (xmlNodePtr parent,
- Account *account,
+ Account* account,
gboolean allow_incompat)
{
- GList *children, *node;
+ GList* children, *node;
- children = gnc_account_get_children(account);
- children = g_list_sort(children, qof_instance_guid_compare);
+ children = gnc_account_get_children (account);
+ children = g_list_sort (children, qof_instance_guid_compare);
for (node = children; node; node = node->next)
{
xmlNodePtr accnode;
- Account *account;
+ Account* account;
account = node->data;
- accnode = gnc_account_dom_tree_create(account, FALSE, allow_incompat);
+ accnode = gnc_account_dom_tree_create (account, FALSE, allow_incompat);
xmlAddChild (parent, accnode);
- append_account_tree(accnode, account);
+ append_account_tree (accnode, account);
}
- g_list_free(children);
+ g_list_free (children);
}
static int
-traverse_txns (Transaction *txn, gpointer data)
+traverse_txns (Transaction* txn, gpointer data)
{
xmlNodePtr node;
xmlNodePtr parent = data;
- node = gnc_transaction_dom_tree_create(txn);
+ node = gnc_transaction_dom_tree_create (txn);
xmlAddChild (parent, node);
return 0;
@@ -100,20 +100,20 @@ traverse_txns (Transaction *txn, gpointer data)
/* ================================================================ */
xmlNodePtr
-gnc_book_dom_tree_create(QofBook *book)
+gnc_book_dom_tree_create (QofBook* book)
{
xmlNodePtr ret;
G_GNUC_UNUSED gboolean allow_incompat = TRUE;
- ret = xmlNewNode(NULL, BAD_CAST gnc_book_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST gnc_v2_book_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_book_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST gnc_v2_book_version_string);
- xmlAddChild(ret, guid_to_dom_tree(book_id_string,
- qof_book_get_guid(book)));
+ xmlAddChild (ret, guid_to_dom_tree (book_id_string,
+ qof_book_get_guid (book)));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(book_slots_string,
- QOF_INSTANCE(book)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (book_slots_string,
+ QOF_INSTANCE (book)));
#ifdef IMPLEMENT_BOOK_DOM_TREES_LATER
/* theoretically, we should be adding all the below to the book
@@ -121,23 +121,23 @@ gnc_book_dom_tree_create(QofBook *book)
* that we are only going to hand-edit the file at a higher layer.
* And that's OK, since its probably a performance boost anyway.
*/
- xmlAddChild(ret, gnc_commodity_dom_tree_create(
- gnc_commodity_table_get_table(book)));
- xmlAddChild(ret, gnc_pricedb_dom_tree_create(gnc_pricedb_get_db(book)));
+ xmlAddChild (ret, gnc_commodity_dom_tree_create (
+ gnc_commodity_table_get_table (book)));
+ xmlAddChild (ret, gnc_pricedb_dom_tree_create (gnc_pricedb_get_db (book)));
if (allow_incompat)
{
- accnode = gnc_account_dom_tree_create(account, FALSE);
+ accnode = gnc_account_dom_tree_create (account, FALSE);
xmlAddChild (ret, rootAccNode);
}
- append_account_tree (ret, gnc_book_get_root(book));
+ append_account_tree (ret, gnc_book_get_root (book));
- xaccAccountTreeForEachTransaction (gnc_book_get_root_account(book),
+ xaccAccountTreeForEachTransaction (gnc_book_get_root_account (book),
traverse_txns, ret);
/* xxx FIXME hack alert how are we going to handle
* gnc_book_get_template_group handled ??? */
- xmlAddChild(ret, gnc_schedXaction_dom_tree_create(
- gnc_book_get_schedxactions(book)));
+ xmlAddChild (ret, gnc_schedXaction_dom_tree_create (
+ gnc_book_get_schedxactions (book)));
#endif
@@ -149,27 +149,27 @@ gnc_book_dom_tree_create(QofBook *book)
* and slots, everything else is handled elsewhere */
gboolean
-write_book_parts(FILE *out, QofBook *book)
+write_book_parts (FILE* out, QofBook* book)
{
- xmlNodePtr domnode, slotsnode;
+ xmlNodePtr domnode, slotsnode;
- domnode = guid_to_dom_tree(book_id_string, qof_book_get_guid(book));
- xmlElemDump(out, NULL, domnode);
+ domnode = guid_to_dom_tree (book_id_string, qof_book_get_guid (book));
+ xmlElemDump (out, NULL, domnode);
xmlFreeNode (domnode);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return FALSE;
- slotsnode = qof_instance_slots_to_dom_tree(book_slots_string,
- QOF_INSTANCE(book));
+ slotsnode = qof_instance_slots_to_dom_tree (book_slots_string,
+ QOF_INSTANCE (book));
if (slotsnode)
{
- xmlElemDump(out, NULL, slotsnode);
- xmlFreeNode(slotsnode);
+ xmlElemDump (out, NULL, slotsnode);
+ xmlFreeNode (slotsnode);
- if (ferror(out) || fprintf(out, "\n") < 0)
- return FALSE;
+ if (ferror (out) || fprintf (out, "\n") < 0)
+ return FALSE;
}
return TRUE;
@@ -179,14 +179,14 @@ write_book_parts(FILE *out, QofBook *book)
/* ================================================================ */
static gboolean
-book_id_handler(xmlNodePtr node, gpointer book_pdata)
+book_id_handler (xmlNodePtr node, gpointer book_pdata)
{
- QofBook *book = static_cast<decltype(book)>(book_pdata);
- GncGUID *guid;
+ QofBook* book = static_cast<decltype (book)> (book_pdata);
+ GncGUID* guid;
- guid = dom_tree_to_guid(node);
- qof_instance_set_guid(QOF_INSTANCE(book), guid);
- g_free(guid);
+ guid = dom_tree_to_guid (node);
+ qof_instance_set_guid (QOF_INSTANCE (book), guid);
+ g_free (guid);
return TRUE;
}
@@ -194,14 +194,14 @@ book_id_handler(xmlNodePtr node, gpointer book_pdata)
static gboolean
book_slots_handler (xmlNodePtr node, gpointer book_pdata)
{
- QofBook *book = static_cast<decltype(book)>(book_pdata);
+ QofBook* book = static_cast<decltype (book)> (book_pdata);
gboolean success;
/* the below works only because the get is gaurenteed to return
* a frame, even if its empty */
- success = dom_tree_create_instance_slots(node, QOF_INSTANCE (book));
+ success = dom_tree_create_instance_slots (node, QOF_INSTANCE (book));
- g_return_val_if_fail(success, FALSE);
+ g_return_val_if_fail (success, FALSE);
return TRUE;
}
@@ -215,14 +215,14 @@ static struct dom_tree_handler book_handlers_v2[] =
};
static gboolean
-gnc_book_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_book_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data) return TRUE;
@@ -231,63 +231,63 @@ gnc_book_end_handler(gpointer data_for_children,
NULL tag. So we ignore those cases */
if (!tag) return TRUE;
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- book = dom_tree_to_book(tree, book);
+ book = dom_tree_to_book (tree, book);
if (!book)
- gdata->cb(tag, gdata->parsedata, book);
+ gdata->cb (tag, gdata->parsedata, book);
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return book != NULL;
}
static gboolean
-gnc_book_id_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_book_id_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
gboolean successful;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data) return TRUE;
if (!tag) return TRUE;
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- successful = book_id_handler(tree, book);
- xmlFreeNode(tree);
+ successful = book_id_handler (tree, book);
+ xmlFreeNode (tree);
return successful;
}
static gboolean
-gnc_book_slots_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_book_slots_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
gboolean successful;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data) return TRUE;
if (!tag) return TRUE;
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
successful = book_slots_handler (tree, book);
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return successful;
}
QofBook*
-dom_tree_to_book (xmlNodePtr node, QofBook *book)
+dom_tree_to_book (xmlNodePtr node, QofBook* book)
{
gboolean successful;
@@ -303,19 +303,19 @@ dom_tree_to_book (xmlNodePtr node, QofBook *book)
}
sixtp*
-gnc_book_sixtp_parser_create(void)
+gnc_book_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_book_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_book_end_handler, NULL, NULL);
}
sixtp*
-gnc_book_id_sixtp_parser_create(void)
+gnc_book_id_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_book_id_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_book_id_end_handler, NULL, NULL);
}
sixtp*
-gnc_book_slots_sixtp_parser_create(void)
+gnc_book_slots_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_book_slots_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_book_slots_end_handler, NULL, NULL);
}
diff --git a/src/backend/xml/gnc-budget-xml-v2.cpp b/src/backend/xml/gnc-budget-xml-v2.cpp
index 2730a12..93b9163 100644
--- a/src/backend/xml/gnc-budget-xml-v2.cpp
+++ b/src/backend/xml/gnc-budget-xml-v2.cpp
@@ -44,7 +44,7 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *budget_version_string = "2.0.0";
+const gchar* budget_version_string = "2.0.0";
/* ids */
#define gnc_budget_string "gnc:budget"
@@ -56,33 +56,33 @@ const gchar *budget_version_string = "2.0.0";
#define bgt_slots_string "bgt:slots"
xmlNodePtr
-gnc_budget_dom_tree_create(GncBudget *bgt)
+gnc_budget_dom_tree_create (GncBudget* bgt)
{
xmlNodePtr ret;
ENTER ("(budget=%p)", bgt);
- ret = xmlNewNode(NULL, BAD_CAST gnc_budget_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST budget_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_budget_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST budget_version_string);
/* field: GncGUID */
- xmlAddChild(ret, guid_to_dom_tree(bgt_id_string,
- gnc_budget_get_guid(bgt)));
+ xmlAddChild (ret, guid_to_dom_tree (bgt_id_string,
+ gnc_budget_get_guid (bgt)));
/* field: char* name */
- xmlAddChild(ret, text_to_dom_tree(bgt_name_string,
- gnc_budget_get_name(bgt)));
+ xmlAddChild (ret, text_to_dom_tree (bgt_name_string,
+ gnc_budget_get_name (bgt)));
/* field: char* description */
- xmlAddChild(ret, text_to_dom_tree(bgt_description_string,
- gnc_budget_get_description(bgt)));
+ xmlAddChild (ret, text_to_dom_tree (bgt_description_string,
+ gnc_budget_get_description (bgt)));
/* field: guint num_periods */
- xmlAddChild(ret, guint_to_dom_tree(bgt_num_periods_string,
- gnc_budget_get_num_periods(bgt)));
+ xmlAddChild (ret, guint_to_dom_tree (bgt_num_periods_string,
+ gnc_budget_get_num_periods (bgt)));
/* field: Recurrence* */
- xmlAddChild(ret, recurrence_to_dom_tree(bgt_recurrence_string,
- gnc_budget_get_recurrence(bgt)));
+ xmlAddChild (ret, recurrence_to_dom_tree (bgt_recurrence_string,
+ gnc_budget_get_recurrence (bgt)));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(bgt_slots_string,
- QOF_INSTANCE(bgt)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (bgt_slots_string,
+ QOF_INSTANCE (bgt)));
LEAVE (" ");
return ret;
@@ -90,39 +90,39 @@ gnc_budget_dom_tree_create(GncBudget *bgt)
/***********************************************************************/
static inline gboolean
-set_string(xmlNodePtr node, GncBudget* bgt,
- void (*func)(GncBudget *bgt, const gchar *txt))
+set_string (xmlNodePtr node, GncBudget* bgt,
+ void (*func) (GncBudget* bgt, const gchar* txt))
{
- gchar* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ gchar* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(bgt, txt);
- g_free(txt);
+ func (bgt, txt);
+ g_free (txt);
return TRUE;
}
static gboolean
budget_id_handler (xmlNodePtr node, gpointer bgt)
{
- GncGUID *guid;
+ GncGUID* guid;
- guid = dom_tree_to_guid(node);
- g_return_val_if_fail(guid, FALSE);
- qof_instance_set_guid(QOF_INSTANCE(bgt), guid);
- g_free(guid);
+ guid = dom_tree_to_guid (node);
+ g_return_val_if_fail (guid, FALSE);
+ qof_instance_set_guid (QOF_INSTANCE (bgt), guid);
+ g_free (guid);
return TRUE;
}
static gboolean
budget_name_handler (xmlNodePtr node, gpointer bgt)
{
- return set_string(node, GNC_BUDGET(bgt), gnc_budget_set_name);
+ return set_string (node, GNC_BUDGET (bgt), gnc_budget_set_name);
}
static gboolean
budget_description_handler (xmlNodePtr node, gpointer bgt)
{
- return set_string(node, GNC_BUDGET(bgt), gnc_budget_set_description);
+ return set_string (node, GNC_BUDGET (bgt), gnc_budget_set_description);
}
static gboolean
@@ -130,9 +130,9 @@ budget_num_periods_handler (xmlNodePtr node, gpointer bgt)
{
guint num_periods;
- if (dom_tree_to_guint(node, &num_periods))
+ if (dom_tree_to_guint (node, &num_periods))
{
- gnc_budget_set_num_periods(GNC_BUDGET(bgt), num_periods);
+ gnc_budget_set_num_periods (GNC_BUDGET (bgt), num_periods);
return TRUE;
}
else
@@ -142,20 +142,20 @@ budget_num_periods_handler (xmlNodePtr node, gpointer bgt)
static gboolean
budget_recurrence_handler (xmlNodePtr node, gpointer bgt)
{
- Recurrence *r;
+ Recurrence* r;
- if ((r = dom_tree_to_recurrence(node)) == NULL)
+ if ((r = dom_tree_to_recurrence (node)) == NULL)
return FALSE;
- gnc_budget_set_recurrence(GNC_BUDGET(bgt), r);
- g_free(r);
+ gnc_budget_set_recurrence (GNC_BUDGET (bgt), r);
+ g_free (r);
return TRUE;
}
static gboolean
budget_slots_handler (xmlNodePtr node, gpointer bgt)
{
- return dom_tree_create_instance_slots(node, QOF_INSTANCE(bgt));
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (bgt));
}
static struct dom_tree_handler budget_handlers[] =
@@ -170,15 +170,15 @@ static struct dom_tree_handler budget_handlers[] =
};
static gboolean
-gnc_budget_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_budget_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncBudget *bgt;
+ GncBudget* bgt;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
{
@@ -192,14 +192,14 @@ gnc_budget_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- bgt = dom_tree_to_budget(tree, book);
- xmlFreeNode(tree);
+ bgt = dom_tree_to_budget (tree, book);
+ xmlFreeNode (tree);
if (bgt != NULL)
{
/* ends up calling book_callback */
- gdata->cb(tag, gdata->parsedata, bgt);
+ gdata->cb (tag, gdata->parsedata, bgt);
}
return bgt != NULL;
@@ -207,23 +207,23 @@ gnc_budget_end_handler(gpointer data_for_children,
GncBudget*
-dom_tree_to_budget (xmlNodePtr node, QofBook *book)
+dom_tree_to_budget (xmlNodePtr node, QofBook* book)
{
- GncBudget *bgt;
+ GncBudget* bgt;
- bgt = gnc_budget_new(book);
+ bgt = gnc_budget_new (book);
if (!dom_tree_generic_parse (node, budget_handlers, bgt))
{
PERR ("failed to parse budget tree");
- gnc_budget_destroy(bgt);
+ gnc_budget_destroy (bgt);
bgt = NULL;
}
return bgt;
}
sixtp*
-gnc_budget_sixtp_parser_create(void)
+gnc_budget_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_budget_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_budget_end_handler, NULL, NULL);
}
/* ====================== END OF FILE ===================*/
diff --git a/src/backend/xml/gnc-commodity-xml-v2.cpp b/src/backend/xml/gnc-commodity-xml-v2.cpp
index 16b1217..69d7f18 100644
--- a/src/backend/xml/gnc-commodity-xml-v2.cpp
+++ b/src/backend/xml/gnc-commodity-xml-v2.cpp
@@ -44,7 +44,7 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *commodity_version_string = "2.0.0";
+const gchar* commodity_version_string = "2.0.0";
/* ids */
#define gnc_commodity_string "gnc:commodity"
@@ -59,61 +59,61 @@ const gchar *commodity_version_string = "2.0.0";
#define cmdty_slots "cmdty:slots"
xmlNodePtr
-gnc_commodity_dom_tree_create(const gnc_commodity *com)
+gnc_commodity_dom_tree_create (const gnc_commodity* com)
{
- gnc_quote_source *source;
- const char *string;
+ gnc_quote_source* source;
+ const char* string;
xmlNodePtr ret;
- gboolean currency = gnc_commodity_is_iso(com);
+ gboolean currency = gnc_commodity_is_iso (com);
xmlNodePtr slotsnode =
- qof_instance_slots_to_dom_tree(cmdty_slots, QOF_INSTANCE(com));
+ qof_instance_slots_to_dom_tree (cmdty_slots, QOF_INSTANCE (com));
- if (currency && !gnc_commodity_get_quote_flag(com) && !slotsnode)
+ if (currency && !gnc_commodity_get_quote_flag (com) && !slotsnode)
return NULL;
- ret = xmlNewNode(NULL, BAD_CAST gnc_commodity_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_commodity_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST commodity_version_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST commodity_version_string);
- xmlAddChild(ret, text_to_dom_tree(cmdty_namespace,
- gnc_commodity_get_namespace_compat(com)));
- xmlAddChild(ret, text_to_dom_tree(cmdty_id,
- gnc_commodity_get_mnemonic(com)));
+ xmlAddChild (ret, text_to_dom_tree (cmdty_namespace,
+ gnc_commodity_get_namespace_compat (com)));
+ xmlAddChild (ret, text_to_dom_tree (cmdty_id,
+ gnc_commodity_get_mnemonic (com)));
if (!currency)
{
- if (gnc_commodity_get_fullname(com))
+ if (gnc_commodity_get_fullname (com))
{
- xmlAddChild(ret, text_to_dom_tree(cmdty_name,
- gnc_commodity_get_fullname(com)));
+ xmlAddChild (ret, text_to_dom_tree (cmdty_name,
+ gnc_commodity_get_fullname (com)));
}
- if (gnc_commodity_get_cusip(com) &&
- strlen(gnc_commodity_get_cusip(com)) > 0)
+ if (gnc_commodity_get_cusip (com) &&
+ strlen (gnc_commodity_get_cusip (com)) > 0)
{
- xmlAddChild(ret, text_to_dom_tree(
- cmdty_xcode,
- gnc_commodity_get_cusip(com)));
+ xmlAddChild (ret, text_to_dom_tree (
+ cmdty_xcode,
+ gnc_commodity_get_cusip (com)));
}
- xmlAddChild(ret, int_to_dom_tree(cmdty_fraction,
- gnc_commodity_get_fraction(com)));
+ xmlAddChild (ret, int_to_dom_tree (cmdty_fraction,
+ gnc_commodity_get_fraction (com)));
}
- if (gnc_commodity_get_quote_flag(com))
+ if (gnc_commodity_get_quote_flag (com))
{
- xmlNewChild(ret, NULL, BAD_CAST cmdty_get_quotes, NULL);
- source = gnc_commodity_get_quote_source(com);
+ xmlNewChild (ret, NULL, BAD_CAST cmdty_get_quotes, NULL);
+ source = gnc_commodity_get_quote_source (com);
if (source)
- xmlAddChild(ret, text_to_dom_tree(cmdty_quote_source,
- gnc_quote_source_get_internal_name(source)));
- string = gnc_commodity_get_quote_tz(com);
+ xmlAddChild (ret, text_to_dom_tree (cmdty_quote_source,
+ gnc_quote_source_get_internal_name (source)));
+ string = gnc_commodity_get_quote_tz (com);
if (string)
- xmlAddChild(ret, text_to_dom_tree(cmdty_quote_tz, string));
+ xmlAddChild (ret, text_to_dom_tree (cmdty_quote_tz, string));
}
if (slotsnode)
- xmlAddChild(ret, slotsnode);
+ xmlAddChild (ret, slotsnode);
return ret;
}
@@ -122,8 +122,8 @@ gnc_commodity_dom_tree_create(const gnc_commodity *com)
struct com_char_handler
{
- const char *tag;
- void(*func)(gnc_commodity *com, const char*val);
+ const char* tag;
+ void (*func) (gnc_commodity* com, const char* val);
};
struct com_char_handler com_handlers[] =
@@ -137,53 +137,53 @@ struct com_char_handler com_handlers[] =
};
static void
-set_commodity_value(xmlNodePtr node, gnc_commodity* com)
+set_commodity_value (xmlNodePtr node, gnc_commodity* com)
{
- if (g_strcmp0((char*) node->name, cmdty_fraction) == 0)
+ if (g_strcmp0 ((char*) node->name, cmdty_fraction) == 0)
{
gint64 val;
- char *string;
+ char* string;
string = (char*) xmlNodeGetContent (node->xmlChildrenNode);
- if (string_to_gint64(string, &val))
+ if (string_to_gint64 (string, &val))
{
- gnc_commodity_set_fraction(com, val);
+ gnc_commodity_set_fraction (com, val);
}
xmlFree (string);
}
- else if (g_strcmp0((char*)node->name, cmdty_get_quotes) == 0)
+ else if (g_strcmp0 ((char*)node->name, cmdty_get_quotes) == 0)
{
- gnc_commodity_set_quote_flag(com, TRUE);
+ gnc_commodity_set_quote_flag (com, TRUE);
}
- else if (g_strcmp0((char*)node->name, cmdty_quote_source) == 0)
+ else if (g_strcmp0 ((char*)node->name, cmdty_quote_source) == 0)
{
- gnc_quote_source *source;
- char *string;
+ gnc_quote_source* source;
+ char* string;
string = (char*) xmlNodeGetContent (node->xmlChildrenNode);
- source = gnc_quote_source_lookup_by_internal(string);
+ source = gnc_quote_source_lookup_by_internal (string);
if (!source)
- source = gnc_quote_source_add_new(string, FALSE);
- gnc_commodity_set_quote_source(com, source);
+ source = gnc_quote_source_add_new (string, FALSE);
+ gnc_commodity_set_quote_source (com, source);
xmlFree (string);
}
- else if (g_strcmp0((char*)node->name, cmdty_slots) == 0)
+ else if (g_strcmp0 ((char*)node->name, cmdty_slots) == 0)
{
/* We ignore the results here */
- dom_tree_create_instance_slots(node, QOF_INSTANCE(com));
+ dom_tree_create_instance_slots (node, QOF_INSTANCE (com));
}
else
{
- struct com_char_handler *mark;
+ struct com_char_handler* mark;
for (mark = com_handlers; mark->tag; mark++)
{
- if (g_strcmp0(mark->tag, (char*)node->name) == 0)
+ if (g_strcmp0 (mark->tag, (char*)node->name) == 0)
{
- gchar* val = dom_tree_to_text(node);
- g_strstrip(val);
- (mark->func)(com, val);
- g_free(val);
+ gchar* val = dom_tree_to_text (node);
+ g_strstrip (val);
+ (mark->func) (com, val);
+ g_free (val);
break;
}
}
@@ -191,69 +191,69 @@ set_commodity_value(xmlNodePtr node, gnc_commodity* com)
}
static gboolean
-valid_commodity(gnc_commodity *com)
+valid_commodity (gnc_commodity* com)
{
- if (gnc_commodity_get_namespace(com) == NULL)
+ if (gnc_commodity_get_namespace (com) == NULL)
{
- PWARN("Invalid commodity: no namespace");
+ PWARN ("Invalid commodity: no namespace");
return FALSE;
}
- if (gnc_commodity_get_mnemonic(com) == NULL)
+ if (gnc_commodity_get_mnemonic (com) == NULL)
{
- PWARN("Invalid commodity: no mnemonic");
+ PWARN ("Invalid commodity: no mnemonic");
return FALSE;
}
- if (gnc_commodity_get_fraction(com) == 0)
+ if (gnc_commodity_get_fraction (com) == 0)
{
- PWARN("Invalid commodity: 0 fraction");
+ PWARN ("Invalid commodity: 0 fraction");
return FALSE;
}
return TRUE;
}
-static gnc_commodity *
-gnc_commodity_find_currency (QofBook *book, xmlNodePtr tree)
+static gnc_commodity*
+gnc_commodity_find_currency (QofBook* book, xmlNodePtr tree)
{
- gnc_commodity_table * table;
- gnc_commodity *currency = NULL;
- gchar *exchange = NULL, *mnemonic = NULL;
+ gnc_commodity_table* table;
+ gnc_commodity* currency = NULL;
+ gchar* exchange = NULL, *mnemonic = NULL;
xmlNodePtr node;
for (node = tree->xmlChildrenNode; node; node = node->next)
{
- if (g_strcmp0((char*) node->name, cmdty_namespace) == 0)
+ if (g_strcmp0 ((char*) node->name, cmdty_namespace) == 0)
exchange = (gchar*) xmlNodeGetContent (node->xmlChildrenNode);
- if (g_strcmp0((char*) node->name, cmdty_id) == 0)
+ if (g_strcmp0 ((char*) node->name, cmdty_id) == 0)
mnemonic = (gchar*) xmlNodeGetContent (node->xmlChildrenNode);
}
if (exchange
- && gnc_commodity_namespace_is_iso(exchange)
- && mnemonic)
+ && gnc_commodity_namespace_is_iso (exchange)
+ && mnemonic)
{
- table = gnc_commodity_table_get_table(book);
- currency = gnc_commodity_table_lookup(table, exchange, mnemonic);
+ table = gnc_commodity_table_get_table (book);
+ currency = gnc_commodity_table_lookup (table, exchange, mnemonic);
}
if (exchange)
- xmlFree(exchange);
+ xmlFree (exchange);
if (mnemonic)
- xmlFree(mnemonic);
+ xmlFree (mnemonic);
return currency;
}
static gboolean
-gnc_commodity_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_commodity_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- gnc_commodity *com, *old_com;
+ gnc_commodity* com, *old_com;
xmlNodePtr achild;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
{
@@ -267,38 +267,38 @@ gnc_commodity_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- com = gnc_commodity_new(book, NULL, NULL, NULL, NULL, 0);
- old_com = gnc_commodity_find_currency(book, tree);
+ com = gnc_commodity_new (book, NULL, NULL, NULL, NULL, 0);
+ old_com = gnc_commodity_find_currency (book, tree);
if (old_com)
- gnc_commodity_copy(com, old_com);
+ gnc_commodity_copy (com, old_com);
for (achild = tree->xmlChildrenNode; achild; achild = achild->next)
{
- set_commodity_value(achild, com);
+ set_commodity_value (achild, com);
}
- if (!valid_commodity(com))
+ if (!valid_commodity (com))
{
- PWARN("Invalid commodity parsed");
- xmlElemDump(stdout, NULL, tree);
- printf("\n");
- fflush(stdout);
- gnc_commodity_destroy(com);
+ PWARN ("Invalid commodity parsed");
+ xmlElemDump (stdout, NULL, tree);
+ printf ("\n");
+ fflush (stdout);
+ gnc_commodity_destroy (com);
return FALSE;
}
- gdata->cb(tag, gdata->parsedata, com);
+ gdata->cb (tag, gdata->parsedata, com);
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return TRUE;
}
sixtp*
-gnc_commodity_sixtp_parser_create(void)
+gnc_commodity_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_commodity_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_commodity_end_handler, NULL, NULL);
}
diff --git a/src/backend/xml/gnc-customer-xml-v2.cpp b/src/backend/xml/gnc-customer-xml-v2.cpp
index c86e380..74cc13e 100644
--- a/src/backend/xml/gnc-customer-xml-v2.cpp
+++ b/src/backend/xml/gnc-customer-xml-v2.cpp
@@ -51,11 +51,11 @@ extern "C"
#include "xml-helpers.h"
-#define _GNC_MOD_NAME GNC_ID_CUSTOMER
+#define _GNC_MOD_NAME GNC_ID_CUSTOMER
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *customer_version_string = "2.0.0";
+const gchar* customer_version_string = "2.0.0";
/* ids */
#define gnc_customer_string "gnc:GncCustomer"
@@ -76,66 +76,66 @@ const gchar *customer_version_string = "2.0.0";
#define cust_slots_string "cust:slots"
static xmlNodePtr
-customer_dom_tree_create (GncCustomer *cust)
+customer_dom_tree_create (GncCustomer* cust)
{
xmlNodePtr ret;
gnc_numeric num;
- GncBillTerm *term;
- GncTaxTable *taxtable;
+ GncBillTerm* term;
+ GncTaxTable* taxtable;
- ret = xmlNewNode(NULL, BAD_CAST gnc_customer_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST customer_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_customer_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST customer_version_string);
- xmlAddChild(ret, guid_to_dom_tree(cust_guid_string,
- qof_instance_get_guid(QOF_INSTANCE(cust))));
+ xmlAddChild (ret, guid_to_dom_tree (cust_guid_string,
+ qof_instance_get_guid (QOF_INSTANCE (cust))));
- xmlAddChild(ret, text_to_dom_tree(cust_name_string,
- gncCustomerGetName (cust)));
+ xmlAddChild (ret, text_to_dom_tree (cust_name_string,
+ gncCustomerGetName (cust)));
- xmlAddChild(ret, text_to_dom_tree(cust_id_string,
- gncCustomerGetID (cust)));
+ xmlAddChild (ret, text_to_dom_tree (cust_id_string,
+ gncCustomerGetID (cust)));
- xmlAddChild(ret, gnc_address_to_dom_tree(cust_addr_string,
- gncCustomerGetAddr (cust)));
+ xmlAddChild (ret, gnc_address_to_dom_tree (cust_addr_string,
+ gncCustomerGetAddr (cust)));
- xmlAddChild(ret, gnc_address_to_dom_tree(cust_shipaddr_string,
- gncCustomerGetShipAddr (cust)));
+ xmlAddChild (ret, gnc_address_to_dom_tree (cust_shipaddr_string,
+ gncCustomerGetShipAddr (cust)));
maybe_add_string (ret, cust_notes_string, gncCustomerGetNotes (cust));
term = gncCustomerGetTerms (cust);
if (term)
- xmlAddChild(ret, guid_to_dom_tree(cust_terms_string,
- qof_instance_get_guid (QOF_INSTANCE(term))));
+ xmlAddChild (ret, guid_to_dom_tree (cust_terms_string,
+ qof_instance_get_guid (QOF_INSTANCE (term))));
- xmlAddChild(ret, text_to_dom_tree(cust_taxincluded_string,
- gncTaxIncludedTypeToString (
- gncCustomerGetTaxIncluded (cust))));
+ xmlAddChild (ret, text_to_dom_tree (cust_taxincluded_string,
+ gncTaxIncludedTypeToString (
+ gncCustomerGetTaxIncluded (cust))));
- xmlAddChild(ret, int_to_dom_tree(cust_active_string,
- gncCustomerGetActive (cust)));
+ xmlAddChild (ret, int_to_dom_tree (cust_active_string,
+ gncCustomerGetActive (cust)));
num = gncCustomerGetDiscount (cust);
- xmlAddChild(ret, gnc_numeric_to_dom_tree(cust_discount_string, &num));
+ xmlAddChild (ret, gnc_numeric_to_dom_tree (cust_discount_string, &num));
num = gncCustomerGetCredit (cust);
- xmlAddChild(ret, gnc_numeric_to_dom_tree(cust_credit_string, &num));
+ xmlAddChild (ret, gnc_numeric_to_dom_tree (cust_credit_string, &num));
xmlAddChild
(ret,
- commodity_ref_to_dom_tree(cust_currency_string,
- gncCustomerGetCurrency (cust)));
+ commodity_ref_to_dom_tree (cust_currency_string,
+ gncCustomerGetCurrency (cust)));
xmlAddChild (ret, int_to_dom_tree (cust_taxtableoverride_string,
gncCustomerGetTaxTableOverride (cust)));
taxtable = gncCustomerGetTaxTable (cust);
if (taxtable)
xmlAddChild (ret, guid_to_dom_tree (cust_taxtable_string,
- qof_instance_get_guid(QOF_INSTANCE(taxtable))));
+ qof_instance_get_guid (QOF_INSTANCE (taxtable))));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(cust_slots_string,
- QOF_INSTANCE(cust)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (cust_slots_string,
+ QOF_INSTANCE (cust)));
return ret;
}
@@ -144,34 +144,34 @@ customer_dom_tree_create (GncCustomer *cust)
struct customer_pdata
{
- GncCustomer *customer;
- QofBook *book;
+ GncCustomer* customer;
+ QofBook* book;
};
static gboolean
-set_string(xmlNodePtr node, GncCustomer* cust,
- void (*func)(GncCustomer *cust, const char *txt))
+set_string (xmlNodePtr node, GncCustomer* cust,
+ void (*func) (GncCustomer* cust, const char* txt))
{
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(cust, txt);
+ func (cust, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
static gboolean
-set_boolean(xmlNodePtr node, GncCustomer* cust,
- void (*func)(GncCustomer* cust, gboolean b))
+set_boolean (xmlNodePtr node, GncCustomer* cust,
+ void (*func) (GncCustomer* cust, gboolean b))
{
gint64 val;
gboolean ret;
- ret = dom_tree_to_integer(node, &val);
+ ret = dom_tree_to_integer (node, &val);
if (ret)
- func(cust, (gboolean)val);
+ func (cust, (gboolean)val);
return ret;
}
@@ -179,20 +179,20 @@ set_boolean(xmlNodePtr node, GncCustomer* cust,
static gboolean
customer_name_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
- return set_string(node, pdata->customer, gncCustomerSetName);
+ return set_string (node, pdata->customer, gncCustomerSetName);
}
static gboolean
customer_guid_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
- GncGUID *guid;
- GncCustomer *cust;
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
+ GncGUID* guid;
+ GncCustomer* cust;
- guid = dom_tree_to_guid(node);
- g_return_val_if_fail(guid, FALSE);
+ guid = dom_tree_to_guid (node);
+ g_return_val_if_fail (guid, FALSE);
cust = gncCustomerLookup (pdata->book, guid);
if (cust)
{
@@ -202,10 +202,10 @@ customer_guid_handler (xmlNodePtr node, gpointer cust_pdata)
}
else
{
- gncCustomerSetGUID(pdata->customer, guid);
+ gncCustomerSetGUID (pdata->customer, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -213,30 +213,30 @@ customer_guid_handler (xmlNodePtr node, gpointer cust_pdata)
static gboolean
customer_id_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
- return set_string(node, pdata->customer, gncCustomerSetID);
+ return set_string (node, pdata->customer, gncCustomerSetID);
}
static gboolean
customer_notes_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
- return set_string(node, pdata->customer, gncCustomerSetNotes);
+ return set_string (node, pdata->customer, gncCustomerSetNotes);
}
static gboolean
customer_terms_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
- GncGUID *guid;
- GncBillTerm *term;
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
+ GncGUID* guid;
+ GncBillTerm* term;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
- term = gnc_billterm_xml_find_or_create(pdata->book, guid);
- g_assert(term);
+ term = gnc_billterm_xml_find_or_create (pdata->book, guid);
+ g_assert (term);
g_free (guid);
gncCustomerSetTerms (pdata->customer, term);
@@ -246,27 +246,27 @@ customer_terms_handler (xmlNodePtr node, gpointer cust_pdata)
static gboolean
customer_addr_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
- return gnc_dom_tree_to_address (node, gncCustomerGetAddr(pdata->customer));
+ return gnc_dom_tree_to_address (node, gncCustomerGetAddr (pdata->customer));
}
static gboolean
customer_shipaddr_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
return gnc_dom_tree_to_address (node,
- gncCustomerGetShipAddr(pdata->customer));
+ gncCustomerGetShipAddr (pdata->customer));
}
static gboolean
customer_taxincluded_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
GncTaxIncluded type;
- char *str;
+ char* str;
gboolean ret;
str = dom_tree_to_text (node);
@@ -276,7 +276,7 @@ customer_taxincluded_handler (xmlNodePtr node, gpointer cust_pdata)
g_free (str);
if (ret)
- gncCustomerSetTaxIncluded(pdata->customer, type);
+ gncCustomerSetTaxIncluded (pdata->customer, type);
return ret;
}
@@ -284,20 +284,20 @@ customer_taxincluded_handler (xmlNodePtr node, gpointer cust_pdata)
static gboolean
customer_active_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
return set_boolean (node, pdata->customer, gncCustomerSetActive);
}
static gboolean
customer_discount_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
- gnc_numeric *val;
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
+ gnc_numeric* val;
- val = dom_tree_to_gnc_numeric(node);
- g_return_val_if_fail(val, FALSE);
+ val = dom_tree_to_gnc_numeric (node);
+ g_return_val_if_fail (val, FALSE);
- gncCustomerSetDiscount(pdata->customer, *val);
+ gncCustomerSetDiscount (pdata->customer, *val);
g_free (val);
return TRUE;
@@ -306,13 +306,13 @@ customer_discount_handler (xmlNodePtr node, gpointer cust_pdata)
static gboolean
customer_credit_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
- gnc_numeric *val;
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
+ gnc_numeric* val;
- val = dom_tree_to_gnc_numeric(node);
- g_return_val_if_fail(val, FALSE);
+ val = dom_tree_to_gnc_numeric (node);
+ g_return_val_if_fail (val, FALSE);
- gncCustomerSetCredit(pdata->customer, *val);
+ gncCustomerSetCredit (pdata->customer, *val);
g_free (val);
return TRUE;
@@ -321,10 +321,10 @@ customer_credit_handler (xmlNodePtr node, gpointer cust_pdata)
static gboolean
customer_currency_handler (xmlNodePtr node, gpointer customer_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(customer_pdata);
- gnc_commodity *com;
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (customer_pdata);
+ gnc_commodity* com;
- com = dom_tree_to_commodity_ref(node, pdata->book);
+ com = dom_tree_to_commodity_ref (node, pdata->book);
g_return_val_if_fail (com, FALSE);
gncCustomerSetCurrency (pdata->customer, com);
@@ -335,9 +335,9 @@ customer_currency_handler (xmlNodePtr node, gpointer customer_pdata)
static gboolean
customer_taxtable_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
- GncGUID *guid;
- GncTaxTable *taxtable;
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
+ GncGUID* guid;
+ GncTaxTable* taxtable;
guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
@@ -353,22 +353,22 @@ customer_taxtable_handler (xmlNodePtr node, gpointer cust_pdata)
gncTaxTableDecRef (taxtable);
gncCustomerSetTaxTable (pdata->customer, taxtable);
- g_free(guid);
+ g_free (guid);
return TRUE;
}
static gboolean
customer_taxtableoverride_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
return set_boolean (node, pdata->customer, gncCustomerSetTaxTableOverride);
}
static gboolean
customer_slots_handler (xmlNodePtr node, gpointer cust_pdata)
{
- struct customer_pdata *pdata = static_cast<decltype(pdata)>(cust_pdata);
- return dom_tree_create_instance_slots(node, QOF_INSTANCE(pdata->customer));
+ struct customer_pdata* pdata = static_cast<decltype (pdata)> (cust_pdata);
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->customer));
}
static struct dom_tree_handler customer_handlers_v2[] =
@@ -393,12 +393,12 @@ static struct dom_tree_handler customer_handlers_v2[] =
};
static GncCustomer*
-dom_tree_to_customer (xmlNodePtr node, QofBook *book)
+dom_tree_to_customer (xmlNodePtr node, QofBook* book)
{
struct customer_pdata cust_pdata;
gboolean successful;
- cust_pdata.customer = gncCustomerCreate(book);
+ cust_pdata.customer = gncCustomerCreate (book);
cust_pdata.book = book;
gncCustomerBeginEdit (cust_pdata.customer);
@@ -418,15 +418,15 @@ dom_tree_to_customer (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_customer_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_customer_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncCustomer *cust;
+ GncCustomer* cust;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
@@ -441,29 +441,29 @@ gnc_customer_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- cust = dom_tree_to_customer(tree, book);
+ cust = dom_tree_to_customer (tree, book);
if (cust != NULL)
{
- gdata->cb(tag, gdata->parsedata, cust);
+ gdata->cb (tag, gdata->parsedata, cust);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return cust != NULL;
}
-static sixtp *
-customer_sixtp_parser_create(void)
+static sixtp*
+customer_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_customer_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_customer_end_handler, NULL, NULL);
}
static gboolean
-customer_should_be_saved (GncCustomer *customer)
+customer_should_be_saved (GncCustomer* customer)
{
- const char *id;
+ const char* id;
/* make sure this is a valid customer before we save it -- should have an ID */
id = gncCustomerGetID (customer);
@@ -474,15 +474,15 @@ customer_should_be_saved (GncCustomer *customer)
}
static void
-do_count (QofInstance * cust_p, gpointer count_p)
+do_count (QofInstance* cust_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
- if (customer_should_be_saved ((GncCustomer *)cust_p))
+ int* count = static_cast<decltype (count)> (count_p);
+ if (customer_should_be_saved ((GncCustomer*)cust_p))
(*count)++;
}
static int
-customer_get_count (QofBook *book)
+customer_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -490,36 +490,37 @@ customer_get_count (QofBook *book)
}
static void
-xml_add_customer (QofInstance * cust_p, gpointer out_p)
+xml_add_customer (QofInstance* cust_p, gpointer out_p)
{
xmlNodePtr node;
- GncCustomer *cust = (GncCustomer *) cust_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncCustomer* cust = (GncCustomer*) cust_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
if (!customer_should_be_saved (cust))
return;
node = customer_dom_tree_create (cust);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-customer_write (FILE *out, QofBook *book)
+customer_write (FILE* out, QofBook* book)
{
- qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_customer, (gpointer) out);
- return ferror(out) == 0;
+ qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_customer,
+ (gpointer) out);
+ return ferror (out) == 0;
}
static gboolean
-customer_ns(FILE *out)
+customer_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "cust");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "cust");
}
void
@@ -530,10 +531,10 @@ gnc_customer_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_customer_string,
customer_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
customer_get_count,
customer_write,
- NULL, /* scrub */
+ NULL, /* scrub */
customer_ns,
};
diff --git a/src/backend/xml/gnc-employee-xml-v2.cpp b/src/backend/xml/gnc-employee-xml-v2.cpp
index 8cd8f38..d8f8be2 100644
--- a/src/backend/xml/gnc-employee-xml-v2.cpp
+++ b/src/backend/xml/gnc-employee-xml-v2.cpp
@@ -46,11 +46,11 @@ extern "C"
#include "gnc-employee-xml-v2.h"
#include "gnc-address-xml-v2.h"
-#define _GNC_MOD_NAME GNC_ID_EMPLOYEE
+#define _GNC_MOD_NAME GNC_ID_EMPLOYEE
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *employee_version_string = "2.0.0";
+const gchar* employee_version_string = "2.0.0";
/* ids */
#define gnc_employee_string "gnc:GncEmployee"
@@ -68,60 +68,60 @@ const gchar *employee_version_string = "2.0.0";
#define employee_slots_string "employee:slots"
static void
-maybe_add_string (xmlNodePtr ptr, const char *tag, const char *str)
+maybe_add_string (xmlNodePtr ptr, const char* tag, const char* str)
{
- if (str && strlen(str) > 0)
+ if (str && strlen (str) > 0)
xmlAddChild (ptr, text_to_dom_tree (tag, str));
}
static xmlNodePtr
-employee_dom_tree_create (GncEmployee *employee)
+employee_dom_tree_create (GncEmployee* employee)
{
xmlNodePtr ret;
gnc_numeric num;
Account* ccard_acc;
- ret = xmlNewNode(NULL, BAD_CAST gnc_employee_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST employee_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_employee_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST employee_version_string);
- xmlAddChild(ret, guid_to_dom_tree(employee_guid_string,
- qof_instance_get_guid(QOF_INSTANCE (employee))));
+ xmlAddChild (ret, guid_to_dom_tree (employee_guid_string,
+ qof_instance_get_guid (QOF_INSTANCE (employee))));
- xmlAddChild(ret, text_to_dom_tree(employee_username_string,
- gncEmployeeGetUsername (employee)));
+ xmlAddChild (ret, text_to_dom_tree (employee_username_string,
+ gncEmployeeGetUsername (employee)));
- xmlAddChild(ret, text_to_dom_tree(employee_id_string,
- gncEmployeeGetID (employee)));
+ xmlAddChild (ret, text_to_dom_tree (employee_id_string,
+ gncEmployeeGetID (employee)));
- xmlAddChild(ret, gnc_address_to_dom_tree(employee_addr_string,
- gncEmployeeGetAddr (employee)));
+ xmlAddChild (ret, gnc_address_to_dom_tree (employee_addr_string,
+ gncEmployeeGetAddr (employee)));
maybe_add_string (ret, employee_language_string,
gncEmployeeGetLanguage (employee));
maybe_add_string (ret, employee_acl_string, gncEmployeeGetAcl (employee));
- xmlAddChild(ret, int_to_dom_tree(employee_active_string,
- gncEmployeeGetActive (employee)));
+ xmlAddChild (ret, int_to_dom_tree (employee_active_string,
+ gncEmployeeGetActive (employee)));
num = gncEmployeeGetWorkday (employee);
- xmlAddChild(ret, gnc_numeric_to_dom_tree (employee_workday_string, &num));
+ xmlAddChild (ret, gnc_numeric_to_dom_tree (employee_workday_string, &num));
num = gncEmployeeGetRate (employee);
- xmlAddChild(ret, gnc_numeric_to_dom_tree (employee_rate_string, &num));
+ xmlAddChild (ret, gnc_numeric_to_dom_tree (employee_rate_string, &num));
xmlAddChild
(ret,
- commodity_ref_to_dom_tree(employee_currency_string,
- gncEmployeeGetCurrency (employee)));
+ commodity_ref_to_dom_tree (employee_currency_string,
+ gncEmployeeGetCurrency (employee)));
ccard_acc = gncEmployeeGetCCard (employee);
if (ccard_acc)
- xmlAddChild(ret, guid_to_dom_tree(employee_ccard_string,
- qof_instance_get_guid(QOF_INSTANCE(ccard_acc))));
+ xmlAddChild (ret, guid_to_dom_tree (employee_ccard_string,
+ qof_instance_get_guid (QOF_INSTANCE (ccard_acc))));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(employee_slots_string,
- QOF_INSTANCE(employee)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (employee_slots_string,
+ QOF_INSTANCE (employee)));
return ret;
}
@@ -129,20 +129,20 @@ employee_dom_tree_create (GncEmployee *employee)
struct employee_pdata
{
- GncEmployee *employee;
- QofBook *book;
+ GncEmployee* employee;
+ QofBook* book;
};
static gboolean
-set_string(xmlNodePtr node, GncEmployee* employee,
- void (*func)(GncEmployee *employee, const char *txt))
+set_string (xmlNodePtr node, GncEmployee* employee,
+ void (*func) (GncEmployee* employee, const char* txt))
{
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(employee, txt);
+ func (employee, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
@@ -150,20 +150,20 @@ set_string(xmlNodePtr node, GncEmployee* employee,
static gboolean
employee_username_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
- return set_string(node, pdata->employee, gncEmployeeSetUsername);
+ return set_string (node, pdata->employee, gncEmployeeSetUsername);
}
static gboolean
employee_guid_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
- GncGUID *guid;
- GncEmployee *employee;
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
+ GncGUID* guid;
+ GncEmployee* employee;
- guid = dom_tree_to_guid(node);
- g_return_val_if_fail(guid, FALSE);
+ guid = dom_tree_to_guid (node);
+ g_return_val_if_fail (guid, FALSE);
/* See if we've already created this one */
employee = gncEmployeeLookup (pdata->book, guid);
@@ -175,10 +175,10 @@ employee_guid_handler (xmlNodePtr node, gpointer employee_pdata)
}
else
{
- gncEmployeeSetGUID(pdata->employee, guid);
+ gncEmployeeSetGUID (pdata->employee, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -186,45 +186,45 @@ employee_guid_handler (xmlNodePtr node, gpointer employee_pdata)
static gboolean
employee_id_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
- return set_string(node, pdata->employee, gncEmployeeSetID);
+ return set_string (node, pdata->employee, gncEmployeeSetID);
}
static gboolean
employee_language_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
- return set_string(node, pdata->employee, gncEmployeeSetLanguage);
+ return set_string (node, pdata->employee, gncEmployeeSetLanguage);
}
static gboolean
employee_acl_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
- return set_string(node, pdata->employee, gncEmployeeSetAcl);
+ return set_string (node, pdata->employee, gncEmployeeSetAcl);
}
static gboolean
employee_addr_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
- return gnc_dom_tree_to_address (node, gncEmployeeGetAddr(pdata->employee));
+ return gnc_dom_tree_to_address (node, gncEmployeeGetAddr (pdata->employee));
}
static gboolean
employee_active_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
gint64 val;
gboolean ret;
- ret = dom_tree_to_integer(node, &val);
+ ret = dom_tree_to_integer (node, &val);
if (ret)
- gncEmployeeSetActive(pdata->employee, (gboolean)val);
+ gncEmployeeSetActive (pdata->employee, (gboolean)val);
return ret;
}
@@ -232,13 +232,13 @@ employee_active_handler (xmlNodePtr node, gpointer employee_pdata)
static gboolean
employee_workday_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
- gnc_numeric *val;
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
+ gnc_numeric* val;
- val = dom_tree_to_gnc_numeric(node);
- g_return_val_if_fail(val, FALSE);
- gncEmployeeSetWorkday(pdata->employee, *val);
- g_free(val);
+ val = dom_tree_to_gnc_numeric (node);
+ g_return_val_if_fail (val, FALSE);
+ gncEmployeeSetWorkday (pdata->employee, *val);
+ g_free (val);
return TRUE;
}
@@ -246,13 +246,13 @@ employee_workday_handler (xmlNodePtr node, gpointer employee_pdata)
static gboolean
employee_rate_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
- gnc_numeric *val;
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
+ gnc_numeric* val;
- val = dom_tree_to_gnc_numeric(node);
- g_return_val_if_fail(val, FALSE);
- gncEmployeeSetRate(pdata->employee, *val);
- g_free(val);
+ val = dom_tree_to_gnc_numeric (node);
+ g_return_val_if_fail (val, FALSE);
+ gncEmployeeSetRate (pdata->employee, *val);
+ g_free (val);
return TRUE;
}
@@ -260,10 +260,10 @@ employee_rate_handler (xmlNodePtr node, gpointer employee_pdata)
static gboolean
employee_currency_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
- gnc_commodity *com;
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
+ gnc_commodity* com;
- com = dom_tree_to_commodity_ref(node, pdata->book);
+ com = dom_tree_to_commodity_ref (node, pdata->book);
g_return_val_if_fail (com, FALSE);
gncEmployeeSetCurrency (pdata->employee, com);
@@ -274,15 +274,15 @@ employee_currency_handler (xmlNodePtr node, gpointer employee_pdata)
static gboolean
employee_ccard_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
- GncGUID *guid;
- Account *ccard_acc;
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
+ GncGUID* guid;
+ Account* ccard_acc;
- guid = dom_tree_to_guid(node);
- g_return_val_if_fail(guid, FALSE);
+ guid = dom_tree_to_guid (node);
+ g_return_val_if_fail (guid, FALSE);
ccard_acc = xaccAccountLookup (guid, pdata->book);
- g_free(guid);
+ g_free (guid);
g_return_val_if_fail (ccard_acc, FALSE);
gncEmployeeSetCCard (pdata->employee, ccard_acc);
@@ -293,8 +293,8 @@ employee_ccard_handler (xmlNodePtr node, gpointer employee_pdata)
static gboolean
employee_slots_handler (xmlNodePtr node, gpointer employee_pdata)
{
- struct employee_pdata *pdata = static_cast<decltype(pdata)>(employee_pdata);
- return dom_tree_create_instance_slots (node, QOF_INSTANCE(pdata->employee));
+ struct employee_pdata* pdata = static_cast<decltype (pdata)> (employee_pdata);
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->employee));
}
static struct dom_tree_handler employee_handlers_v2[] =
@@ -316,12 +316,12 @@ static struct dom_tree_handler employee_handlers_v2[] =
};
static GncEmployee*
-dom_tree_to_employee (xmlNodePtr node, QofBook *book)
+dom_tree_to_employee (xmlNodePtr node, QofBook* book)
{
struct employee_pdata employee_pdata;
gboolean successful;
- employee_pdata.employee = gncEmployeeCreate(book);
+ employee_pdata.employee = gncEmployeeCreate (book);
employee_pdata.book = book;
gncEmployeeBeginEdit (employee_pdata.employee);
@@ -340,15 +340,15 @@ dom_tree_to_employee (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_employee_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_employee_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncEmployee *employee;
+ GncEmployee* employee;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
@@ -363,29 +363,29 @@ gnc_employee_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- employee = dom_tree_to_employee(tree, book);
+ employee = dom_tree_to_employee (tree, book);
if (employee != NULL)
{
- gdata->cb(tag, gdata->parsedata, employee);
+ gdata->cb (tag, gdata->parsedata, employee);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return employee != NULL;
}
-static sixtp *
-employee_sixtp_parser_create(void)
+static sixtp*
+employee_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_employee_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_employee_end_handler, NULL, NULL);
}
static gboolean
-employee_should_be_saved (GncEmployee *employee)
+employee_should_be_saved (GncEmployee* employee)
{
- const char *id;
+ const char* id;
/* make sure this is a valid employee before we save it -- should have an ID */
id = gncEmployeeGetID (employee);
@@ -396,15 +396,15 @@ employee_should_be_saved (GncEmployee *employee)
}
static void
-do_count (QofInstance * employee_p, gpointer count_p)
+do_count (QofInstance* employee_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
- if (employee_should_be_saved ((GncEmployee *) employee_p))
+ int* count = static_cast<decltype (count)> (count_p);
+ if (employee_should_be_saved ((GncEmployee*) employee_p))
(*count)++;
}
static int
-employee_get_count (QofBook *book)
+employee_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -412,36 +412,37 @@ employee_get_count (QofBook *book)
}
static void
-xml_add_employee (QofInstance * employee_p, gpointer out_p)
+xml_add_employee (QofInstance* employee_p, gpointer out_p)
{
xmlNodePtr node;
- GncEmployee *employee = (GncEmployee *) employee_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncEmployee* employee = (GncEmployee*) employee_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
if (!employee_should_be_saved (employee))
return;
node = employee_dom_tree_create (employee);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-employee_write (FILE *out, QofBook *book)
+employee_write (FILE* out, QofBook* book)
{
- qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_employee, (gpointer) out);
- return ferror(out) == 0;
+ qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_employee,
+ (gpointer) out);
+ return ferror (out) == 0;
}
static gboolean
-employee_ns(FILE *out)
+employee_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "employee");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "employee");
}
void
@@ -452,10 +453,10 @@ gnc_employee_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_employee_string,
employee_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
employee_get_count,
employee_write,
- NULL, /* scrub */
+ NULL, /* scrub */
employee_ns,
};
diff --git a/src/backend/xml/gnc-entry-xml-v2.cpp b/src/backend/xml/gnc-entry-xml-v2.cpp
index 2d7b018..4466201 100644
--- a/src/backend/xml/gnc-entry-xml-v2.cpp
+++ b/src/backend/xml/gnc-entry-xml-v2.cpp
@@ -49,11 +49,11 @@ extern "C"
#include "gnc-entry-xml-v2.h"
#include "gnc-owner-xml-v2.h"
-#define _GNC_MOD_NAME GNC_ID_ENTRY
+#define _GNC_MOD_NAME GNC_ID_ENTRY
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *entry_version_string = "2.0.0";
+const gchar* entry_version_string = "2.0.0";
/* ids */
#define gnc_entry_string "gnc:GncEntry"
@@ -94,40 +94,40 @@ const gchar *entry_version_string = "2.0.0";
#define entry_slots_string "entry:slots"
static void
-maybe_add_string (xmlNodePtr ptr, const char *tag, const char *str)
+maybe_add_string (xmlNodePtr ptr, const char* tag, const char* str)
{
- if (str && strlen(str) > 0)
+ if (str && strlen (str) > 0)
xmlAddChild (ptr, text_to_dom_tree (tag, str));
}
static void
-maybe_add_numeric (xmlNodePtr ptr, const char *tag, gnc_numeric num)
+maybe_add_numeric (xmlNodePtr ptr, const char* tag, gnc_numeric num)
{
if (!gnc_numeric_zero_p (num))
xmlAddChild (ptr, gnc_numeric_to_dom_tree (tag, &num));
}
static xmlNodePtr
-entry_dom_tree_create (GncEntry *entry)
+entry_dom_tree_create (GncEntry* entry)
{
xmlNodePtr ret;
Timespec ts;
- Account *acc;
- GncTaxTable *taxtable;
- GncOrder *order;
- GncInvoice *invoice;
+ Account* acc;
+ GncTaxTable* taxtable;
+ GncOrder* order;
+ GncInvoice* invoice;
- ret = xmlNewNode(NULL, BAD_CAST gnc_entry_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST entry_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_entry_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST entry_version_string);
- xmlAddChild(ret, guid_to_dom_tree(entry_guid_string,
- qof_instance_get_guid(QOF_INSTANCE(entry))));
+ xmlAddChild (ret, guid_to_dom_tree (entry_guid_string,
+ qof_instance_get_guid (QOF_INSTANCE (entry))));
ts = gncEntryGetDate (entry);
- xmlAddChild(ret, timespec_to_dom_tree (entry_date_string, &ts));
+ xmlAddChild (ret, timespec_to_dom_tree (entry_date_string, &ts));
ts = gncEntryGetDateEntered (entry);
- xmlAddChild(ret, timespec_to_dom_tree (entry_dateentered_string, &ts));
+ xmlAddChild (ret, timespec_to_dom_tree (entry_dateentered_string, &ts));
maybe_add_string (ret, entry_description_string,
gncEntryGetDescription (entry));
@@ -141,61 +141,62 @@ entry_dom_tree_create (GncEntry *entry)
acc = gncEntryGetInvAccount (entry);
if (acc)
xmlAddChild (ret, guid_to_dom_tree (entry_invacct_string,
- qof_instance_get_guid(QOF_INSTANCE(acc))));
+ qof_instance_get_guid (QOF_INSTANCE (acc))));
maybe_add_numeric (ret, entry_iprice_string, gncEntryGetInvPrice (entry));
- maybe_add_numeric (ret, entry_idiscount_string, gncEntryGetInvDiscount (entry));
+ maybe_add_numeric (ret, entry_idiscount_string,
+ gncEntryGetInvDiscount (entry));
invoice = gncEntryGetInvoice (entry);
if (invoice)
{
xmlAddChild (ret, guid_to_dom_tree (entry_invoice_string,
- qof_instance_get_guid(QOF_INSTANCE(invoice))));
-
- xmlAddChild(ret, text_to_dom_tree(entry_idisctype_string,
- gncAmountTypeToString (
- gncEntryGetInvDiscountType (entry))));
- xmlAddChild(ret, text_to_dom_tree(entry_idischow_string,
- gncEntryDiscountHowToString (
- gncEntryGetInvDiscountHow (entry))));
-
- xmlAddChild(ret, int_to_dom_tree(entry_itaxable_string,
- gncEntryGetInvTaxable (entry)));
- xmlAddChild(ret, int_to_dom_tree(entry_itaxincluded_string,
- gncEntryGetInvTaxIncluded (entry)));
+ qof_instance_get_guid (QOF_INSTANCE (invoice))));
+
+ xmlAddChild (ret, text_to_dom_tree (entry_idisctype_string,
+ gncAmountTypeToString (
+ gncEntryGetInvDiscountType (entry))));
+ xmlAddChild (ret, text_to_dom_tree (entry_idischow_string,
+ gncEntryDiscountHowToString (
+ gncEntryGetInvDiscountHow (entry))));
+
+ xmlAddChild (ret, int_to_dom_tree (entry_itaxable_string,
+ gncEntryGetInvTaxable (entry)));
+ xmlAddChild (ret, int_to_dom_tree (entry_itaxincluded_string,
+ gncEntryGetInvTaxIncluded (entry)));
}
taxtable = gncEntryGetInvTaxTable (entry);
if (taxtable)
xmlAddChild (ret, guid_to_dom_tree (entry_itaxtable_string,
- qof_instance_get_guid (QOF_INSTANCE(taxtable))));
+ qof_instance_get_guid (QOF_INSTANCE (taxtable))));
/* vendor bills */
acc = gncEntryGetBillAccount (entry);
if (acc)
xmlAddChild (ret, guid_to_dom_tree (entry_billacct_string,
- qof_instance_get_guid (QOF_INSTANCE(acc))));
+ qof_instance_get_guid (QOF_INSTANCE (acc))));
maybe_add_numeric (ret, entry_bprice_string, gncEntryGetBillPrice (entry));
invoice = gncEntryGetBill (entry);
if (invoice)
{
- GncOwner *owner;
+ GncOwner* owner;
xmlAddChild (ret, guid_to_dom_tree (entry_bill_string,
- qof_instance_get_guid(QOF_INSTANCE(invoice))));
- xmlAddChild(ret, int_to_dom_tree(entry_billable_string,
- gncEntryGetBillable (entry)));
+ qof_instance_get_guid (QOF_INSTANCE (invoice))));
+ xmlAddChild (ret, int_to_dom_tree (entry_billable_string,
+ gncEntryGetBillable (entry)));
owner = gncEntryGetBillTo (entry);
if (owner && owner->owner.undefined != NULL)
xmlAddChild (ret, gnc_owner_to_dom_tree (entry_billto_string, owner));
- xmlAddChild(ret, int_to_dom_tree(entry_btaxable_string,
- gncEntryGetBillTaxable (entry)));
- xmlAddChild(ret, int_to_dom_tree(entry_btaxincluded_string,
- gncEntryGetBillTaxIncluded (entry)));
+ xmlAddChild (ret, int_to_dom_tree (entry_btaxable_string,
+ gncEntryGetBillTaxable (entry)));
+ xmlAddChild (ret, int_to_dom_tree (entry_btaxincluded_string,
+ gncEntryGetBillTaxIncluded (entry)));
maybe_add_string (ret, entry_billpayment_string,
gncEntryPaymentTypeToString (gncEntryGetBillPayment (entry)));
}
@@ -203,18 +204,18 @@ entry_dom_tree_create (GncEntry *entry)
taxtable = gncEntryGetBillTaxTable (entry);
if (taxtable)
xmlAddChild (ret, guid_to_dom_tree (entry_btaxtable_string,
- qof_instance_get_guid (QOF_INSTANCE(taxtable))));
+ qof_instance_get_guid (QOF_INSTANCE (taxtable))));
/* Other stuff */
order = gncEntryGetOrder (entry);
if (order)
xmlAddChild (ret, guid_to_dom_tree (entry_order_string,
- qof_instance_get_guid(QOF_INSTANCE (order))));
+ qof_instance_get_guid (QOF_INSTANCE (order))));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(entry_slots_string,
- QOF_INSTANCE(entry)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (entry_slots_string,
+ QOF_INSTANCE (entry)));
return ret;
}
@@ -222,64 +223,64 @@ entry_dom_tree_create (GncEntry *entry)
struct entry_pdata
{
- GncEntry *entry;
- QofBook *book;
- Account *acc;
+ GncEntry* entry;
+ QofBook* book;
+ Account* acc;
};
static inline gboolean
-set_string(xmlNodePtr node, GncEntry* entry,
- void (*func)(GncEntry *entry, const char *txt))
+set_string (xmlNodePtr node, GncEntry* entry,
+ void (*func) (GncEntry* entry, const char* txt))
{
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(entry, txt);
- g_free(txt);
+ func (entry, txt);
+ g_free (txt);
return TRUE;
}
static inline gboolean
-set_timespec(xmlNodePtr node, GncEntry* entry,
- void (*func)(GncEntry *entry, Timespec ts))
+set_timespec (xmlNodePtr node, GncEntry* entry,
+ void (*func) (GncEntry* entry, Timespec ts))
{
Timespec ts = dom_tree_to_timespec (node);
- if (!dom_tree_valid_timespec(&ts, node->name)) return FALSE;
+ if (!dom_tree_valid_timespec (&ts, node->name)) return FALSE;
- func(entry, ts);
+ func (entry, ts);
return TRUE;
}
static inline gboolean
-set_numeric(xmlNodePtr node, GncEntry* entry,
- void (*func)(GncEntry *entry, gnc_numeric num))
+set_numeric (xmlNodePtr node, GncEntry* entry,
+ void (*func) (GncEntry* entry, gnc_numeric num))
{
- gnc_numeric* num = dom_tree_to_gnc_numeric(node);
- g_return_val_if_fail(num, FALSE);
+ gnc_numeric* num = dom_tree_to_gnc_numeric (node);
+ g_return_val_if_fail (num, FALSE);
- func(entry, *num);
- g_free(num);
+ func (entry, *num);
+ g_free (num);
return TRUE;
}
static inline gboolean
-set_boolean(xmlNodePtr node, GncEntry* entry,
- void (*func)(GncEntry *entry, gboolean val))
+set_boolean (xmlNodePtr node, GncEntry* entry,
+ void (*func) (GncEntry* entry, gboolean val))
{
gint64 val;
- if (!dom_tree_to_integer(node, &val))
+ if (!dom_tree_to_integer (node, &val))
return FALSE;
func (entry, (gboolean)val);
return TRUE;
}
static inline gboolean
-set_account(xmlNodePtr node, struct entry_pdata *pdata,
- void (*func)(GncEntry *entry, Account *acc))
+set_account (xmlNodePtr node, struct entry_pdata* pdata,
+ void (*func) (GncEntry* entry, Account* acc))
{
- GncGUID *guid;
- Account * acc;
+ GncGUID* guid;
+ Account* acc;
guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
@@ -295,11 +296,11 @@ set_account(xmlNodePtr node, struct entry_pdata *pdata,
}
static inline gboolean
-set_taxtable (xmlNodePtr node, struct entry_pdata *pdata,
- void (*func)(GncEntry *entry, GncTaxTable *taxtable))
+set_taxtable (xmlNodePtr node, struct entry_pdata* pdata,
+ void (*func) (GncEntry* entry, GncTaxTable* taxtable))
{
- GncGUID *guid;
- GncTaxTable *taxtable;
+ GncGUID* guid;
+ GncTaxTable* taxtable;
guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
@@ -315,18 +316,18 @@ set_taxtable (xmlNodePtr node, struct entry_pdata *pdata,
gncTaxTableDecRef (taxtable);
func (pdata->entry, taxtable);
- g_free(guid);
+ g_free (guid);
return TRUE;
}
static gboolean
entry_guid_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
- GncGUID *guid;
- GncEntry *entry;
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
+ GncGUID* guid;
+ GncEntry* entry;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
entry = gncEntryLookup (pdata->book, guid);
if (entry)
@@ -337,10 +338,10 @@ entry_guid_handler (xmlNodePtr node, gpointer entry_pdata)
}
else
{
- gncEntrySetGUID(pdata->entry, guid);
+ gncEntrySetGUID (pdata->entry, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -348,49 +349,49 @@ entry_guid_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_date_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_timespec(node, pdata->entry, gncEntrySetDate);
+ return set_timespec (node, pdata->entry, gncEntrySetDate);
}
static gboolean
entry_dateentered_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_timespec(node, pdata->entry, gncEntrySetDateEntered);
+ return set_timespec (node, pdata->entry, gncEntrySetDateEntered);
}
static gboolean
entry_description_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_string(node, pdata->entry, gncEntrySetDescription);
+ return set_string (node, pdata->entry, gncEntrySetDescription);
}
static gboolean
entry_action_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_string(node, pdata->entry, gncEntrySetAction);
+ return set_string (node, pdata->entry, gncEntrySetAction);
}
static gboolean
entry_notes_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_string(node, pdata->entry, gncEntrySetNotes);
+ return set_string (node, pdata->entry, gncEntrySetNotes);
}
static gboolean
entry_qty_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_numeric(node, pdata->entry, gncEntrySetQuantity);
+ return set_numeric (node, pdata->entry, gncEntrySetQuantity);
}
/* Cust invoice */
@@ -398,32 +399,32 @@ entry_qty_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_invacct_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_account (node, pdata, gncEntrySetInvAccount);
}
static gboolean
entry_iprice_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_numeric(node, pdata->entry, gncEntrySetInvPrice);
+ return set_numeric (node, pdata->entry, gncEntrySetInvPrice);
}
static gboolean
entry_idiscount_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_numeric(node, pdata->entry, gncEntrySetInvDiscount);
+ return set_numeric (node, pdata->entry, gncEntrySetInvDiscount);
}
static gboolean
entry_idisctype_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
GncAmountType type;
- char *str;
+ char* str;
gboolean ret;
str = dom_tree_to_text (node);
@@ -433,7 +434,7 @@ entry_idisctype_handler (xmlNodePtr node, gpointer entry_pdata)
g_free (str);
if (ret)
- gncEntrySetInvDiscountType(pdata->entry, type);
+ gncEntrySetInvDiscountType (pdata->entry, type);
return ret;
}
@@ -441,9 +442,9 @@ entry_idisctype_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_idischow_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
GncDiscountHow how;
- char *str;
+ char* str;
gboolean ret;
str = dom_tree_to_text (node);
@@ -453,7 +454,7 @@ entry_idischow_handler (xmlNodePtr node, gpointer entry_pdata)
g_free (str);
if (ret)
- gncEntrySetInvDiscountHow(pdata->entry, how);
+ gncEntrySetInvDiscountHow (pdata->entry, how);
return ret;
}
@@ -461,21 +462,21 @@ entry_idischow_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_itaxable_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_boolean (node, pdata->entry, gncEntrySetInvTaxable);
}
static gboolean
entry_itaxincluded_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_boolean (node, pdata->entry, gncEntrySetInvTaxIncluded);
}
static gboolean
entry_itaxtable_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_taxtable (node, pdata, gncEntrySetInvTaxTable);
}
@@ -484,50 +485,50 @@ entry_itaxtable_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_billacct_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_account (node, pdata, gncEntrySetBillAccount);
}
static gboolean
entry_bprice_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return set_numeric(node, pdata->entry, gncEntrySetBillPrice);
+ return set_numeric (node, pdata->entry, gncEntrySetBillPrice);
}
static gboolean
entry_btaxable_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_boolean (node, pdata->entry, gncEntrySetBillTaxable);
}
static gboolean
entry_btaxincluded_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_boolean (node, pdata->entry, gncEntrySetBillTaxIncluded);
}
static gboolean
entry_btaxtable_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_taxtable (node, pdata, gncEntrySetBillTaxTable);
}
static gboolean
entry_billable_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
return set_boolean (node, pdata->entry, gncEntrySetBillable);
}
static gboolean
entry_billto_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
GncOwner billto;
gboolean ret;
@@ -542,9 +543,9 @@ entry_billto_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_billpayment_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
GncEntryPaymentType type;
- char *str;
+ char* str;
gboolean ret;
str = dom_tree_to_text (node);
@@ -554,7 +555,7 @@ entry_billpayment_handler (xmlNodePtr node, gpointer entry_pdata)
g_free (str);
if (ret)
- gncEntrySetBillPayment(pdata->entry, type);
+ gncEntrySetBillPayment (pdata->entry, type);
return ret;
}
@@ -564,9 +565,9 @@ entry_billpayment_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_order_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
- GncGUID *guid;
- GncOrder *order;
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
+ GncGUID* guid;
+ GncOrder* order;
guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
@@ -582,16 +583,16 @@ entry_order_handler (xmlNodePtr node, gpointer entry_pdata)
gncOrderAddEntry (order, pdata->entry);
gncOrderCommitEdit (order);
- g_free(guid);
+ g_free (guid);
return TRUE;
}
static gboolean
entry_invoice_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
- GncGUID *guid;
- GncInvoice *invoice;
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
+ GncGUID* guid;
+ GncInvoice* invoice;
guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
@@ -607,16 +608,16 @@ entry_invoice_handler (xmlNodePtr node, gpointer entry_pdata)
gncInvoiceAddEntry (invoice, pdata->entry);
gncInvoiceCommitEdit (invoice);
- g_free(guid);
+ g_free (guid);
return TRUE;
}
static gboolean
entry_bill_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
- GncGUID *guid;
- GncInvoice *invoice;
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
+ GncGUID* guid;
+ GncInvoice* invoice;
guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
@@ -632,7 +633,7 @@ entry_bill_handler (xmlNodePtr node, gpointer entry_pdata)
gncBillAddEntry (invoice, pdata->entry);
gncInvoiceCommitEdit (invoice);
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -641,7 +642,7 @@ entry_bill_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_acct_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
/* XXX: try to figure out if this is an 'invoice' or a 'bill' --
* we have to wait until the end!
*/
@@ -652,11 +653,11 @@ entry_acct_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_price_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
gboolean res;
/* just set both.. Don't worry about extra data if it's wrong */
- res = set_numeric(node, pdata->entry, gncEntrySetInvPrice);
+ res = set_numeric (node, pdata->entry, gncEntrySetInvPrice);
if (res)
gncEntrySetBillPrice (pdata->entry, gncEntryGetInvPrice (pdata->entry));
return res;
@@ -665,9 +666,9 @@ entry_price_handler (xmlNodePtr node, gpointer entry_pdata)
static gboolean
entry_slots_handler (xmlNodePtr node, gpointer entry_pdata)
{
- struct entry_pdata *pdata = static_cast<decltype(pdata)>(entry_pdata);
+ struct entry_pdata* pdata = static_cast<decltype (pdata)> (entry_pdata);
- return dom_tree_create_instance_slots(node, QOF_INSTANCE (pdata->entry));
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->entry));
}
static struct dom_tree_handler entry_handlers_v2[] =
@@ -721,12 +722,12 @@ static struct dom_tree_handler entry_handlers_v2[] =
};
static GncEntry*
-dom_tree_to_entry (xmlNodePtr node, QofBook *book)
+dom_tree_to_entry (xmlNodePtr node, QofBook* book)
{
struct entry_pdata entry_pdata;
gboolean successful;
- entry_pdata.entry = gncEntryCreate(book);
+ entry_pdata.entry = gncEntryCreate (book);
entry_pdata.book = book;
entry_pdata.acc = NULL;
gncEntryBeginEdit (entry_pdata.entry);
@@ -754,15 +755,15 @@ dom_tree_to_entry (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_entry_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_entry_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncEntry *entry;
+ GncEntry* entry;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
@@ -777,34 +778,34 @@ gnc_entry_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- entry = dom_tree_to_entry(tree, book);
+ entry = dom_tree_to_entry (tree, book);
if (entry != NULL)
{
- gdata->cb(tag, gdata->parsedata, entry);
+ gdata->cb (tag, gdata->parsedata, entry);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return entry != NULL;
}
-static sixtp *
-entry_sixtp_parser_create(void)
+static sixtp*
+entry_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_entry_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_entry_end_handler, NULL, NULL);
}
static void
-do_count (QofInstance * entry_p, gpointer count_p)
+do_count (QofInstance* entry_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
+ int* count = static_cast<decltype (count)> (count_p);
(*count)++;
}
static int
-entry_get_count (QofBook *book)
+entry_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -812,39 +813,39 @@ entry_get_count (QofBook *book)
}
static void
-xml_add_entry (QofInstance * entry_p, gpointer out_p)
+xml_add_entry (QofInstance* entry_p, gpointer out_p)
{
xmlNodePtr node;
- GncEntry *entry = (GncEntry *) entry_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncEntry* entry = (GncEntry*) entry_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
/* Don't save non-attached entries! */
- if (!(gncEntryGetOrder (entry) || gncEntryGetInvoice (entry) ||
- gncEntryGetBill (entry)))
+ if (! (gncEntryGetOrder (entry) || gncEntryGetInvoice (entry) ||
+ gncEntryGetBill (entry)))
return;
node = entry_dom_tree_create (entry);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-entry_write (FILE *out, QofBook *book)
+entry_write (FILE* out, QofBook* book)
{
qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_entry, (gpointer) out);
- return ferror(out) == 0;
+ return ferror (out) == 0;
}
static gboolean
-entry_ns(FILE *out)
+entry_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "entry");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "entry");
}
void
@@ -855,10 +856,10 @@ gnc_entry_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_entry_string,
entry_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
entry_get_count,
entry_write,
- NULL, /* scrub */
+ NULL, /* scrub */
entry_ns,
};
diff --git a/src/backend/xml/gnc-freqspec-xml-v2.cpp b/src/backend/xml/gnc-freqspec-xml-v2.cpp
index 967f60e..3b11029 100644
--- a/src/backend/xml/gnc-freqspec-xml-v2.cpp
+++ b/src/backend/xml/gnc-freqspec-xml-v2.cpp
@@ -47,11 +47,11 @@ extern "C"
#include "sixtp-dom-parsers.h"
-const gchar *freqspec_version_string = "1.0.0";
+const gchar* freqspec_version_string = "1.0.0";
struct freqTypeTuple
{
- const char *str;
+ const char* str;
FreqType ft;
};
@@ -64,12 +64,12 @@ struct freqTypeTuple freqTypeStrs[] =
{ "monthly", MONTHLY },
{ "month_relative", MONTH_RELATIVE },
{ "composite", COMPOSITE },
- { NULL, static_cast<FreqType>(-1) },
+ { NULL, static_cast<FreqType> (-1) },
};
struct uiFreqTypeTuple
{
- const char *str;
+ const char* str;
UIFreqType uift;
};
@@ -87,7 +87,7 @@ struct uiFreqTypeTuple uiFreqTypeStrs[] =
{ "tri_anually", UIFREQ_TRI_ANUALLY },
{ "semi_yearly", UIFREQ_SEMI_YEARLY },
{ "yearly", UIFREQ_YEARLY },
- { NULL, static_cast<UIFreqType>(-1) }
+ { NULL, static_cast<UIFreqType> (-1) }
};
/**
@@ -95,10 +95,10 @@ struct uiFreqTypeTuple uiFreqTypeStrs[] =
**/
typedef struct
{
- QofBook *book; /* Book we're loading into. */
+ QofBook* book; /* Book we're loading into. */
- Recurrence *recurrence;
- GList *recurrence_list;
+ Recurrence* recurrence;
+ GList* recurrence_list;
/* fields used in the union of unions... :) */
GDate once_day; /* once */
@@ -107,79 +107,79 @@ typedef struct
gint64 day; /* monthly or month-relative */
gint64 occurrence; /* month-relative */
gint64 weekend_adj; /* monthly/yearly */
- GList *list; /* composite */
+ GList* list; /* composite */
UIFreqType uift;
} fsParseData;
static void
-fspd_init( fsParseData *fspd )
+fspd_init (fsParseData* fspd)
{
fspd->list = NULL;
fspd->book = NULL;
- fspd->recurrence = g_new0(Recurrence, 1);
+ fspd->recurrence = g_new0 (Recurrence, 1);
fspd->recurrence_list = NULL;
fspd->uift = UIFREQ_NONE;
fspd->interval
- = fspd->offset
- = fspd->day
- = fspd->occurrence
- = 0;
+ = fspd->offset
+ = fspd->day
+ = fspd->occurrence
+ = 0;
fspd->weekend_adj = WEEKEND_ADJ_NONE;
- g_date_clear( &fspd->once_day, 1 );
+ g_date_clear (&fspd->once_day, 1);
}
static
gboolean
-gnc_fs_handler( xmlNodePtr node, gpointer d );
+gnc_fs_handler (xmlNodePtr node, gpointer d);
static
gboolean
-fs_uift_handler( xmlNodePtr node, gpointer data)
+fs_uift_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
int i;
- char *nodeTxt;
+ char* nodeTxt;
- nodeTxt = dom_tree_to_text( node );
+ nodeTxt = dom_tree_to_text (node);
- g_return_val_if_fail( nodeTxt, FALSE );
- for ( i = 0; uiFreqTypeStrs[i].str != NULL; i++ )
+ g_return_val_if_fail (nodeTxt, FALSE);
+ for (i = 0; uiFreqTypeStrs[i].str != NULL; i++)
{
- if ( g_strcmp0( nodeTxt, uiFreqTypeStrs[i].str ) == 0 )
+ if (g_strcmp0 (nodeTxt, uiFreqTypeStrs[i].str) == 0)
{
fspd->uift = uiFreqTypeStrs[i].uift;
- g_free( nodeTxt );
+ g_free (nodeTxt);
return TRUE;
}
}
- g_free( nodeTxt );
+ g_free (nodeTxt);
return FALSE;
}
static
gboolean
-fs_date_handler( xmlNodePtr node, gpointer data )
+fs_date_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
- GDate *foo;
- foo = dom_tree_to_gdate( node );
- if ( foo == NULL )
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
+ GDate* foo;
+ foo = dom_tree_to_gdate (node);
+ if (foo == NULL)
return FALSE;
fspd->once_day = *foo;
- g_date_free( foo );
+ g_date_free (foo);
return TRUE;
}
static
gboolean
-fs_interval_handler( xmlNodePtr node, gpointer data )
+fs_interval_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
gboolean ret;
gint64 foo;
- ret = dom_tree_to_integer( node, &foo );
- if ( ! ret )
+ ret = dom_tree_to_integer (node, &foo);
+ if (! ret)
{
return ret;
}
@@ -189,14 +189,14 @@ fs_interval_handler( xmlNodePtr node, gpointer data )
static
gboolean
-fs_offset_handler( xmlNodePtr node, gpointer data )
+fs_offset_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
gboolean ret;
gint64 foo;
- ret = dom_tree_to_integer( node, &foo );
- if ( ! ret )
+ ret = dom_tree_to_integer (node, &foo);
+ if (! ret)
return ret;
fspd->offset = foo;
return TRUE;
@@ -204,14 +204,14 @@ fs_offset_handler( xmlNodePtr node, gpointer data )
static
gboolean
-fs_day_handler( xmlNodePtr node, gpointer data )
+fs_day_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
gboolean ret;
gint64 foo;
- ret = dom_tree_to_integer( node, &foo );
- if ( ! ret )
+ ret = dom_tree_to_integer (node, &foo);
+ if (! ret)
return ret;
fspd->day = foo;
return TRUE;
@@ -219,13 +219,13 @@ fs_day_handler( xmlNodePtr node, gpointer data )
static
gboolean
-fs_weekday_handler( xmlNodePtr node, gpointer data)
+fs_weekday_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
gboolean ret;
gint64 foo;
- ret = dom_tree_to_integer( node, &foo );
- if ( !ret )
+ ret = dom_tree_to_integer (node, &foo);
+ if (!ret)
return ret;
fspd->day = foo;
return TRUE;
@@ -233,13 +233,13 @@ fs_weekday_handler( xmlNodePtr node, gpointer data)
static
gboolean
-fs_occurrence_handler( xmlNodePtr node, gpointer data )
+fs_occurrence_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
gboolean ret;
gint64 foo;
- ret = dom_tree_to_integer( node, &foo );
- if ( !ret )
+ ret = dom_tree_to_integer (node, &foo);
+ if (!ret)
return ret;
fspd->occurrence = foo;
return TRUE;
@@ -247,13 +247,13 @@ fs_occurrence_handler( xmlNodePtr node, gpointer data )
static
gboolean
-fs_weekend_adj_handler( xmlNodePtr node, gpointer data )
+fs_weekend_adj_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
gboolean ret;
gint64 foo;
- ret = dom_tree_to_integer( node, &foo );
- if ( !ret )
+ ret = dom_tree_to_integer (node, &foo);
+ if (!ret)
return ret;
fspd->weekend_adj = foo;
return TRUE;
@@ -261,28 +261,29 @@ fs_weekend_adj_handler( xmlNodePtr node, gpointer data )
static
gboolean
-fs_subelement_handler( xmlNodePtr node, gpointer data )
+fs_subelement_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
- GList *recurrences;
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
+ GList* recurrences;
- recurrences = dom_tree_freqSpec_to_recurrences(node, fspd->book);
+ recurrences = dom_tree_freqSpec_to_recurrences (node, fspd->book);
if (recurrences == NULL)
return FALSE;
{
- GList *r_iter;
+ GList* r_iter;
for (r_iter = recurrences; r_iter != NULL; r_iter = r_iter->next)
{
- Recurrence *r = (Recurrence*)r_iter->data;
+ Recurrence* r = (Recurrence*)r_iter->data;
GDate recurrence_date;
if (fspd->uift == UIFREQ_SEMI_MONTHLY)
{
// complementry hack around 'once' freqspects not being valid. :/
- recurrence_date = recurrenceGetDate(r);
- recurrenceSet(r, recurrenceGetMultiplier(r), PERIOD_MONTH, &recurrence_date, recurrenceGetWeekendAdjust(r));
+ recurrence_date = recurrenceGetDate (r);
+ recurrenceSet (r, recurrenceGetMultiplier (r), PERIOD_MONTH, &recurrence_date,
+ recurrenceGetWeekendAdjust (r));
}
- fspd->recurrence_list = g_list_append(fspd->recurrence_list, r);
+ fspd->recurrence_list = g_list_append (fspd->recurrence_list, r);
}
}
return TRUE;
@@ -302,98 +303,102 @@ struct dom_tree_handler fs_union_dom_handlers[] =
};
static gboolean
-fs_none_handler( xmlNodePtr node, gpointer data )
+fs_none_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
- gboolean successful;
- successful = dom_tree_generic_parse( node,
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
+ gboolean successful;
+ successful = dom_tree_generic_parse (node,
fs_union_dom_handlers,
- fspd );
+ fspd);
return successful;
}
static
gboolean
-fs_once_handler( xmlNodePtr node, gpointer data )
+fs_once_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
gboolean successful;
- successful = dom_tree_generic_parse( node,
+ successful = dom_tree_generic_parse (node,
fs_union_dom_handlers,
- fspd );
- if ( !successful )
+ fspd);
+ if (!successful)
return FALSE;
- recurrenceSet(fspd->recurrence, 0, PERIOD_ONCE, &fspd->once_day, WEEKEND_ADJ_NONE);
+ recurrenceSet (fspd->recurrence, 0, PERIOD_ONCE, &fspd->once_day,
+ WEEKEND_ADJ_NONE);
return TRUE;
}
static gboolean
-fs_daily_handler(xmlNodePtr node, gpointer data)
+fs_daily_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
GDate offset_date;
gboolean successful;
- successful = dom_tree_generic_parse(node, fs_union_dom_handlers, fspd );
+ successful = dom_tree_generic_parse (node, fs_union_dom_handlers, fspd);
if (!successful)
return FALSE;
- g_date_clear(&offset_date, 1);
- g_date_set_julian(&offset_date, fspd->offset == 0 ? 7 : fspd->offset);
- recurrenceSet(fspd->recurrence, fspd->interval, PERIOD_DAY, &offset_date, WEEKEND_ADJ_NONE);
+ g_date_clear (&offset_date, 1);
+ g_date_set_julian (&offset_date, fspd->offset == 0 ? 7 : fspd->offset);
+ recurrenceSet (fspd->recurrence, fspd->interval, PERIOD_DAY, &offset_date,
+ WEEKEND_ADJ_NONE);
return TRUE;
}
static
gboolean
-fs_weekly_handler( xmlNodePtr node, gpointer data )
+fs_weekly_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
GDate offset_date;
gboolean successful;
- successful = dom_tree_generic_parse( node,
+ successful = dom_tree_generic_parse (node,
fs_union_dom_handlers,
- fspd );
- if ( !successful )
+ fspd);
+ if (!successful)
return FALSE;
- g_date_clear(&offset_date, 1);
- g_date_set_julian(&offset_date, fspd->offset == 0 ? 7 : fspd->offset);
- recurrenceSet(fspd->recurrence, fspd->interval, PERIOD_WEEK, &offset_date, WEEKEND_ADJ_NONE);
+ g_date_clear (&offset_date, 1);
+ g_date_set_julian (&offset_date, fspd->offset == 0 ? 7 : fspd->offset);
+ recurrenceSet (fspd->recurrence, fspd->interval, PERIOD_WEEK, &offset_date,
+ WEEKEND_ADJ_NONE);
return TRUE;
}
static
gboolean
-fs_monthly_handler( xmlNodePtr node, gpointer data)
+fs_monthly_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
GDate offset_date;
gboolean successful;
- successful = dom_tree_generic_parse( node,
+ successful = dom_tree_generic_parse (node,
fs_union_dom_handlers,
- fspd );
- if ( !successful )
+ fspd);
+ if (!successful)
return FALSE;
- g_date_clear(&offset_date, 1);
- g_date_set_julian(&offset_date, 1);
- g_date_add_months(&offset_date, fspd->offset);
- g_date_set_day(&offset_date, fspd->day);
+ g_date_clear (&offset_date, 1);
+ g_date_set_julian (&offset_date, 1);
+ g_date_add_months (&offset_date, fspd->offset);
+ g_date_set_day (&offset_date, fspd->day);
if (fspd->uift == UIFREQ_ONCE)
{
// hack...
- recurrenceSet(fspd->recurrence, fspd->interval, PERIOD_ONCE, &offset_date, WEEKEND_ADJ_NONE);
+ recurrenceSet (fspd->recurrence, fspd->interval, PERIOD_ONCE, &offset_date,
+ WEEKEND_ADJ_NONE);
}
else
{
- recurrenceSet(fspd->recurrence, fspd->interval,
- PERIOD_MONTH, &offset_date,
- static_cast<WeekendAdjust>(fspd->weekend_adj));
+ recurrenceSet (fspd->recurrence, fspd->interval,
+ PERIOD_MONTH, &offset_date,
+ static_cast<WeekendAdjust> (fspd->weekend_adj));
}
return successful;
@@ -401,28 +406,28 @@ fs_monthly_handler( xmlNodePtr node, gpointer data)
static
gboolean
-fs_month_relative_handler( xmlNodePtr node, gpointer data)
+fs_month_relative_handler (xmlNodePtr node, gpointer data)
{
- g_critical("this was never supported, how is it in the datafile?");
+ g_critical ("this was never supported, how is it in the datafile?");
return FALSE;
}
static
gboolean
-fs_guid_handler( xmlNodePtr node, gpointer data)
+fs_guid_handler (xmlNodePtr node, gpointer data)
{
return TRUE;
}
static
gboolean
-fs_composite_handler( xmlNodePtr node, gpointer data)
+fs_composite_handler (xmlNodePtr node, gpointer data)
{
- fsParseData *fspd = static_cast<decltype(fspd)>(data);
+ fsParseData* fspd = static_cast<decltype (fspd)> (data);
gboolean successful;
- successful = dom_tree_generic_parse( node,
+ successful = dom_tree_generic_parse (node,
fs_union_dom_handlers,
- fspd );
+ fspd);
return successful;
}
@@ -443,75 +448,75 @@ static struct dom_tree_handler fs_dom_handlers[] =
static
gboolean
-gnc_fs_handler( xmlNodePtr node, gpointer d )
+gnc_fs_handler (xmlNodePtr node, gpointer d)
{
- return dom_tree_generic_parse( node, fs_dom_handlers, d );
+ return dom_tree_generic_parse (node, fs_dom_handlers, d);
}
static
gboolean
-gnc_freqSpec_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_freqSpec_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
fsParseData fspd;
gboolean successful = FALSE;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- sixtp_gdv2 *globaldata = (sixtp_gdv2*)global_data;
+ sixtp_gdv2* globaldata = (sixtp_gdv2*)global_data;
- fspd_init( &fspd );
+ fspd_init (&fspd);
fspd.book = globaldata->book;
/* this won't actually get invoked [FreqSpecs aren't top-level
elements]; see dom_tree_to_freqSpec(), below. */
- if ( parent_data )
+ if (parent_data)
return TRUE;
- if ( !tag )
+ if (!tag)
return TRUE;
- g_return_val_if_fail( tree, FALSE );
+ g_return_val_if_fail (tree, FALSE);
- successful = dom_tree_generic_parse( tree, fs_dom_handlers, &fspd );
+ successful = dom_tree_generic_parse (tree, fs_dom_handlers, &fspd);
if (!successful)
{
- xmlElemDump( stdout, NULL, tree );
+ xmlElemDump (stdout, NULL, tree);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return successful;
}
sixtp*
-gnc_freqSpec_sixtp_parser_create(void)
+gnc_freqSpec_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new( gnc_freqSpec_end_handler, NULL, NULL );
+ return sixtp_dom_parser_new (gnc_freqSpec_end_handler, NULL, NULL);
}
static void
-common_parse(fsParseData *fspd, xmlNodePtr node, QofBook *book)
+common_parse (fsParseData* fspd, xmlNodePtr node, QofBook* book)
{
gboolean successful;
fspd->book = book;
- successful = dom_tree_generic_parse( node, fs_dom_handlers, fspd );
+ successful = dom_tree_generic_parse (node, fs_dom_handlers, fspd);
if (!successful)
{
- xmlElemDump(stdout, NULL, node);
+ xmlElemDump (stdout, NULL, node);
}
}
GList*
-dom_tree_freqSpec_to_recurrences(xmlNodePtr node, QofBook *book)
+dom_tree_freqSpec_to_recurrences (xmlNodePtr node, QofBook* book)
{
fsParseData fspd;
- fspd_init( &fspd );
- common_parse(&fspd, node, book);
+ fspd_init (&fspd);
+ common_parse (&fspd, node, book);
if (fspd.recurrence_list == NULL)
{
- fspd.recurrence_list = g_list_append(fspd.recurrence_list, fspd.recurrence);
+ fspd.recurrence_list = g_list_append (fspd.recurrence_list, fspd.recurrence);
}
return fspd.recurrence_list;
}
diff --git a/src/backend/xml/gnc-invoice-xml-v2.cpp b/src/backend/xml/gnc-invoice-xml-v2.cpp
index 447f483..4cf3fbd 100644
--- a/src/backend/xml/gnc-invoice-xml-v2.cpp
+++ b/src/backend/xml/gnc-invoice-xml-v2.cpp
@@ -48,11 +48,11 @@ extern "C"
#include "io-gncxml-gen.h"
#include "io-gncxml-v2.h"
-#define _GNC_MOD_NAME GNC_ID_INVOICE
+#define _GNC_MOD_NAME GNC_ID_INVOICE
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *invoice_version_string = "2.0.0";
+const gchar* invoice_version_string = "2.0.0";
/* ids */
#define gnc_invoice_string "gnc:GncInvoice"
@@ -74,60 +74,60 @@ const gchar *invoice_version_string = "2.0.0";
#define invoice_slots_string "invoice:slots"
static void
-maybe_add_string (xmlNodePtr ptr, const char *tag, const char *str)
+maybe_add_string (xmlNodePtr ptr, const char* tag, const char* str)
{
- if (str && strlen(str) > 0)
+ if (str && strlen (str) > 0)
xmlAddChild (ptr, text_to_dom_tree (tag, str));
}
static void
-maybe_add_timespec (xmlNodePtr ptr, const char *tag, Timespec ts)
+maybe_add_timespec (xmlNodePtr ptr, const char* tag, Timespec ts)
{
if (ts.tv_sec || ts.tv_nsec)
xmlAddChild (ptr, timespec_to_dom_tree (tag, &ts));
}
static xmlNodePtr
-invoice_dom_tree_create (GncInvoice *invoice)
+invoice_dom_tree_create (GncInvoice* invoice)
{
xmlNodePtr ret;
Timespec ts;
- Transaction *txn;
- GNCLot *lot;
- Account *acc;
- GncBillTerm *term;
- GncOwner *billto;
+ Transaction* txn;
+ GNCLot* lot;
+ Account* acc;
+ GncBillTerm* term;
+ GncOwner* billto;
gnc_numeric amt;
- ret = xmlNewNode(NULL, BAD_CAST gnc_invoice_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST invoice_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_invoice_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST invoice_version_string);
- xmlAddChild(ret, guid_to_dom_tree(invoice_guid_string,
- qof_instance_get_guid(QOF_INSTANCE(invoice))));
+ xmlAddChild (ret, guid_to_dom_tree (invoice_guid_string,
+ qof_instance_get_guid (QOF_INSTANCE (invoice))));
- xmlAddChild(ret, text_to_dom_tree(invoice_id_string,
- gncInvoiceGetID (invoice)));
+ xmlAddChild (ret, text_to_dom_tree (invoice_id_string,
+ gncInvoiceGetID (invoice)));
- xmlAddChild(ret, gnc_owner_to_dom_tree (invoice_owner_string,
- gncInvoiceGetOwner (invoice)));
+ xmlAddChild (ret, gnc_owner_to_dom_tree (invoice_owner_string,
+ gncInvoiceGetOwner (invoice)));
ts = gncInvoiceGetDateOpened (invoice);
- xmlAddChild(ret, timespec_to_dom_tree (invoice_opened_string, &ts));
+ xmlAddChild (ret, timespec_to_dom_tree (invoice_opened_string, &ts));
maybe_add_timespec (ret, invoice_posted_string,
gncInvoiceGetDatePosted (invoice));
term = gncInvoiceGetTerms (invoice);
if (term)
- xmlAddChild(ret, guid_to_dom_tree(invoice_terms_string,
- qof_instance_get_guid (QOF_INSTANCE(term))));
+ xmlAddChild (ret, guid_to_dom_tree (invoice_terms_string,
+ qof_instance_get_guid (QOF_INSTANCE (term))));
maybe_add_string (ret, invoice_billing_id_string,
gncInvoiceGetBillingID (invoice));
maybe_add_string (ret, invoice_notes_string, gncInvoiceGetNotes (invoice));
- xmlAddChild(ret, int_to_dom_tree(invoice_active_string,
- gncInvoiceGetActive (invoice)));
+ xmlAddChild (ret, int_to_dom_tree (invoice_active_string,
+ gncInvoiceGetActive (invoice)));
txn = gncInvoiceGetPostedTxn (invoice);
if (txn)
@@ -142,12 +142,12 @@ invoice_dom_tree_create (GncInvoice *invoice)
acc = gncInvoiceGetPostedAcc (invoice);
if (acc)
xmlAddChild (ret, guid_to_dom_tree (invoice_postacc_string,
- qof_instance_get_guid(QOF_INSTANCE(acc))));
+ qof_instance_get_guid (QOF_INSTANCE (acc))));
xmlAddChild
(ret,
- commodity_ref_to_dom_tree(invoice_currency_string,
- gncInvoiceGetCurrency (invoice)));
+ commodity_ref_to_dom_tree (invoice_currency_string,
+ gncInvoiceGetCurrency (invoice)));
billto = gncInvoiceGetBillTo (invoice);
if (billto && billto->owner.undefined != NULL)
@@ -157,9 +157,9 @@ invoice_dom_tree_create (GncInvoice *invoice)
if (! gnc_numeric_zero_p (amt))
xmlAddChild (ret, gnc_numeric_to_dom_tree (invoice_tochargeamt_string, &amt));
- /* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(invoice_slots_string,
- QOF_INSTANCE(invoice)));
+ /* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (invoice_slots_string,
+ QOF_INSTANCE (invoice)));
return ret;
}
@@ -167,42 +167,42 @@ invoice_dom_tree_create (GncInvoice *invoice)
struct invoice_pdata
{
- GncInvoice *invoice;
- QofBook *book;
+ GncInvoice* invoice;
+ QofBook* book;
};
static inline gboolean
-set_string(xmlNodePtr node, GncInvoice* invoice,
- void (*func)(GncInvoice *invoice, const char *txt))
+set_string (xmlNodePtr node, GncInvoice* invoice,
+ void (*func) (GncInvoice* invoice, const char* txt))
{
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(invoice, txt);
+ func (invoice, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
static inline gboolean
-set_timespec(xmlNodePtr node, GncInvoice* invoice,
- void (*func)(GncInvoice *invoice, Timespec ts))
+set_timespec (xmlNodePtr node, GncInvoice* invoice,
+ void (*func) (GncInvoice* invoice, Timespec ts))
{
- Timespec ts = dom_tree_to_timespec(node);
- if (!dom_tree_valid_timespec(&ts, node->name)) return FALSE;
+ Timespec ts = dom_tree_to_timespec (node);
+ if (!dom_tree_valid_timespec (&ts, node->name)) return FALSE;
- func(invoice, ts);
+ func (invoice, ts);
return TRUE;
}
static gboolean
invoice_guid_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
- GncGUID *guid;
- GncInvoice *invoice;
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
+ GncGUID* guid;
+ GncInvoice* invoice;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
invoice = gncInvoiceLookup (pdata->book, guid);
if (invoice)
@@ -213,10 +213,10 @@ invoice_guid_handler (xmlNodePtr node, gpointer invoice_pdata)
}
else
{
- gncInvoiceSetGUID(pdata->invoice, guid);
+ gncInvoiceSetGUID (pdata->invoice, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -224,15 +224,15 @@ invoice_guid_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_id_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
- return set_string(node, pdata->invoice, gncInvoiceSetID);
+ return set_string (node, pdata->invoice, gncInvoiceSetID);
}
static gboolean
invoice_owner_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
GncOwner owner;
gboolean ret;
@@ -246,7 +246,7 @@ invoice_owner_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_opened_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
return set_timespec (node, pdata->invoice, gncInvoiceSetDateOpened);
}
@@ -254,7 +254,7 @@ invoice_opened_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_posted_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
return set_timespec (node, pdata->invoice, gncInvoiceSetDatePosted);
}
@@ -262,29 +262,29 @@ invoice_posted_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_billing_id_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
- return set_string(node, pdata->invoice, gncInvoiceSetBillingID);
+ return set_string (node, pdata->invoice, gncInvoiceSetBillingID);
}
static gboolean
invoice_notes_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
- return set_string(node, pdata->invoice, gncInvoiceSetNotes);
+ return set_string (node, pdata->invoice, gncInvoiceSetNotes);
}
static gboolean
invoice_active_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
gint64 val;
gboolean ret;
- ret = dom_tree_to_integer(node, &val);
+ ret = dom_tree_to_integer (node, &val);
if (ret)
- gncInvoiceSetActive(pdata->invoice, (gboolean)val);
+ gncInvoiceSetActive (pdata->invoice, (gboolean)val);
return ret;
}
@@ -292,14 +292,14 @@ invoice_active_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_terms_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
- GncGUID *guid;
- GncBillTerm *term;
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
+ GncGUID* guid;
+ GncBillTerm* term;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
- term = gnc_billterm_xml_find_or_create(pdata->book, guid);
- g_assert(term);
+ term = gnc_billterm_xml_find_or_create (pdata->book, guid);
+ g_assert (term);
g_free (guid);
gncInvoiceSetTerms (pdata->invoice, term);
@@ -309,11 +309,11 @@ invoice_terms_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_posttxn_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
- GncGUID *guid;
- Transaction *txn;
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
+ GncGUID* guid;
+ Transaction* txn;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
txn = xaccTransLookup (guid, pdata->book);
g_free (guid);
@@ -326,11 +326,11 @@ invoice_posttxn_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_postlot_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
- GncGUID *guid;
- GNCLot *lot;
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
+ GncGUID* guid;
+ GNCLot* lot;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
lot = gnc_lot_lookup (guid, pdata->book);
g_free (guid);
@@ -343,11 +343,11 @@ invoice_postlot_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_postacc_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
- GncGUID *guid;
- Account *acc;
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
+ GncGUID* guid;
+ Account* acc;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
acc = xaccAccountLookup (guid, pdata->book);
g_free (guid);
@@ -360,10 +360,10 @@ invoice_postacc_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_currency_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
- gnc_commodity *com;
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
+ gnc_commodity* com;
- com = dom_tree_to_commodity_ref(node, pdata->book);
+ com = dom_tree_to_commodity_ref (node, pdata->book);
g_return_val_if_fail (com, FALSE);
gncInvoiceSetCurrency (pdata->invoice, com);
@@ -374,7 +374,7 @@ invoice_currency_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_billto_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
GncOwner owner;
gboolean ret;
@@ -388,19 +388,19 @@ invoice_billto_handler (xmlNodePtr node, gpointer invoice_pdata)
static gboolean
invoice_tochargeamt_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
- gnc_numeric* num = dom_tree_to_gnc_numeric(node);
- g_return_val_if_fail(num, FALSE);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
+ gnc_numeric* num = dom_tree_to_gnc_numeric (node);
+ g_return_val_if_fail (num, FALSE);
gncInvoiceSetToChargeAmount (pdata->invoice, *num);
- g_free(num);
+ g_free (num);
return TRUE;
}
static gboolean
invoice_slots_handler (xmlNodePtr node, gpointer invoice_pdata)
{
- struct invoice_pdata *pdata = static_cast<decltype(pdata)>(invoice_pdata);
+ struct invoice_pdata* pdata = static_cast<decltype (pdata)> (invoice_pdata);
return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->invoice));
}
@@ -427,12 +427,12 @@ static struct dom_tree_handler invoice_handlers_v2[] =
};
static GncInvoice*
-dom_tree_to_invoice (xmlNodePtr node, QofBook *book)
+dom_tree_to_invoice (xmlNodePtr node, QofBook* book)
{
struct invoice_pdata invoice_pdata;
gboolean successful;
- invoice_pdata.invoice = gncInvoiceCreate(book);
+ invoice_pdata.invoice = gncInvoiceCreate (book);
invoice_pdata.book = book;
gncInvoiceBeginEdit (invoice_pdata.invoice);
@@ -452,15 +452,15 @@ dom_tree_to_invoice (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_invoice_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_invoice_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncInvoice *invoice;
+ GncInvoice* invoice;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
{
@@ -474,29 +474,29 @@ gnc_invoice_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- invoice = dom_tree_to_invoice(tree, book);
+ invoice = dom_tree_to_invoice (tree, book);
if (invoice != NULL)
{
- gdata->cb(tag, gdata->parsedata, invoice);
+ gdata->cb (tag, gdata->parsedata, invoice);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return invoice != NULL;
}
-static sixtp *
-invoice_sixtp_parser_create(void)
+static sixtp*
+invoice_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_invoice_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_invoice_end_handler, NULL, NULL);
}
static gboolean
-invoice_should_be_saved (GncInvoice *invoice)
+invoice_should_be_saved (GncInvoice* invoice)
{
- const char *id;
+ const char* id;
/* make sure this is a valid invoice before we save it -- should have an ID */
id = gncInvoiceGetID (invoice);
@@ -507,15 +507,15 @@ invoice_should_be_saved (GncInvoice *invoice)
}
static void
-do_count (QofInstance * invoice_p, gpointer count_p)
+do_count (QofInstance* invoice_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
- if (invoice_should_be_saved ((GncInvoice *)invoice_p))
+ int* count = static_cast<decltype (count)> (count_p);
+ if (invoice_should_be_saved ((GncInvoice*)invoice_p))
(*count)++;
}
static int
-invoice_get_count (QofBook *book)
+invoice_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -523,36 +523,37 @@ invoice_get_count (QofBook *book)
}
static void
-xml_add_invoice (QofInstance * invoice_p, gpointer out_p)
+xml_add_invoice (QofInstance* invoice_p, gpointer out_p)
{
xmlNodePtr node;
- GncInvoice *invoice = (GncInvoice *) invoice_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncInvoice* invoice = (GncInvoice*) invoice_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
if (!invoice_should_be_saved (invoice))
return;
node = invoice_dom_tree_create (invoice);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-invoice_write (FILE *out, QofBook *book)
+invoice_write (FILE* out, QofBook* book)
{
- qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_invoice, (gpointer) out);
- return ferror(out) == 0;
+ qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_invoice,
+ (gpointer) out);
+ return ferror (out) == 0;
}
static gboolean
-invoice_ns(FILE *out)
+invoice_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "invoice");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "invoice");
}
void
@@ -563,10 +564,10 @@ gnc_invoice_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_invoice_string,
invoice_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
invoice_get_count,
invoice_write,
- NULL, /* scrub */
+ NULL, /* scrub */
invoice_ns,
};
diff --git a/src/backend/xml/gnc-job-xml-v2.cpp b/src/backend/xml/gnc-job-xml-v2.cpp
index ebac13b..9239376 100644
--- a/src/backend/xml/gnc-job-xml-v2.cpp
+++ b/src/backend/xml/gnc-job-xml-v2.cpp
@@ -47,11 +47,11 @@ extern "C"
#include "gnc-owner-xml-v2.h"
#include "xml-helpers.h"
-#define _GNC_MOD_NAME GNC_ID_JOB
+#define _GNC_MOD_NAME GNC_ID_JOB
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *job_version_string = "2.0.0";
+const gchar* job_version_string = "2.0.0";
/* ids */
#define gnc_job_string "gnc:GncJob"
@@ -64,33 +64,33 @@ const gchar *job_version_string = "2.0.0";
#define job_slots_string "job:slots"
static xmlNodePtr
-job_dom_tree_create (GncJob *job)
+job_dom_tree_create (GncJob* job)
{
xmlNodePtr ret;
- ret = xmlNewNode(NULL, BAD_CAST gnc_job_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST job_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_job_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST job_version_string);
- xmlAddChild(ret, guid_to_dom_tree(job_guid_string,
- qof_instance_get_guid (QOF_INSTANCE (job))));
+ xmlAddChild (ret, guid_to_dom_tree (job_guid_string,
+ qof_instance_get_guid (QOF_INSTANCE (job))));
- xmlAddChild(ret, text_to_dom_tree(job_id_string,
- gncJobGetID (job)));
+ xmlAddChild (ret, text_to_dom_tree (job_id_string,
+ gncJobGetID (job)));
- xmlAddChild(ret, text_to_dom_tree(job_name_string,
- gncJobGetName (job)));
+ xmlAddChild (ret, text_to_dom_tree (job_name_string,
+ gncJobGetName (job)));
maybe_add_string (ret, job_reference_string, gncJobGetReference (job));
- xmlAddChild(ret, gnc_owner_to_dom_tree (job_owner_string,
- gncJobGetOwner (job)));
+ xmlAddChild (ret, gnc_owner_to_dom_tree (job_owner_string,
+ gncJobGetOwner (job)));
- xmlAddChild(ret, int_to_dom_tree(job_active_string,
- gncJobGetActive (job)));
+ xmlAddChild (ret, int_to_dom_tree (job_active_string,
+ gncJobGetActive (job)));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(job_slots_string,
- QOF_INSTANCE(job)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (job_slots_string,
+ QOF_INSTANCE (job)));
return ret;
}
@@ -99,20 +99,20 @@ job_dom_tree_create (GncJob *job)
struct job_pdata
{
- GncJob *job;
- QofBook *book;
+ GncJob* job;
+ QofBook* book;
};
static gboolean
-set_string(xmlNodePtr node, GncJob* job,
- void (*func)(GncJob *job, const char *txt))
+set_string (xmlNodePtr node, GncJob* job,
+ void (*func) (GncJob* job, const char* txt))
{
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(job, txt);
+ func (job, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
@@ -120,20 +120,20 @@ set_string(xmlNodePtr node, GncJob* job,
static gboolean
job_name_handler (xmlNodePtr node, gpointer job_pdata)
{
- struct job_pdata *pdata = static_cast<decltype(pdata)>(job_pdata);
+ struct job_pdata* pdata = static_cast<decltype (pdata)> (job_pdata);
- return set_string(node, pdata->job, gncJobSetName);
+ return set_string (node, pdata->job, gncJobSetName);
}
static gboolean
job_guid_handler (xmlNodePtr node, gpointer job_pdata)
{
- struct job_pdata *pdata = static_cast<decltype(pdata)>(job_pdata);
- GncGUID *guid;
- GncJob *job;
+ struct job_pdata* pdata = static_cast<decltype (pdata)> (job_pdata);
+ GncGUID* guid;
+ GncJob* job;
- guid = dom_tree_to_guid(node);
- g_return_val_if_fail(guid, FALSE);
+ guid = dom_tree_to_guid (node);
+ g_return_val_if_fail (guid, FALSE);
job = gncJobLookup (pdata->book, guid);
if (job)
{
@@ -143,10 +143,10 @@ job_guid_handler (xmlNodePtr node, gpointer job_pdata)
}
else
{
- gncJobSetGUID(pdata->job, guid);
+ gncJobSetGUID (pdata->job, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -154,23 +154,23 @@ job_guid_handler (xmlNodePtr node, gpointer job_pdata)
static gboolean
job_id_handler (xmlNodePtr node, gpointer job_pdata)
{
- struct job_pdata *pdata = static_cast<decltype(pdata)>(job_pdata);
+ struct job_pdata* pdata = static_cast<decltype (pdata)> (job_pdata);
- return set_string(node, pdata->job, gncJobSetID);
+ return set_string (node, pdata->job, gncJobSetID);
}
static gboolean
job_reference_handler (xmlNodePtr node, gpointer job_pdata)
{
- struct job_pdata *pdata = static_cast<decltype(pdata)>(job_pdata);
+ struct job_pdata* pdata = static_cast<decltype (pdata)> (job_pdata);
- return set_string(node, pdata->job, gncJobSetReference);
+ return set_string (node, pdata->job, gncJobSetReference);
}
static gboolean
job_owner_handler (xmlNodePtr node, gpointer job_pdata)
{
- struct job_pdata *pdata = static_cast<decltype(pdata)>(job_pdata);
+ struct job_pdata* pdata = static_cast<decltype (pdata)> (job_pdata);
GncOwner owner;
gboolean ret;
@@ -184,13 +184,13 @@ job_owner_handler (xmlNodePtr node, gpointer job_pdata)
static gboolean
job_active_handler (xmlNodePtr node, gpointer job_pdata)
{
- struct job_pdata *pdata = static_cast<decltype(pdata)>(job_pdata);
+ struct job_pdata* pdata = static_cast<decltype (pdata)> (job_pdata);
gint64 val;
gboolean ret;
- ret = dom_tree_to_integer(node, &val);
+ ret = dom_tree_to_integer (node, &val);
if (ret)
- gncJobSetActive(pdata->job, (gboolean)val);
+ gncJobSetActive (pdata->job, (gboolean)val);
return ret;
}
@@ -198,7 +198,7 @@ job_active_handler (xmlNodePtr node, gpointer job_pdata)
static gboolean
job_slots_handler (xmlNodePtr node, gpointer job_pdata)
{
- struct job_pdata *pdata = static_cast<decltype(pdata)>(job_pdata);
+ struct job_pdata* pdata = static_cast<decltype (pdata)> (job_pdata);
return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->job));
}
@@ -216,12 +216,12 @@ static struct dom_tree_handler job_handlers_v2[] =
};
static GncJob*
-dom_tree_to_job (xmlNodePtr node, QofBook *book)
+dom_tree_to_job (xmlNodePtr node, QofBook* book)
{
struct job_pdata job_pdata;
gboolean successful;
- job_pdata.job = gncJobCreate(book);
+ job_pdata.job = gncJobCreate (book);
job_pdata.book = book;
gncJobBeginEdit (job_pdata.job);
@@ -241,15 +241,15 @@ dom_tree_to_job (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_job_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_job_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncJob *job;
+ GncJob* job;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
{
@@ -263,29 +263,29 @@ gnc_job_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- job = dom_tree_to_job(tree, book);
+ job = dom_tree_to_job (tree, book);
if (job != NULL)
{
- gdata->cb(tag, gdata->parsedata, job);
+ gdata->cb (tag, gdata->parsedata, job);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return job != NULL;
}
-static sixtp *
-job_sixtp_parser_create(void)
+static sixtp*
+job_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_job_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_job_end_handler, NULL, NULL);
}
static gboolean
-job_should_be_saved (GncJob *job)
+job_should_be_saved (GncJob* job)
{
- const char *id;
+ const char* id;
/* make sure this is a valid job before we save it -- should have an ID */
id = gncJobGetID (job);
@@ -296,15 +296,15 @@ job_should_be_saved (GncJob *job)
}
static void
-do_count (QofInstance * job_p, gpointer count_p)
+do_count (QofInstance* job_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
- if (job_should_be_saved ((GncJob *)job_p))
+ int* count = static_cast<decltype (count)> (count_p);
+ if (job_should_be_saved ((GncJob*)job_p))
(*count)++;
}
static int
-job_get_count (QofBook *book)
+job_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -312,36 +312,36 @@ job_get_count (QofBook *book)
}
static void
-xml_add_job (QofInstance * job_p, gpointer out_p)
+xml_add_job (QofInstance* job_p, gpointer out_p)
{
xmlNodePtr node;
- GncJob *job = (GncJob *) job_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncJob* job = (GncJob*) job_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
if (!job_should_be_saved (job))
return;
node = job_dom_tree_create (job);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-job_write (FILE *out, QofBook *book)
+job_write (FILE* out, QofBook* book)
{
qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_job, (gpointer) out);
- return ferror(out) == 0;
+ return ferror (out) == 0;
}
static gboolean
-job_ns(FILE *out)
+job_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "job");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "job");
}
void
@@ -352,10 +352,10 @@ gnc_job_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_job_string,
job_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
job_get_count,
job_write,
- NULL, /* scrub */
+ NULL, /* scrub */
job_ns,
};
diff --git a/src/backend/xml/gnc-lot-xml-v2.cpp b/src/backend/xml/gnc-lot-xml-v2.cpp
index a4a45e4..696a466 100644
--- a/src/backend/xml/gnc-lot-xml-v2.cpp
+++ b/src/backend/xml/gnc-lot-xml-v2.cpp
@@ -48,7 +48,7 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *lot_version_string = "2.0.0";
+const gchar* lot_version_string = "2.0.0";
/* ids */
#define gnc_lot_string "gnc:lot"
@@ -56,20 +56,20 @@ const gchar *lot_version_string = "2.0.0";
#define lot_slots_string "lot:slots"
xmlNodePtr
-gnc_lot_dom_tree_create(GNCLot *lot)
+gnc_lot_dom_tree_create (GNCLot* lot)
{
xmlNodePtr ret;
- ENTER("(lot=%p)", lot);
- ret = xmlNewNode(NULL, BAD_CAST gnc_lot_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST lot_version_string);
+ ENTER ("(lot=%p)", lot);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_lot_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST lot_version_string);
- xmlAddChild(ret, guid_to_dom_tree(lot_id_string, gnc_lot_get_guid(lot)));
+ xmlAddChild (ret, guid_to_dom_tree (lot_id_string, gnc_lot_get_guid (lot)));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(lot_slots_string,
- QOF_INSTANCE(lot)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (lot_slots_string,
+ QOF_INSTANCE (lot)));
- LEAVE("");
+ LEAVE ("");
return ret;
}
@@ -77,37 +77,37 @@ gnc_lot_dom_tree_create(GNCLot *lot)
struct lot_pdata
{
- GNCLot *lot;
- QofBook *book;
+ GNCLot* lot;
+ QofBook* book;
};
static gboolean
lot_id_handler (xmlNodePtr node, gpointer p)
{
- struct lot_pdata *pdata = static_cast<decltype(pdata)>(p);
- GncGUID *guid;
+ struct lot_pdata* pdata = static_cast<decltype (pdata)> (p);
+ GncGUID* guid;
- ENTER("(lot=%p)", pdata->lot);
- guid = dom_tree_to_guid(node);
- gnc_lot_set_guid(pdata->lot, *guid);
+ ENTER ("(lot=%p)", pdata->lot);
+ guid = dom_tree_to_guid (node);
+ gnc_lot_set_guid (pdata->lot, *guid);
- g_free(guid);
+ g_free (guid);
- LEAVE("");
+ LEAVE ("");
return TRUE;
}
static gboolean
lot_slots_handler (xmlNodePtr node, gpointer p)
{
- struct lot_pdata *pdata = static_cast<decltype(pdata)>(p);
+ struct lot_pdata* pdata = static_cast<decltype (pdata)> (p);
gboolean success;
- ENTER("(lot=%p)", pdata->lot);
- success = dom_tree_create_instance_slots(node, QOF_INSTANCE (pdata->lot));
+ ENTER ("(lot=%p)", pdata->lot);
+ success = dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->lot));
- LEAVE("");
- g_return_val_if_fail(success, FALSE);
+ LEAVE ("");
+ g_return_val_if_fail (success, FALSE);
return TRUE;
}
@@ -120,15 +120,15 @@ static struct dom_tree_handler lot_handlers_v2[] =
};
static gboolean
-gnc_lot_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_lot_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GNCLot *lot;
+ GNCLot* lot;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
{
@@ -142,30 +142,30 @@ gnc_lot_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- lot = dom_tree_to_lot(tree, book);
- ENTER("(lot=%p)", lot);
+ lot = dom_tree_to_lot (tree, book);
+ ENTER ("(lot=%p)", lot);
if (lot != NULL)
{
- gdata->cb(tag, gdata->parsedata, lot);
+ gdata->cb (tag, gdata->parsedata, lot);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
- LEAVE("");
+ LEAVE ("");
return lot != NULL;
}
GNCLot*
-dom_tree_to_lot (xmlNodePtr node, QofBook *book)
+dom_tree_to_lot (xmlNodePtr node, QofBook* book)
{
struct lot_pdata pdata;
- GNCLot *lot;
+ GNCLot* lot;
gboolean successful;
- lot = gnc_lot_new(book);
- ENTER("(lot=%p)", lot);
+ lot = gnc_lot_new (book);
+ ENTER ("(lot=%p)", lot);
pdata.lot = lot;
pdata.book = book;
@@ -179,14 +179,14 @@ dom_tree_to_lot (xmlNodePtr node, QofBook *book)
lot = NULL;
}
- LEAVE("");
+ LEAVE ("");
return lot;
}
sixtp*
-gnc_lot_sixtp_parser_create(void)
+gnc_lot_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_lot_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_lot_end_handler, NULL, NULL);
}
/* ================== END OF FILE ========================== */
diff --git a/src/backend/xml/gnc-order-xml-v2.cpp b/src/backend/xml/gnc-order-xml-v2.cpp
index 7b26d79..12512c7 100644
--- a/src/backend/xml/gnc-order-xml-v2.cpp
+++ b/src/backend/xml/gnc-order-xml-v2.cpp
@@ -50,7 +50,7 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *order_version_string = "2.0.0";
+const gchar* order_version_string = "2.0.0";
/* ids */
#define gnc_order_string "gnc:GncOrder"
@@ -65,46 +65,46 @@ const gchar *order_version_string = "2.0.0";
#define order_slots_string "order:slots"
static void
-maybe_add_string (xmlNodePtr ptr, const char *tag, const char *str)
+maybe_add_string (xmlNodePtr ptr, const char* tag, const char* str)
{
- if (str && strlen(str) > 0)
+ if (str && strlen (str) > 0)
xmlAddChild (ptr, text_to_dom_tree (tag, str));
}
static xmlNodePtr
-order_dom_tree_create (GncOrder *order)
+order_dom_tree_create (GncOrder* order)
{
xmlNodePtr ret;
Timespec ts;
- ret = xmlNewNode(NULL, BAD_CAST gnc_order_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST order_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_order_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST order_version_string);
- xmlAddChild(ret, guid_to_dom_tree(order_guid_string,
- qof_instance_get_guid(QOF_INSTANCE (order))));
+ xmlAddChild (ret, guid_to_dom_tree (order_guid_string,
+ qof_instance_get_guid (QOF_INSTANCE (order))));
- xmlAddChild(ret, text_to_dom_tree(order_id_string,
- gncOrderGetID (order)));
+ xmlAddChild (ret, text_to_dom_tree (order_id_string,
+ gncOrderGetID (order)));
- xmlAddChild(ret, gnc_owner_to_dom_tree (order_owner_string,
- gncOrderGetOwner (order)));
+ xmlAddChild (ret, gnc_owner_to_dom_tree (order_owner_string,
+ gncOrderGetOwner (order)));
ts = gncOrderGetDateOpened (order);
- xmlAddChild(ret, timespec_to_dom_tree (order_opened_string, &ts));
+ xmlAddChild (ret, timespec_to_dom_tree (order_opened_string, &ts));
ts = gncOrderGetDateClosed (order);
if (ts.tv_sec || ts.tv_nsec)
- xmlAddChild(ret, timespec_to_dom_tree (order_closed_string, &ts));
+ xmlAddChild (ret, timespec_to_dom_tree (order_closed_string, &ts));
maybe_add_string (ret, order_notes_string, gncOrderGetNotes (order));
maybe_add_string (ret, order_reference_string, gncOrderGetReference (order));
- xmlAddChild(ret, int_to_dom_tree(order_active_string,
- gncOrderGetActive (order)));
+ xmlAddChild (ret, int_to_dom_tree (order_active_string,
+ gncOrderGetActive (order)));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(order_slots_string,
- QOF_INSTANCE(order)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (order_slots_string,
+ QOF_INSTANCE (order)));
return ret;
}
@@ -113,42 +113,42 @@ order_dom_tree_create (GncOrder *order)
struct order_pdata
{
- GncOrder *order;
- QofBook *book;
+ GncOrder* order;
+ QofBook* book;
};
static inline gboolean
-set_string(xmlNodePtr node, GncOrder* order,
- void (*func)(GncOrder *order, const char *txt))
+set_string (xmlNodePtr node, GncOrder* order,
+ void (*func) (GncOrder* order, const char* txt))
{
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(order, txt);
+ func (order, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
static inline gboolean
-set_timespec(xmlNodePtr node, GncOrder* order,
- void (*func)(GncOrder *order, Timespec ts))
+set_timespec (xmlNodePtr node, GncOrder* order,
+ void (*func) (GncOrder* order, Timespec ts))
{
- Timespec ts = dom_tree_to_timespec(node);
- if (!dom_tree_valid_timespec(&ts, node->name)) return FALSE;
+ Timespec ts = dom_tree_to_timespec (node);
+ if (!dom_tree_valid_timespec (&ts, node->name)) return FALSE;
- func(order, ts);
+ func (order, ts);
return TRUE;
}
static gboolean
order_guid_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
- GncGUID *guid;
- GncOrder *order;
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
+ GncGUID* guid;
+ GncOrder* order;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
order = gncOrderLookup (pdata->book, guid);
if (order)
@@ -159,10 +159,10 @@ order_guid_handler (xmlNodePtr node, gpointer order_pdata)
}
else
{
- gncOrderSetGUID(pdata->order, guid);
+ gncOrderSetGUID (pdata->order, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -170,15 +170,15 @@ order_guid_handler (xmlNodePtr node, gpointer order_pdata)
static gboolean
order_id_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
- return set_string(node, pdata->order, gncOrderSetID);
+ return set_string (node, pdata->order, gncOrderSetID);
}
static gboolean
order_owner_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
GncOwner owner;
gboolean ret;
@@ -192,7 +192,7 @@ order_owner_handler (xmlNodePtr node, gpointer order_pdata)
static gboolean
order_opened_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
return set_timespec (node, pdata->order, gncOrderSetDateOpened);
}
@@ -200,7 +200,7 @@ order_opened_handler (xmlNodePtr node, gpointer order_pdata)
static gboolean
order_closed_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
return set_timespec (node, pdata->order, gncOrderSetDateClosed);
}
@@ -208,29 +208,29 @@ order_closed_handler (xmlNodePtr node, gpointer order_pdata)
static gboolean
order_notes_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
- return set_string(node, pdata->order, gncOrderSetNotes);
+ return set_string (node, pdata->order, gncOrderSetNotes);
}
static gboolean
order_reference_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
- return set_string(node, pdata->order, gncOrderSetReference);
+ return set_string (node, pdata->order, gncOrderSetReference);
}
static gboolean
order_active_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
gint64 val;
gboolean ret;
- ret = dom_tree_to_integer(node, &val);
+ ret = dom_tree_to_integer (node, &val);
if (ret)
- gncOrderSetActive(pdata->order, (gboolean)val);
+ gncOrderSetActive (pdata->order, (gboolean)val);
return ret;
}
@@ -238,9 +238,9 @@ order_active_handler (xmlNodePtr node, gpointer order_pdata)
static gboolean
order_slots_handler (xmlNodePtr node, gpointer order_pdata)
{
- struct order_pdata *pdata = static_cast<decltype(pdata)>(order_pdata);
+ struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
- return dom_tree_create_instance_slots(node, QOF_INSTANCE (pdata->order));
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->order));
}
static struct dom_tree_handler order_handlers_v2[] =
@@ -258,12 +258,12 @@ static struct dom_tree_handler order_handlers_v2[] =
};
static GncOrder*
-dom_tree_to_order (xmlNodePtr node, QofBook *book)
+dom_tree_to_order (xmlNodePtr node, QofBook* book)
{
struct order_pdata order_pdata;
gboolean successful;
- order_pdata.order = gncOrderCreate(book);
+ order_pdata.order = gncOrderCreate (book);
order_pdata.book = book;
gncOrderBeginEdit (order_pdata.order);
@@ -283,15 +283,15 @@ dom_tree_to_order (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_order_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_order_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncOrder *order;
+ GncOrder* order;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
{
@@ -305,29 +305,29 @@ gnc_order_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- order = dom_tree_to_order(tree, book);
+ order = dom_tree_to_order (tree, book);
if (order != NULL)
{
- gdata->cb(tag, gdata->parsedata, order);
+ gdata->cb (tag, gdata->parsedata, order);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return order != NULL;
}
-static sixtp *
-order_sixtp_parser_create(void)
+static sixtp*
+order_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_order_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_order_end_handler, NULL, NULL);
}
static gboolean
-order_should_be_saved (GncOrder *order)
+order_should_be_saved (GncOrder* order)
{
- const char *id;
+ const char* id;
/* make sure this is a valid order before we save it -- should have an ID */
id = gncOrderGetID (order);
@@ -338,15 +338,15 @@ order_should_be_saved (GncOrder *order)
}
static void
-do_count (QofInstance * order_p, gpointer count_p)
+do_count (QofInstance* order_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
- if (order_should_be_saved ((GncOrder *) order_p))
+ int* count = static_cast<decltype (count)> (count_p);
+ if (order_should_be_saved ((GncOrder*) order_p))
(*count)++;
}
static int
-order_get_count (QofBook *book)
+order_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -354,36 +354,36 @@ order_get_count (QofBook *book)
}
static void
-xml_add_order (QofInstance * order_p, gpointer out_p)
+xml_add_order (QofInstance* order_p, gpointer out_p)
{
xmlNodePtr node;
- GncOrder *order = (GncOrder *) order_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncOrder* order = (GncOrder*) order_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
if (!order_should_be_saved (order))
return;
node = order_dom_tree_create (order);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-order_write (FILE *out, QofBook *book)
+order_write (FILE* out, QofBook* book)
{
qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_order, (gpointer) out);
- return ferror(out) == 0;
+ return ferror (out) == 0;
}
static gboolean
-order_ns(FILE *out)
+order_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "order");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "order");
}
void
@@ -394,10 +394,10 @@ gnc_order_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_order_string,
order_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
order_get_count,
order_write,
- NULL, /* scrub */
+ NULL, /* scrub */
order_ns,
};
diff --git a/src/backend/xml/gnc-owner-xml-v2.cpp b/src/backend/xml/gnc-owner-xml-v2.cpp
index 5cfd0f0..b17923a 100644
--- a/src/backend/xml/gnc-owner-xml-v2.cpp
+++ b/src/backend/xml/gnc-owner-xml-v2.cpp
@@ -50,17 +50,17 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *owner_version_string = "2.0.0";
+const gchar* owner_version_string = "2.0.0";
/* ids */
-#define owner_type_string "owner:type"
-#define owner_id_string "owner:id"
+#define owner_type_string "owner:type"
+#define owner_id_string "owner:id"
xmlNodePtr
-gnc_owner_to_dom_tree (const char *tag, const GncOwner *owner)
+gnc_owner_to_dom_tree (const char* tag, const GncOwner* owner)
{
xmlNodePtr ret;
- const char *type_str;
+ const char* type_str;
switch (gncOwnerGetType (owner))
{
@@ -81,8 +81,8 @@ gnc_owner_to_dom_tree (const char *tag, const GncOwner *owner)
return NULL;
}
- ret = xmlNewNode(NULL, BAD_CAST tag);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST owner_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST tag);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST owner_version_string);
xmlAddChild (ret, text_to_dom_tree (owner_type_string, type_str));
xmlAddChild (ret, guid_to_dom_tree (owner_id_string,
@@ -95,16 +95,16 @@ gnc_owner_to_dom_tree (const char *tag, const GncOwner *owner)
struct owner_pdata
{
- GncOwner *owner;
- QofBook *book;
+ GncOwner* owner;
+ QofBook* book;
};
static gboolean
owner_type_handler (xmlNodePtr node, gpointer owner_pdata)
{
- struct owner_pdata *pdata = static_cast<decltype(pdata)>(owner_pdata);
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ struct owner_pdata* pdata = static_cast<decltype (pdata)> (owner_pdata);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
if (!g_strcmp0 (txt, GNC_ID_CUSTOMER))
gncOwnerInitCustomer (pdata->owner, NULL);
@@ -117,28 +117,28 @@ owner_type_handler (xmlNodePtr node, gpointer owner_pdata)
else
{
PWARN ("Unknown owner type: %s", txt);
- g_free(txt);
+ g_free (txt);
return FALSE;
}
- g_free(txt);
+ g_free (txt);
return TRUE;
}
static gboolean
owner_id_handler (xmlNodePtr node, gpointer owner_pdata)
{
- struct owner_pdata *pdata = static_cast<decltype(pdata)>(owner_pdata);
- GncGUID *guid;
+ struct owner_pdata* pdata = static_cast<decltype (pdata)> (owner_pdata);
+ GncGUID* guid;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
switch (gncOwnerGetType (pdata->owner))
{
case GNC_OWNER_CUSTOMER:
{
- GncCustomer *cust = gncCustomerLookup (pdata->book, guid);
+ GncCustomer* cust = gncCustomerLookup (pdata->book, guid);
if (!cust)
{
cust = gncCustomerCreate (pdata->book);
@@ -149,7 +149,7 @@ owner_id_handler (xmlNodePtr node, gpointer owner_pdata)
}
case GNC_OWNER_JOB:
{
- GncJob *job = gncJobLookup (pdata->book, guid);
+ GncJob* job = gncJobLookup (pdata->book, guid);
if (!job)
{
job = gncJobCreate (pdata->book);
@@ -160,7 +160,7 @@ owner_id_handler (xmlNodePtr node, gpointer owner_pdata)
}
case GNC_OWNER_VENDOR:
{
- GncVendor *vendor = gncVendorLookup (pdata->book, guid);
+ GncVendor* vendor = gncVendorLookup (pdata->book, guid);
if (!vendor)
{
vendor = gncVendorCreate (pdata->book);
@@ -171,7 +171,7 @@ owner_id_handler (xmlNodePtr node, gpointer owner_pdata)
}
case GNC_OWNER_EMPLOYEE:
{
- GncEmployee *employee = gncEmployeeLookup (pdata->book, guid);
+ GncEmployee* employee = gncEmployeeLookup (pdata->book, guid);
if (!employee)
{
employee = gncEmployeeCreate (pdata->book);
@@ -198,7 +198,7 @@ static struct dom_tree_handler owner_handlers_v2[] =
};
gboolean
-gnc_dom_tree_to_owner (xmlNodePtr node, GncOwner *owner, QofBook *book)
+gnc_dom_tree_to_owner (xmlNodePtr node, GncOwner* owner, QofBook* book)
{
struct owner_pdata owner_pdata;
gboolean successful;
@@ -218,10 +218,10 @@ gnc_dom_tree_to_owner (xmlNodePtr node, GncOwner *owner, QofBook *book)
}
static gboolean
-owner_ns(FILE *out)
+owner_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "owner");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "owner");
}
void
@@ -231,11 +231,11 @@ gnc_owner_xml_initialize (void)
{
GNC_FILE_BACKEND_VERS,
"gnc:Owner",
- NULL, /* parser_create */
- NULL, /* add_item */
- NULL, /* get_count */
- NULL, /* write */
- NULL, /* scrub */
+ NULL, /* parser_create */
+ NULL, /* add_item */
+ NULL, /* get_count */
+ NULL, /* write */
+ NULL, /* scrub */
owner_ns,
};
diff --git a/src/backend/xml/gnc-owner-xml-v2.h b/src/backend/xml/gnc-owner-xml-v2.h
index c90d7cc..1b956a2 100644
--- a/src/backend/xml/gnc-owner-xml-v2.h
+++ b/src/backend/xml/gnc-owner-xml-v2.h
@@ -27,9 +27,9 @@ extern "C"
#include "gncOwner.h"
#include "qof.h"
}
-gboolean gnc_dom_tree_to_owner (xmlNodePtr node, GncOwner *owner,
- QofBook *book);
-xmlNodePtr gnc_owner_to_dom_tree (const char *tag, const GncOwner *addr);
+gboolean gnc_dom_tree_to_owner (xmlNodePtr node, GncOwner* owner,
+ QofBook* book);
+xmlNodePtr gnc_owner_to_dom_tree (const char* tag, const GncOwner* addr);
void gnc_owner_xml_initialize (void);
#endif /* GNC_OWNER_XML_V2_H */
diff --git a/src/backend/xml/gnc-pricedb-xml-v2.cpp b/src/backend/xml/gnc-pricedb-xml-v2.cpp
index 06fb251..1c5240c 100644
--- a/src/backend/xml/gnc-pricedb-xml-v2.cpp
+++ b/src/backend/xml/gnc-pricedb-xml-v2.cpp
@@ -87,76 +87,76 @@ static QofLogModule log_module = GNC_MOD_IO;
*/
static gboolean
-price_parse_xml_sub_node(GNCPrice *p, xmlNodePtr sub_node, QofBook *book)
+price_parse_xml_sub_node (GNCPrice* p, xmlNodePtr sub_node, QofBook* book)
{
if (!p || !sub_node) return FALSE;
gnc_price_begin_edit (p);
- if (g_strcmp0("price:id", (char*)sub_node->name) == 0)
+ if (g_strcmp0 ("price:id", (char*)sub_node->name) == 0)
{
- GncGUID *c = dom_tree_to_guid(sub_node);
+ GncGUID* c = dom_tree_to_guid (sub_node);
if (!c) return FALSE;
- gnc_price_set_guid(p, c);
- g_free(c);
+ gnc_price_set_guid (p, c);
+ g_free (c);
}
- else if (g_strcmp0("price:commodity", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:commodity", (char*)sub_node->name) == 0)
{
- gnc_commodity *c = dom_tree_to_commodity_ref(sub_node, book);
+ gnc_commodity* c = dom_tree_to_commodity_ref (sub_node, book);
if (!c) return FALSE;
- gnc_price_set_commodity(p, c);
+ gnc_price_set_commodity (p, c);
}
- else if (g_strcmp0("price:currency", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:currency", (char*)sub_node->name) == 0)
{
- gnc_commodity *c = dom_tree_to_commodity_ref(sub_node, book);
+ gnc_commodity* c = dom_tree_to_commodity_ref (sub_node, book);
if (!c) return FALSE;
- gnc_price_set_currency(p, c);
+ gnc_price_set_currency (p, c);
}
- else if (g_strcmp0("price:time", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:time", (char*)sub_node->name) == 0)
{
- Timespec t = dom_tree_to_timespec(sub_node);
- if (!dom_tree_valid_timespec(&t, sub_node->name)) return FALSE;
- gnc_price_set_time(p, t);
+ Timespec t = dom_tree_to_timespec (sub_node);
+ if (!dom_tree_valid_timespec (&t, sub_node->name)) return FALSE;
+ gnc_price_set_time (p, t);
}
- else if (g_strcmp0("price:source", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:source", (char*)sub_node->name) == 0)
{
- char *text = dom_tree_to_text(sub_node);
+ char* text = dom_tree_to_text (sub_node);
if (!text) return FALSE;
- gnc_price_set_source_string(p, text);
- g_free(text);
+ gnc_price_set_source_string (p, text);
+ g_free (text);
}
- else if (g_strcmp0("price:type", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:type", (char*)sub_node->name) == 0)
{
- char *text = dom_tree_to_text(sub_node);
+ char* text = dom_tree_to_text (sub_node);
if (!text) return FALSE;
- gnc_price_set_typestr(p, text);
- g_free(text);
+ gnc_price_set_typestr (p, text);
+ g_free (text);
}
- else if (g_strcmp0("price:value", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:value", (char*)sub_node->name) == 0)
{
- gnc_numeric *value = dom_tree_to_gnc_numeric(sub_node);
+ gnc_numeric* value = dom_tree_to_gnc_numeric (sub_node);
if (!value) return FALSE;
- gnc_price_set_value(p, *value);
- g_free(value);
+ gnc_price_set_value (p, *value);
+ g_free (value);
}
gnc_price_commit_edit (p);
return TRUE;
}
static gboolean
-price_parse_xml_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+price_parse_xml_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
gboolean ok = TRUE;
xmlNodePtr price_xml = (xmlNodePtr) data_for_children;
xmlNodePtr child;
- GNCPrice *p = NULL;
- gxpf_data *gdata = static_cast<decltype(gdata)>(global_data);
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ GNCPrice* p = NULL;
+ gxpf_data* gdata = static_cast<decltype (gdata)> (global_data);
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
/* we haven't been handed the *top* level node yet... */
if (parent_data) return TRUE;
@@ -180,7 +180,7 @@ price_parse_xml_end_handler(gpointer data_for_children,
goto cleanup_and_exit;
}
- p = gnc_price_create(book);
+ p = gnc_price_create (book);
if (!p)
{
ok = FALSE;
@@ -195,14 +195,14 @@ price_parse_xml_end_handler(gpointer data_for_children,
case XML_TEXT_NODE:
break;
case XML_ELEMENT_NODE:
- if (!price_parse_xml_sub_node(p, child, book))
+ if (!price_parse_xml_sub_node (p, child, book))
{
ok = FALSE;
goto cleanup_and_exit;
}
break;
default:
- PERR("Unknown node type (%d) while parsing gnc-price xml.", child->type);
+ PERR ("Unknown node type (%d) while parsing gnc-price xml.", child->type);
child = NULL;
ok = FALSE;
goto cleanup_and_exit;
@@ -218,24 +218,24 @@ cleanup_and_exit:
else
{
*result = NULL;
- gnc_price_unref(p);
+ gnc_price_unref (p);
}
- xmlFreeNode(price_xml);
+ xmlFreeNode (price_xml);
return ok;
}
static void
-cleanup_gnc_price(sixtp_child_result *result)
+cleanup_gnc_price (sixtp_child_result* result)
{
- if (result->data) gnc_price_unref((GNCPrice *) result->data);
+ if (result->data) gnc_price_unref ((GNCPrice*) result->data);
}
-static sixtp *
+static sixtp*
gnc_price_parser_new (void)
{
- return sixtp_dom_parser_new(price_parse_xml_end_handler,
- cleanup_gnc_price,
- cleanup_gnc_price);
+ return sixtp_dom_parser_new (price_parse_xml_end_handler,
+ cleanup_gnc_price,
+ cleanup_gnc_price);
}
@@ -256,52 +256,52 @@ gnc_price_parser_new (void)
*/
static gboolean
-pricedb_start_handler(GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children,
- gpointer *result,
- const gchar *tag,
- gchar **attrs)
+pricedb_start_handler (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children,
+ gpointer* result,
+ const gchar* tag,
+ gchar** attrs)
{
- gxpf_data *gdata = static_cast<decltype(gdata)>(global_data);
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
- GNCPriceDB *db = gnc_pricedb_get_db(book);
- g_return_val_if_fail(db, FALSE);
- gnc_pricedb_set_bulk_update(db, TRUE);
+ gxpf_data* gdata = static_cast<decltype (gdata)> (global_data);
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
+ GNCPriceDB* db = gnc_pricedb_get_db (book);
+ g_return_val_if_fail (db, FALSE);
+ gnc_pricedb_set_bulk_update (db, TRUE);
*result = db;
- return(TRUE);
+ return (TRUE);
}
static gboolean
-pricedb_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
+pricedb_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
{
- gxpf_data *gdata = static_cast<decltype(gdata)>(global_data);
- sixtp_gdv2 *gd = static_cast<decltype(gd)>(gdata->parsedata);
- GNCPriceDB *db = (GNCPriceDB *) * result;
+ gxpf_data* gdata = static_cast<decltype (gdata)> (global_data);
+ sixtp_gdv2* gd = static_cast<decltype (gd)> (gdata->parsedata);
+ GNCPriceDB* db = (GNCPriceDB*) * result;
- g_return_val_if_fail(db, FALSE);
+ g_return_val_if_fail (db, FALSE);
/* right now children have to produce results :> */
- if (!child_result) return(FALSE);
- if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(FALSE);
+ if (!child_result) return (FALSE);
+ if (child_result->type != SIXTP_CHILD_RESULT_NODE) return (FALSE);
- if (strcmp(child_result->tag, "price") == 0)
+ if (strcmp (child_result->tag, "price") == 0)
{
- GNCPrice *p = (GNCPrice *) child_result->data;
+ GNCPrice* p = (GNCPrice*) child_result->data;
- g_return_val_if_fail(p, FALSE);
- gnc_pricedb_add_price(db, p);
+ g_return_val_if_fail (p, FALSE);
+ gnc_pricedb_add_price (db, p);
gd->counter.prices_loaded++;
- sixtp_run_callback(gd, "prices");
+ sixtp_run_callback (gd, "prices");
return TRUE;
}
else
@@ -313,24 +313,24 @@ pricedb_after_child_handler(gpointer data_for_children,
}
static void
-pricedb_cleanup_result_handler(sixtp_child_result *result)
+pricedb_cleanup_result_handler (sixtp_child_result* result)
{
if (result->data)
{
- GNCPriceDB *db = (GNCPriceDB *) result->data;
- if (db) gnc_pricedb_destroy(db);
+ GNCPriceDB* db = (GNCPriceDB*) result->data;
+ if (db) gnc_pricedb_destroy (db);
result->data = NULL;
}
}
static gboolean
-pricedb_v2_end_handler(
+pricedb_v2_end_handler (
gpointer data_for_children, GSList* data_from_children,
GSList* sibling_data, gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+ gpointer* result, const gchar* tag)
{
- GNCPriceDB *db = static_cast<decltype(db)>(*result);
- gxpf_data *gdata = (gxpf_data*)global_data;
+ GNCPriceDB* db = static_cast<decltype (db)> (*result);
+ gxpf_data* gdata = (gxpf_data*)global_data;
if (parent_data)
{
@@ -342,51 +342,51 @@ pricedb_v2_end_handler(
return TRUE;
}
- gdata->cb(tag, gdata->parsedata, db);
+ gdata->cb (tag, gdata->parsedata, db);
*result = NULL;
- gnc_pricedb_set_bulk_update(db, FALSE);
+ gnc_pricedb_set_bulk_update (db, FALSE);
return TRUE;
}
static sixtp*
-gnc_pricedb_parser_new(void)
+gnc_pricedb_parser_new (void)
{
- sixtp *top_level;
- sixtp *price_parser;
+ sixtp* top_level;
+ sixtp* price_parser;
top_level =
- sixtp_set_any(sixtp_new(), TRUE,
- SIXTP_START_HANDLER_ID, pricedb_start_handler,
- SIXTP_AFTER_CHILD_HANDLER_ID, pricedb_after_child_handler,
- SIXTP_CHARACTERS_HANDLER_ID,
- allow_and_ignore_only_whitespace,
- SIXTP_RESULT_FAIL_ID, pricedb_cleanup_result_handler,
- SIXTP_CLEANUP_RESULT_ID, pricedb_cleanup_result_handler,
- SIXTP_NO_MORE_HANDLERS);
+ sixtp_set_any (sixtp_new (), TRUE,
+ SIXTP_START_HANDLER_ID, pricedb_start_handler,
+ SIXTP_AFTER_CHILD_HANDLER_ID, pricedb_after_child_handler,
+ SIXTP_CHARACTERS_HANDLER_ID,
+ allow_and_ignore_only_whitespace,
+ SIXTP_RESULT_FAIL_ID, pricedb_cleanup_result_handler,
+ SIXTP_CLEANUP_RESULT_ID, pricedb_cleanup_result_handler,
+ SIXTP_NO_MORE_HANDLERS);
if (!top_level) return NULL;
- price_parser = gnc_price_parser_new();
+ price_parser = gnc_price_parser_new ();
if (!price_parser)
{
- sixtp_destroy(top_level);
+ sixtp_destroy (top_level);
return NULL;
}
- sixtp_add_sub_parser(top_level, "price", price_parser);
+ sixtp_add_sub_parser (top_level, "price", price_parser);
return top_level;
}
sixtp*
-gnc_pricedb_sixtp_parser_create(void)
+gnc_pricedb_sixtp_parser_create (void)
{
- sixtp *ret;
- ret = gnc_pricedb_parser_new();
- sixtp_set_end(ret, pricedb_v2_end_handler);
+ sixtp* ret;
+ ret = gnc_pricedb_parser_new ();
+ sixtp_set_end (ret, pricedb_v2_end_handler);
return ret;
}
@@ -396,82 +396,82 @@ gnc_pricedb_sixtp_parser_create(void)
/***********************************************************************/
static gboolean
-add_child_or_kill_parent(xmlNodePtr parent, xmlNodePtr child)
+add_child_or_kill_parent (xmlNodePtr parent, xmlNodePtr child)
{
if (!child)
{
- xmlFreeNode(parent);
+ xmlFreeNode (parent);
return FALSE;
}
- xmlAddChild(parent, child);
+ xmlAddChild (parent, child);
return TRUE;
}
static xmlNodePtr
-gnc_price_to_dom_tree(const xmlChar *tag, GNCPrice *price)
+gnc_price_to_dom_tree (const xmlChar* tag, GNCPrice* price)
{
xmlNodePtr price_xml;
- const gchar *typestr, *sourcestr;
+ const gchar* typestr, *sourcestr;
xmlNodePtr tmpnode;
- gnc_commodity *commodity;
- gnc_commodity *currency;
+ gnc_commodity* commodity;
+ gnc_commodity* currency;
Timespec timesp;
gnc_numeric value;
- if (!(tag && price)) return NULL;
+ if (! (tag && price)) return NULL;
- price_xml = xmlNewNode(NULL, tag);
+ price_xml = xmlNewNode (NULL, tag);
if (!price_xml) return NULL;
- commodity = gnc_price_get_commodity(price);
- currency = gnc_price_get_currency(price);
+ commodity = gnc_price_get_commodity (price);
+ currency = gnc_price_get_currency (price);
- if (!(commodity && currency)) return NULL;
+ if (! (commodity && currency)) return NULL;
- tmpnode = guid_to_dom_tree("price:id", gnc_price_get_guid(price));
- if (!add_child_or_kill_parent(price_xml, tmpnode)) return NULL;
+ tmpnode = guid_to_dom_tree ("price:id", gnc_price_get_guid (price));
+ if (!add_child_or_kill_parent (price_xml, tmpnode)) return NULL;
- tmpnode = commodity_ref_to_dom_tree("price:commodity", commodity);
- if (!add_child_or_kill_parent(price_xml, tmpnode)) return NULL;
+ tmpnode = commodity_ref_to_dom_tree ("price:commodity", commodity);
+ if (!add_child_or_kill_parent (price_xml, tmpnode)) return NULL;
- tmpnode = commodity_ref_to_dom_tree("price:currency", currency);
- if (!add_child_or_kill_parent(price_xml, tmpnode)) return NULL;
+ tmpnode = commodity_ref_to_dom_tree ("price:currency", currency);
+ if (!add_child_or_kill_parent (price_xml, tmpnode)) return NULL;
- timesp = gnc_price_get_time(price);
- tmpnode = timespec_to_dom_tree("price:time", ×p);
- if (!add_child_or_kill_parent(price_xml, tmpnode)) return NULL;
+ timesp = gnc_price_get_time (price);
+ tmpnode = timespec_to_dom_tree ("price:time", ×p);
+ if (!add_child_or_kill_parent (price_xml, tmpnode)) return NULL;
- sourcestr = gnc_price_get_source_string(price);
- if (sourcestr && (strlen(sourcestr) != 0))
+ sourcestr = gnc_price_get_source_string (price);
+ if (sourcestr && (strlen (sourcestr) != 0))
{
- tmpnode = text_to_dom_tree("price:source", sourcestr);
- if (!add_child_or_kill_parent(price_xml, tmpnode)) return NULL;
+ tmpnode = text_to_dom_tree ("price:source", sourcestr);
+ if (!add_child_or_kill_parent (price_xml, tmpnode)) return NULL;
}
- typestr = gnc_price_get_typestr(price);
- if (typestr && (strlen(typestr) != 0))
+ typestr = gnc_price_get_typestr (price);
+ if (typestr && (strlen (typestr) != 0))
{
- tmpnode = text_to_dom_tree("price:type", typestr);
- if (!add_child_or_kill_parent(price_xml, tmpnode)) return NULL;
+ tmpnode = text_to_dom_tree ("price:type", typestr);
+ if (!add_child_or_kill_parent (price_xml, tmpnode)) return NULL;
}
- value = gnc_price_get_value(price);
- tmpnode = gnc_numeric_to_dom_tree("price:value", &value);
- if (!add_child_or_kill_parent(price_xml, tmpnode)) return NULL;
+ value = gnc_price_get_value (price);
+ tmpnode = gnc_numeric_to_dom_tree ("price:value", &value);
+ if (!add_child_or_kill_parent (price_xml, tmpnode)) return NULL;
return price_xml;
}
static gboolean
-xml_add_gnc_price_adapter(GNCPrice *p, gpointer data)
+xml_add_gnc_price_adapter (GNCPrice* p, gpointer data)
{
xmlNodePtr xml_node = (xmlNodePtr) data;
if (p)
{
- xmlNodePtr price_xml = gnc_price_to_dom_tree(BAD_CAST "price", p);
+ xmlNodePtr price_xml = gnc_price_to_dom_tree (BAD_CAST "price", p);
if (!price_xml) return FALSE;
- xmlAddChild(xml_node, price_xml);
+ xmlAddChild (xml_node, price_xml);
return TRUE;
}
else
@@ -481,27 +481,27 @@ xml_add_gnc_price_adapter(GNCPrice *p, gpointer data)
}
static xmlNodePtr
-gnc_pricedb_to_dom_tree(const xmlChar *tag, GNCPriceDB *db)
+gnc_pricedb_to_dom_tree (const xmlChar* tag, GNCPriceDB* db)
{
xmlNodePtr db_xml = NULL;
if (!tag) return NULL;
- db_xml = xmlNewNode(NULL, tag);
+ db_xml = xmlNewNode (NULL, tag);
if (!db_xml) return NULL;
- xmlSetProp(db_xml, BAD_CAST "version", BAD_CAST "1");
+ xmlSetProp (db_xml, BAD_CAST "version", BAD_CAST "1");
- if (!gnc_pricedb_foreach_price(db, xml_add_gnc_price_adapter, db_xml, TRUE))
+ if (!gnc_pricedb_foreach_price (db, xml_add_gnc_price_adapter, db_xml, TRUE))
{
- xmlFreeNode(db_xml);
+ xmlFreeNode (db_xml);
return NULL;
}
/* if no children have been added just return NULL */
if (!db_xml->xmlChildrenNode)
{
- xmlFreeNode(db_xml);
+ xmlFreeNode (db_xml);
return NULL;
}
@@ -509,7 +509,7 @@ gnc_pricedb_to_dom_tree(const xmlChar *tag, GNCPriceDB *db)
}
xmlNodePtr
-gnc_pricedb_dom_tree_create(GNCPriceDB *db)
+gnc_pricedb_dom_tree_create (GNCPriceDB* db)
{
- return gnc_pricedb_to_dom_tree(BAD_CAST "gnc:pricedb", db);
+ return gnc_pricedb_to_dom_tree (BAD_CAST "gnc:pricedb", db);
}
diff --git a/src/backend/xml/gnc-recurrence-xml-v2.cpp b/src/backend/xml/gnc-recurrence-xml-v2.cpp
index a935235..b3e817a 100644
--- a/src/backend/xml/gnc-recurrence-xml-v2.cpp
+++ b/src/backend/xml/gnc-recurrence-xml-v2.cpp
@@ -44,7 +44,7 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *recurrence_version_string = "1.0.0";
+const gchar* recurrence_version_string = "1.0.0";
#define recurrence_root "gnc:recurrence"
#define recurrence_mult "recurrence:mult"
#define recurrence_period_type "recurrence:period_type"
@@ -54,49 +54,49 @@ const gchar *recurrence_version_string = "1.0.0";
//TODO: I think three of these functions rightly belong in Recurrence.c.
static gboolean
-recurrence_period_type_handler(xmlNodePtr node, gpointer d)
+recurrence_period_type_handler (xmlNodePtr node, gpointer d)
{
PeriodType pt;
- char *nodeTxt;
+ char* nodeTxt;
- nodeTxt = dom_tree_to_text(node);
- g_return_val_if_fail(nodeTxt, FALSE);
- pt = recurrencePeriodTypeFromString(nodeTxt);
- ((Recurrence *) d)->ptype = pt;
- g_free(nodeTxt);
+ nodeTxt = dom_tree_to_text (node);
+ g_return_val_if_fail (nodeTxt, FALSE);
+ pt = recurrencePeriodTypeFromString (nodeTxt);
+ ((Recurrence*) d)->ptype = pt;
+ g_free (nodeTxt);
return (pt != -1);
}
static gboolean
-recurrence_start_date_handler(xmlNodePtr node, gpointer r)
+recurrence_start_date_handler (xmlNodePtr node, gpointer r)
{
- GDate *d;
+ GDate* d;
- d = dom_tree_to_gdate(node);
- g_return_val_if_fail(d, FALSE);
- g_return_val_if_fail(g_date_valid(d), FALSE);
- ((Recurrence *) r)->start = *d;
- g_date_free(d);
+ d = dom_tree_to_gdate (node);
+ g_return_val_if_fail (d, FALSE);
+ g_return_val_if_fail (g_date_valid (d), FALSE);
+ ((Recurrence*) r)->start = *d;
+ g_date_free (d);
return TRUE;
}
static gboolean
-recurrence_mult_handler(xmlNodePtr node, gpointer r)
+recurrence_mult_handler (xmlNodePtr node, gpointer r)
{
- return dom_tree_to_guint16(node, &((Recurrence *)r)->mult);
+ return dom_tree_to_guint16 (node, & ((Recurrence*)r)->mult);
}
static gboolean
-recurrence_weekend_adj_handler(xmlNodePtr node, gpointer d)
+recurrence_weekend_adj_handler (xmlNodePtr node, gpointer d)
{
WeekendAdjust wadj;
- char *nodeTxt;
+ char* nodeTxt;
- nodeTxt = dom_tree_to_text(node);
- g_return_val_if_fail(nodeTxt, FALSE);
- wadj = recurrenceWeekendAdjustFromString(nodeTxt);
- ((Recurrence *) d)->wadj = wadj;
- g_free(nodeTxt);
+ nodeTxt = dom_tree_to_text (node);
+ g_return_val_if_fail (nodeTxt, FALSE);
+ wadj = recurrenceWeekendAdjustFromString (nodeTxt);
+ ((Recurrence*) d)->wadj = wadj;
+ g_free (nodeTxt);
return (wadj != -1);
}
@@ -110,43 +110,43 @@ static struct dom_tree_handler recurrence_dom_handlers[] =
};
Recurrence*
-dom_tree_to_recurrence(xmlNodePtr node)
+dom_tree_to_recurrence (xmlNodePtr node)
{
gboolean successful;
- Recurrence *r;
+ Recurrence* r;
- r = g_new(Recurrence, 1);
+ r = g_new (Recurrence, 1);
/* In case the file doesn't have a weekend adjustment element */
r->wadj = WEEKEND_ADJ_NONE;
successful = dom_tree_generic_parse (node, recurrence_dom_handlers, r);
if (!successful)
{
PERR ("failed to parse recurrence node");
- xmlElemDump(stdout, NULL, node);
- g_free(r);
+ xmlElemDump (stdout, NULL, node);
+ g_free (r);
r = NULL;
}
return r;
}
xmlNodePtr
-recurrence_to_dom_tree(const gchar *tag, const Recurrence *r)
+recurrence_to_dom_tree (const gchar* tag, const Recurrence* r)
{
xmlNodePtr n;
PeriodType pt;
GDate d;
WeekendAdjust wadj;
- n = xmlNewNode(NULL, BAD_CAST tag);
- xmlSetProp(n, BAD_CAST "version", BAD_CAST recurrence_version_string);
- xmlAddChild(n, guint_to_dom_tree(recurrence_mult,
- recurrenceGetMultiplier(r)));
- pt = recurrenceGetPeriodType(r);
- xmlAddChild(n, text_to_dom_tree(recurrence_period_type,
- recurrencePeriodTypeToString(pt)));
- d = recurrenceGetDate(r);
- xmlAddChild(n, gdate_to_dom_tree(recurrence_start, &d));
- wadj = recurrenceGetWeekendAdjust(r);
+ n = xmlNewNode (NULL, BAD_CAST tag);
+ xmlSetProp (n, BAD_CAST "version", BAD_CAST recurrence_version_string);
+ xmlAddChild (n, guint_to_dom_tree (recurrence_mult,
+ recurrenceGetMultiplier (r)));
+ pt = recurrenceGetPeriodType (r);
+ xmlAddChild (n, text_to_dom_tree (recurrence_period_type,
+ recurrencePeriodTypeToString (pt)));
+ d = recurrenceGetDate (r);
+ xmlAddChild (n, gdate_to_dom_tree (recurrence_start, &d));
+ wadj = recurrenceGetWeekendAdjust (r);
if (wadj != WEEKEND_ADJ_NONE)
{
/* In r17725 and r17751, I introduced this extra XML child
@@ -155,8 +155,8 @@ recurrence_to_dom_tree(const gchar *tag, const Recurrence *r)
to improve this broken backward compatibility for most of the
cases, we don't write out this XML element as long as it is
only "none". */
- xmlAddChild(n, text_to_dom_tree(recurrence_weekend_adj,
- recurrenceWeekendAdjustToString(wadj)));
+ xmlAddChild (n, text_to_dom_tree (recurrence_weekend_adj,
+ recurrenceWeekendAdjustToString (wadj)));
}
return n;
}
diff --git a/src/backend/xml/gnc-schedxaction-xml-v2.cpp b/src/backend/xml/gnc-schedxaction-xml-v2.cpp
index ea0ee92..f719cde 100644
--- a/src/backend/xml/gnc-schedxaction-xml-v2.cpp
+++ b/src/backend/xml/gnc-schedxaction-xml-v2.cpp
@@ -75,375 +75,377 @@ extern "C"
#define GNC_TRANSACTION_TAG "gnc:transaction"
#define GNC_SCHEDXACTION_TAG "gnc:schedxaction"
-const gchar *schedxaction_version_string = "1.0.0";
-const gchar *schedxaction_version2_string = "2.0.0";
+const gchar* schedxaction_version_string = "1.0.0";
+const gchar* schedxaction_version2_string = "2.0.0";
xmlNodePtr
-gnc_schedXaction_dom_tree_create(SchedXaction *sx)
+gnc_schedXaction_dom_tree_create (SchedXaction* sx)
{
- xmlNodePtr ret;
- const GDate *date;
+ xmlNodePtr ret;
+ const GDate* date;
gint instCount;
- const GncGUID *templ_acc_guid;
+ const GncGUID* templ_acc_guid;
gboolean allow_2_2_incompat = TRUE;
- gchar *name = g_strdup (xaccSchedXactionGetName(sx));
+ gchar* name = g_strdup (xaccSchedXactionGetName (sx));
- templ_acc_guid = xaccAccountGetGUID(sx->template_acct);
+ templ_acc_guid = xaccAccountGetGUID (sx->template_acct);
/* FIXME: this should be the same as the def in io-gncxml-v2.c */
ret = xmlNewNode (NULL, BAD_CAST GNC_SCHEDXACTION_TAG);
if (allow_2_2_incompat)
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST schedxaction_version2_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST schedxaction_version2_string);
else
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST schedxaction_version_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST schedxaction_version_string);
- xmlAddChild( ret,
- guid_to_dom_tree(SX_ID,
- xaccSchedXactionGetGUID(sx)) );
+ xmlAddChild (ret,
+ guid_to_dom_tree (SX_ID,
+ xaccSchedXactionGetGUID (sx)));
- xmlNewTextChild( ret, NULL, BAD_CAST SX_NAME, checked_char_cast (name));
+ xmlNewTextChild (ret, NULL, BAD_CAST SX_NAME, checked_char_cast (name));
g_free (name);
if (allow_2_2_incompat)
{
- xmlNewTextChild( ret, NULL, BAD_CAST SX_ENABLED,
- BAD_CAST ( sx->enabled ? "y" : "n" ) );
+ xmlNewTextChild (ret, NULL, BAD_CAST SX_ENABLED,
+ BAD_CAST (sx->enabled ? "y" : "n"));
}
- xmlNewTextChild( ret, NULL, BAD_CAST SX_AUTOCREATE,
- BAD_CAST ( sx->autoCreateOption ? "y" : "n" ) );
- xmlNewTextChild( ret, NULL, BAD_CAST SX_AUTOCREATE_NOTIFY,
- BAD_CAST ( sx->autoCreateNotify ? "y" : "n" ) );
- xmlAddChild(ret, int_to_dom_tree(SX_ADVANCE_CREATE_DAYS,
- sx->advanceCreateDays));
- xmlAddChild(ret, int_to_dom_tree(SX_ADVANCE_REMIND_DAYS,
- sx->advanceRemindDays));
+ xmlNewTextChild (ret, NULL, BAD_CAST SX_AUTOCREATE,
+ BAD_CAST (sx->autoCreateOption ? "y" : "n"));
+ xmlNewTextChild (ret, NULL, BAD_CAST SX_AUTOCREATE_NOTIFY,
+ BAD_CAST (sx->autoCreateNotify ? "y" : "n"));
+ xmlAddChild (ret, int_to_dom_tree (SX_ADVANCE_CREATE_DAYS,
+ sx->advanceCreateDays));
+ xmlAddChild (ret, int_to_dom_tree (SX_ADVANCE_REMIND_DAYS,
+ sx->advanceRemindDays));
- instCount = gnc_sx_get_instance_count( sx, NULL );
- xmlAddChild( ret, int_to_dom_tree( SX_INSTANCE_COUNT,
- instCount ) );
+ instCount = gnc_sx_get_instance_count (sx, NULL);
+ xmlAddChild (ret, int_to_dom_tree (SX_INSTANCE_COUNT,
+ instCount));
- xmlAddChild( ret,
- gdate_to_dom_tree( SX_START,
- xaccSchedXactionGetStartDate(sx) ) );
+ xmlAddChild (ret,
+ gdate_to_dom_tree (SX_START,
+ xaccSchedXactionGetStartDate (sx)));
- date = xaccSchedXactionGetLastOccurDate(sx);
- if ( g_date_valid( date ) )
+ date = xaccSchedXactionGetLastOccurDate (sx);
+ if (g_date_valid (date))
{
- xmlAddChild( ret, gdate_to_dom_tree( SX_LAST, date ) );
+ xmlAddChild (ret, gdate_to_dom_tree (SX_LAST, date));
}
- if ( xaccSchedXactionHasOccurDef(sx) )
+ if (xaccSchedXactionHasOccurDef (sx))
{
- xmlAddChild(ret, int_to_dom_tree( SX_NUM_OCCUR,
- xaccSchedXactionGetNumOccur(sx)));
- xmlAddChild(ret, int_to_dom_tree( SX_REM_OCCUR,
- xaccSchedXactionGetRemOccur(sx)));
+ xmlAddChild (ret, int_to_dom_tree (SX_NUM_OCCUR,
+ xaccSchedXactionGetNumOccur (sx)));
+ xmlAddChild (ret, int_to_dom_tree (SX_REM_OCCUR,
+ xaccSchedXactionGetRemOccur (sx)));
}
- else if ( xaccSchedXactionHasEndDate(sx) )
+ else if (xaccSchedXactionHasEndDate (sx))
{
- xmlAddChild( ret,
- gdate_to_dom_tree( SX_END,
- xaccSchedXactionGetEndDate(sx) ) );
+ xmlAddChild (ret,
+ gdate_to_dom_tree (SX_END,
+ xaccSchedXactionGetEndDate (sx)));
}
/* output template account GncGUID */
- xmlAddChild( ret,
- guid_to_dom_tree(SX_TEMPL_ACCT,
- templ_acc_guid));
+ xmlAddChild (ret,
+ guid_to_dom_tree (SX_TEMPL_ACCT,
+ templ_acc_guid));
if (allow_2_2_incompat)
{
- xmlNodePtr schedule_node = xmlNewNode(NULL,
- BAD_CAST "sx:schedule");
- GList *schedule = gnc_sx_get_schedule(sx);
+ xmlNodePtr schedule_node = xmlNewNode (NULL,
+ BAD_CAST "sx:schedule");
+ GList* schedule = gnc_sx_get_schedule (sx);
for (; schedule != NULL; schedule = schedule->next)
{
- xmlAddChild(schedule_node, recurrence_to_dom_tree("gnc:recurrence", (Recurrence*)schedule->data));
+ xmlAddChild (schedule_node, recurrence_to_dom_tree ("gnc:recurrence",
+ (Recurrence*)schedule->data));
}
- xmlAddChild(ret, schedule_node);
+ xmlAddChild (ret, schedule_node);
}
/* Output deferred-instance list. */
{
xmlNodePtr instNode;
- SXTmpStateData *tsd;
- GList *l;
+ SXTmpStateData* tsd;
+ GList* l;
- for ( l = gnc_sx_get_defer_instances( sx ); l; l = l->next )
+ for (l = gnc_sx_get_defer_instances (sx); l; l = l->next)
{
tsd = (SXTmpStateData*)l->data;
- instNode = xmlNewNode( NULL, BAD_CAST SX_DEFER_INSTANCE );
- if ( g_date_valid( &tsd->last_date ) )
+ instNode = xmlNewNode (NULL, BAD_CAST SX_DEFER_INSTANCE);
+ if (g_date_valid (&tsd->last_date))
{
- xmlAddChild( instNode, gdate_to_dom_tree( SX_LAST,
- &tsd->last_date ) );
+ xmlAddChild (instNode, gdate_to_dom_tree (SX_LAST,
+ &tsd->last_date));
}
- xmlAddChild( instNode, int_to_dom_tree( SX_REM_OCCUR,
- tsd->num_occur_rem ) );
- xmlAddChild( instNode, int_to_dom_tree( SX_INSTANCE_COUNT,
- tsd->num_inst ) );
- xmlAddChild( ret, instNode );
+ xmlAddChild (instNode, int_to_dom_tree (SX_REM_OCCUR,
+ tsd->num_occur_rem));
+ xmlAddChild (instNode, int_to_dom_tree (SX_INSTANCE_COUNT,
+ tsd->num_inst));
+ xmlAddChild (ret, instNode);
}
}
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(SX_SLOTS,
- QOF_INSTANCE(sx)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (SX_SLOTS,
+ QOF_INSTANCE (sx)));
return ret;
}
struct sx_pdata
{
- SchedXaction *sx;
- QofBook *book;
+ SchedXaction* sx;
+ QofBook* book;
gboolean saw_freqspec;
gboolean saw_recurrence;
};
static
gboolean
-sx_id_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_id_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
- GncGUID *tmp = dom_tree_to_guid( node );
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
+ GncGUID* tmp = dom_tree_to_guid (node);
- g_return_val_if_fail( tmp, FALSE );
- xaccSchedXactionSetGUID(sx, tmp);
- g_free( tmp );
+ g_return_val_if_fail (tmp, FALSE);
+ xaccSchedXactionSetGUID (sx, tmp);
+ g_free (tmp);
return TRUE;
}
static
gboolean
-sx_name_handler( xmlNodePtr node, gpointer sx_pdata )
-{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
- gchar *tmp = dom_tree_to_text( node );
- g_debug("sx named [%s]", tmp);
- g_return_val_if_fail( tmp, FALSE );
- xaccSchedXactionSetName( sx, tmp );
- g_free( tmp );
+sx_name_handler (xmlNodePtr node, gpointer sx_pdata)
+{
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
+ gchar* tmp = dom_tree_to_text (node);
+ g_debug ("sx named [%s]", tmp);
+ g_return_val_if_fail (tmp, FALSE);
+ xaccSchedXactionSetName (sx, tmp);
+ g_free (tmp);
return TRUE;
}
static gboolean
-sx_enabled_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_enabled_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
- gchar *tmp = dom_tree_to_text( node );
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
+ gchar* tmp = dom_tree_to_text (node);
- sx->enabled = (g_strcmp0( tmp, "y" ) == 0 ? TRUE : FALSE );
+ sx->enabled = (g_strcmp0 (tmp, "y") == 0 ? TRUE : FALSE);
return TRUE;
}
static gboolean
-sx_autoCreate_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_autoCreate_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
- gchar *tmp = dom_tree_to_text( node );
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
+ gchar* tmp = dom_tree_to_text (node);
- sx->autoCreateOption = (g_strcmp0( tmp, "y" ) == 0 ? TRUE : FALSE );
+ sx->autoCreateOption = (g_strcmp0 (tmp, "y") == 0 ? TRUE : FALSE);
return TRUE;
}
static gboolean
-sx_notify_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_notify_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
- gchar *tmp = dom_tree_to_text( node );
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
+ gchar* tmp = dom_tree_to_text (node);
- sx->autoCreateNotify = (g_strcmp0( tmp, "y" ) == 0 ? TRUE : FALSE );
+ sx->autoCreateNotify = (g_strcmp0 (tmp, "y") == 0 ? TRUE : FALSE);
return TRUE;
}
static gboolean
-sx_advCreate_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_advCreate_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
gint64 advCreate;
- if ( ! dom_tree_to_integer( node, &advCreate ) )
+ if (! dom_tree_to_integer (node, &advCreate))
{
return FALSE;
}
- xaccSchedXactionSetAdvanceCreation( sx, advCreate );
+ xaccSchedXactionSetAdvanceCreation (sx, advCreate);
return TRUE;
}
static gboolean
-sx_advRemind_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_advRemind_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
gint64 advRemind;
- if ( ! dom_tree_to_integer( node, &advRemind ) )
+ if (! dom_tree_to_integer (node, &advRemind))
{
return FALSE;
}
- xaccSchedXactionSetAdvanceReminder( sx, advRemind );
+ xaccSchedXactionSetAdvanceReminder (sx, advRemind);
return TRUE;
}
static
gboolean
-sx_set_date( xmlNodePtr node, SchedXaction *sx,
- void (*settor)( SchedXaction *sx, const GDate *d ) )
+sx_set_date (xmlNodePtr node, SchedXaction* sx,
+ void (*settor) (SchedXaction* sx, const GDate* d))
{
- GDate *date;
- date = dom_tree_to_gdate( node );
- g_return_val_if_fail( date, FALSE );
- (*settor)( sx, date );
- g_date_free( date );
+ GDate* date;
+ date = dom_tree_to_gdate (node);
+ g_return_val_if_fail (date, FALSE);
+ (*settor) (sx, date);
+ g_date_free (date);
return TRUE;
}
static
gboolean
-sx_instcount_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_instcount_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
gint64 instanceNum;
- if ( ! dom_tree_to_integer( node, &instanceNum ) )
+ if (! dom_tree_to_integer (node, &instanceNum))
{
return FALSE;
}
- gnc_sx_set_instance_count( sx, instanceNum );
+ gnc_sx_set_instance_count (sx, instanceNum);
return TRUE;
}
static
gboolean
-sx_start_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_start_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
- return sx_set_date( node, sx, xaccSchedXactionSetStartDate );
+ return sx_set_date (node, sx, xaccSchedXactionSetStartDate);
}
static
gboolean
-sx_last_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_last_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
- return sx_set_date( node, sx, xaccSchedXactionSetLastOccurDate );
+ return sx_set_date (node, sx, xaccSchedXactionSetLastOccurDate);
}
static
gboolean
-sx_end_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_end_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
- return sx_set_date( node, sx, xaccSchedXactionSetEndDate );
+ return sx_set_date (node, sx, xaccSchedXactionSetEndDate);
}
static void
-_fixup_recurrence_start_dates(const GDate *sx_start_date, GList *schedule)
+_fixup_recurrence_start_dates (const GDate* sx_start_date, GList* schedule)
{
- GList *iter;
+ GList* iter;
for (iter = schedule; iter != NULL; iter = iter->next)
{
- Recurrence *r;
+ Recurrence* r;
GDate start, next;
r = (Recurrence*)iter->data;
start = *sx_start_date;
- g_date_subtract_days(&start, 1);
+ g_date_subtract_days (&start, 1);
- g_date_clear(&next, 1);
+ g_date_clear (&next, 1);
- recurrenceNextInstance(r, &start, &next);
- g_return_if_fail(g_date_valid(&next));
+ recurrenceNextInstance (r, &start, &next);
+ g_return_if_fail (g_date_valid (&next));
{
gchar date_str[128];
- gchar *sched_str;
+ gchar* sched_str;
- g_date_strftime(date_str, 127, "%x", &next);
- sched_str = recurrenceToString(r);
- g_debug("setting recurrence [%s] start date to [%s]",
- sched_str, date_str);
- g_free(sched_str);
+ g_date_strftime (date_str, 127, "%x", &next);
+ sched_str = recurrenceToString (r);
+ g_debug ("setting recurrence [%s] start date to [%s]",
+ sched_str, date_str);
+ g_free (sched_str);
}
- recurrenceSet(r,
- recurrenceGetMultiplier(r),
- recurrenceGetPeriodType(r),
- &next,
- recurrenceGetWeekendAdjust(r));
+ recurrenceSet (r,
+ recurrenceGetMultiplier (r),
+ recurrenceGetPeriodType (r),
+ &next,
+ recurrenceGetWeekendAdjust (r));
}
- if (g_list_length(schedule) == 1
- && recurrenceGetPeriodType((Recurrence*)g_list_nth_data(schedule, 0)) == PERIOD_ONCE)
+ if (g_list_length (schedule) == 1
+ && recurrenceGetPeriodType ((Recurrence*)g_list_nth_data (schedule,
+ 0)) == PERIOD_ONCE)
{
char date_buf[128];
- Recurrence *fixup = (Recurrence*)g_list_nth_data(schedule, 0);
- g_date_strftime(date_buf, 127, "%x", sx_start_date);
- recurrenceSet(fixup, 1, PERIOD_ONCE, sx_start_date, WEEKEND_ADJ_NONE);
- g_debug("fixed up period=ONCE Recurrence to date [%s]", date_buf);
+ Recurrence* fixup = (Recurrence*)g_list_nth_data (schedule, 0);
+ g_date_strftime (date_buf, 127, "%x", sx_start_date);
+ recurrenceSet (fixup, 1, PERIOD_ONCE, sx_start_date, WEEKEND_ADJ_NONE);
+ g_debug ("fixed up period=ONCE Recurrence to date [%s]", date_buf);
}
}
static gboolean
-sx_freqspec_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_freqspec_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
- GList *schedule;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
+ GList* schedule;
gchar* debug_str;
- g_return_val_if_fail( node, FALSE );
+ g_return_val_if_fail (node, FALSE);
- schedule = dom_tree_freqSpec_to_recurrences(node, pdata->book);
- gnc_sx_set_schedule(sx, schedule);
- debug_str = recurrenceListToString(schedule);
- g_debug("parsed from freqspec [%s]", debug_str);
- g_free(debug_str);
+ schedule = dom_tree_freqSpec_to_recurrences (node, pdata->book);
+ gnc_sx_set_schedule (sx, schedule);
+ debug_str = recurrenceListToString (schedule);
+ g_debug ("parsed from freqspec [%s]", debug_str);
+ g_free (debug_str);
- _fixup_recurrence_start_dates(xaccSchedXactionGetStartDate(sx), schedule);
+ _fixup_recurrence_start_dates (xaccSchedXactionGetStartDate (sx), schedule);
pdata->saw_freqspec = TRUE;
return TRUE;
}
static gboolean
-sx_schedule_recurrence_handler(xmlNodePtr node, gpointer parsing_data)
+sx_schedule_recurrence_handler (xmlNodePtr node, gpointer parsing_data)
{
- GList **schedule = (GList**)parsing_data;
+ GList** schedule = (GList**)parsing_data;
gchar* sched_str;
- Recurrence *r = dom_tree_to_recurrence(node);
- g_return_val_if_fail(r, FALSE);
- sched_str = recurrenceToString(r);
- g_debug("parsed recurrence [%s]", sched_str);
- g_free(sched_str);
- *schedule = g_list_append(*schedule, r);
+ Recurrence* r = dom_tree_to_recurrence (node);
+ g_return_val_if_fail (r, FALSE);
+ sched_str = recurrenceToString (r);
+ g_debug ("parsed recurrence [%s]", sched_str);
+ g_free (sched_str);
+ *schedule = g_list_append (*schedule, r);
return TRUE;
}
@@ -454,49 +456,49 @@ struct dom_tree_handler sx_recurrence_list_handlers[] =
};
static gboolean
-sx_recurrence_handler(xmlNodePtr node, gpointer _pdata)
+sx_recurrence_handler (xmlNodePtr node, gpointer _pdata)
{
- struct sx_pdata *parsing_data = static_cast<decltype(parsing_data)>(_pdata);
- GList *schedule = NULL;
+ struct sx_pdata* parsing_data = static_cast<decltype (parsing_data)> (_pdata);
+ GList* schedule = NULL;
gchar* debug_str;
- g_return_val_if_fail(node, FALSE);
+ g_return_val_if_fail (node, FALSE);
- if (!dom_tree_generic_parse(node, sx_recurrence_list_handlers, &schedule))
+ if (!dom_tree_generic_parse (node, sx_recurrence_list_handlers, &schedule))
return FALSE;
// g_return_val_if_fail(schedule, FALSE);
- debug_str = recurrenceListToString(schedule);
- g_debug("setting freshly-parsed schedule: [%s]", debug_str);
- g_free(debug_str);
- gnc_sx_set_schedule(parsing_data->sx, schedule);
+ debug_str = recurrenceListToString (schedule);
+ g_debug ("setting freshly-parsed schedule: [%s]", debug_str);
+ g_free (debug_str);
+ gnc_sx_set_schedule (parsing_data->sx, schedule);
parsing_data->saw_recurrence = TRUE;
return TRUE;
}
static
gboolean
-sx_defer_last_handler( xmlNodePtr node, gpointer gpTSD )
+sx_defer_last_handler (xmlNodePtr node, gpointer gpTSD)
{
- GDate *gd;
- SXTmpStateData *tsd = (SXTmpStateData*)gpTSD;
+ GDate* gd;
+ SXTmpStateData* tsd = (SXTmpStateData*)gpTSD;
- g_return_val_if_fail( node, FALSE );
- gd = dom_tree_to_gdate( node );
- g_return_val_if_fail( gd, FALSE );
+ g_return_val_if_fail (node, FALSE);
+ gd = dom_tree_to_gdate (node);
+ g_return_val_if_fail (gd, FALSE);
tsd->last_date = *gd;
- g_date_free( gd );
+ g_date_free (gd);
return TRUE;
}
static
gboolean
-sx_defer_rem_occur_handler( xmlNodePtr node, gpointer gpTSD )
+sx_defer_rem_occur_handler (xmlNodePtr node, gpointer gpTSD)
{
gint64 remOccur;
- SXTmpStateData *tsd = (SXTmpStateData*)gpTSD;
- g_return_val_if_fail( node, FALSE );
+ SXTmpStateData* tsd = (SXTmpStateData*)gpTSD;
+ g_return_val_if_fail (node, FALSE);
- if ( ! dom_tree_to_integer( node, &remOccur ) )
+ if (! dom_tree_to_integer (node, &remOccur))
{
return FALSE;
}
@@ -506,13 +508,13 @@ sx_defer_rem_occur_handler( xmlNodePtr node, gpointer gpTSD )
static
gboolean
-sx_defer_inst_count_handler( xmlNodePtr node, gpointer gpTSD )
+sx_defer_inst_count_handler (xmlNodePtr node, gpointer gpTSD)
{
gint64 instCount;
- SXTmpStateData *tsd = (SXTmpStateData*)gpTSD;
- g_return_val_if_fail( node, FALSE );
+ SXTmpStateData* tsd = (SXTmpStateData*)gpTSD;
+ g_return_val_if_fail (node, FALSE);
- if ( ! dom_tree_to_integer( node, &instCount ) )
+ if (! dom_tree_to_integer (node, &instCount))
{
return FALSE;
}
@@ -531,45 +533,45 @@ struct dom_tree_handler sx_defer_dom_handlers[] =
static
gboolean
-sx_defer_inst_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_defer_inst_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
- SXTmpStateData *tsd;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
+ SXTmpStateData* tsd;
- g_return_val_if_fail( node, FALSE );
+ g_return_val_if_fail (node, FALSE);
- tsd = g_new0( SXTmpStateData, 1 );
- g_assert( sx_defer_dom_handlers != NULL );
- if ( !dom_tree_generic_parse( node,
- sx_defer_dom_handlers,
- tsd ) )
+ tsd = g_new0 (SXTmpStateData, 1);
+ g_assert (sx_defer_dom_handlers != NULL);
+ if (!dom_tree_generic_parse (node,
+ sx_defer_dom_handlers,
+ tsd))
{
- xmlElemDump(stdout, NULL, node);
- g_free( tsd );
+ xmlElemDump (stdout, NULL, node);
+ g_free (tsd);
tsd = NULL;
return FALSE;
}
/* We assume they were serialized in sorted order, here. */
- sx->deferredList = g_list_append( sx->deferredList, tsd );
+ sx->deferredList = g_list_append (sx->deferredList, tsd);
return TRUE;
}
static
gboolean
-sx_numOccur_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_numOccur_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
gint64 numOccur;
- if ( ! dom_tree_to_integer( node, &numOccur ) )
+ if (! dom_tree_to_integer (node, &numOccur))
{
return FALSE;
}
- xaccSchedXactionSetNumOccur( sx, numOccur );
+ xaccSchedXactionSetNumOccur (sx, numOccur);
return TRUE;
}
@@ -577,21 +579,21 @@ sx_numOccur_handler( xmlNodePtr node, gpointer sx_pdata )
static
gboolean
-sx_templ_acct_handler( xmlNodePtr node, gpointer sx_pdata)
+sx_templ_acct_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
- GncGUID *templ_acct_guid = dom_tree_to_guid(node);
- Account *account;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
+ GncGUID* templ_acct_guid = dom_tree_to_guid (node);
+ Account* account;
if (!templ_acct_guid)
{
return FALSE;
}
- account = xaccAccountLookup(templ_acct_guid, pdata->book);
- sx_set_template_account(sx, account);
- g_free(templ_acct_guid);
+ account = xaccAccountLookup (templ_acct_guid, pdata->book);
+ sx_set_template_account (sx, account);
+ g_free (templ_acct_guid);
return TRUE;
}
@@ -599,30 +601,30 @@ sx_templ_acct_handler( xmlNodePtr node, gpointer sx_pdata)
static
gboolean
-sx_remOccur_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_remOccur_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
gint64 remOccur;
- if ( ! dom_tree_to_integer( node, &remOccur ) )
+ if (! dom_tree_to_integer (node, &remOccur))
{
return FALSE;
}
- xaccSchedXactionSetRemOccur( sx, remOccur );
+ xaccSchedXactionSetRemOccur (sx, remOccur);
return TRUE;
}
static
gboolean
-sx_slots_handler( xmlNodePtr node, gpointer sx_pdata )
+sx_slots_handler (xmlNodePtr node, gpointer sx_pdata)
{
- struct sx_pdata *pdata = static_cast<decltype(pdata)>(sx_pdata);
- SchedXaction *sx = pdata->sx;
+ struct sx_pdata* pdata = static_cast<decltype (pdata)> (sx_pdata);
+ SchedXaction* sx = pdata->sx;
- return dom_tree_create_instance_slots(node, QOF_INSTANCE(sx));
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (sx));
}
struct dom_tree_handler sx_dom_handlers[] =
@@ -649,94 +651,94 @@ struct dom_tree_handler sx_dom_handlers[] =
};
static gboolean
-gnc_schedXaction_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_schedXaction_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- SchedXaction *sx;
+ SchedXaction* sx;
gboolean successful = FALSE;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
+ gxpf_data* gdata = (gxpf_data*)global_data;
struct sx_pdata sx_pdata;
- if ( parent_data )
+ if (parent_data)
{
return TRUE;
}
- if ( !tag )
+ if (!tag)
{
return TRUE;
}
- g_return_val_if_fail( tree, FALSE );
+ g_return_val_if_fail (tree, FALSE);
- sx = xaccSchedXactionMalloc(static_cast<QofBook*>(gdata->bookdata) );
+ sx = xaccSchedXactionMalloc (static_cast<QofBook*> (gdata->bookdata));
- memset(&sx_pdata, 0, sizeof(sx_pdata));
+ memset (&sx_pdata, 0, sizeof (sx_pdata));
sx_pdata.sx = sx;
- sx_pdata.book = static_cast<decltype(sx_pdata.book)>(gdata->bookdata);
+ sx_pdata.book = static_cast<decltype (sx_pdata.book)> (gdata->bookdata);
- g_assert( sx_dom_handlers != NULL );
+ g_assert (sx_dom_handlers != NULL);
- successful = dom_tree_generic_parse( tree, sx_dom_handlers, &sx_pdata );
+ successful = dom_tree_generic_parse (tree, sx_dom_handlers, &sx_pdata);
if (!successful)
{
- g_critical("failed to parse scheduled xaction");
- xmlElemDump( stdout, NULL, tree );
- gnc_sx_begin_edit( sx );
- xaccSchedXactionDestroy( sx );
+ g_critical ("failed to parse scheduled xaction");
+ xmlElemDump (stdout, NULL, tree);
+ gnc_sx_begin_edit (sx);
+ xaccSchedXactionDestroy (sx);
goto done;
}
if (tree->properties)
{
- gchar *sx_name = xaccSchedXactionGetName(sx);
- xmlAttr *attr;
+ gchar* sx_name = xaccSchedXactionGetName (sx);
+ xmlAttr* attr;
for (attr = tree->properties; attr != NULL; attr = attr->next)
{
- xmlChar *attr_value = attr->children->content;
- g_debug("sx attribute name[%s] value[%s]", attr->name, attr_value);
- if (strcmp((const char *)attr->name, "version") != 0)
+ xmlChar* attr_value = attr->children->content;
+ g_debug ("sx attribute name[%s] value[%s]", attr->name, attr_value);
+ if (strcmp ((const char*)attr->name, "version") != 0)
{
- g_warning("unknown sx attribute [%s]", attr->name);
+ g_warning ("unknown sx attribute [%s]", attr->name);
continue;
}
// if version == 1.0.0: ensure freqspec, no recurrence
// if version == 2.0.0: ensure recurrence, no freqspec.
- if (strcmp((const char *)attr_value,
- schedxaction_version_string) == 0)
+ if (strcmp ((const char*)attr_value,
+ schedxaction_version_string) == 0)
{
if (!sx_pdata.saw_freqspec)
- g_critical("did not see freqspec in version 1 sx [%s]", sx_name);
+ g_critical ("did not see freqspec in version 1 sx [%s]", sx_name);
if (sx_pdata.saw_recurrence)
- g_warning("saw recurrence in supposedly version 1 sx [%s]", sx_name);
+ g_warning ("saw recurrence in supposedly version 1 sx [%s]", sx_name);
}
- if (strcmp((const char *)attr_value,
- schedxaction_version2_string) == 0)
+ if (strcmp ((const char*)attr_value,
+ schedxaction_version2_string) == 0)
{
if (sx_pdata.saw_freqspec)
- g_warning("saw freqspec in version 2 sx [%s]", sx_name);
+ g_warning ("saw freqspec in version 2 sx [%s]", sx_name);
if (!sx_pdata.saw_recurrence)
- g_critical("did not find recurrence in version 2 sx [%s]", sx_name);
+ g_critical ("did not find recurrence in version 2 sx [%s]", sx_name);
}
}
}
// generic_callback -> book_callback: insert the SX in the book
- gdata->cb( tag, gdata->parsedata, sx );
+ gdata->cb (tag, gdata->parsedata, sx);
/* FIXME: this should be removed somewhere near 1.8 release time. */
- if ( sx->template_acct == NULL )
+ if (sx->template_acct == NULL)
{
- Account *ra = NULL;
- Account *acct = NULL;
- sixtp_gdv2 *sixdata = static_cast<decltype(sixdata)>(gdata->parsedata);
- QofBook *book;
- gchar guidstr[GUID_ENCODING_LENGTH+1];
+ Account* ra = NULL;
+ Account* acct = NULL;
+ sixtp_gdv2* sixdata = static_cast<decltype (sixdata)> (gdata->parsedata);
+ QofBook* book;
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
book = sixdata->book;
@@ -744,23 +746,23 @@ gnc_schedXaction_end_handler(gpointer data_for_children,
change re: storing template accounts. */
/* Fix: get account with name of our GncGUID from the template
accounts. Make that our template_acct pointer. */
- guid_to_string_buff( xaccSchedXactionGetGUID( sx ), guidstr );
- ra = gnc_book_get_template_root(book);
- if ( ra == NULL )
+ guid_to_string_buff (xaccSchedXactionGetGUID (sx), guidstr);
+ ra = gnc_book_get_template_root (book);
+ if (ra == NULL)
{
- g_warning( "Error getting template root account from being-parsed Book." );
- xmlFreeNode( tree );
+ g_warning ("Error getting template root account from being-parsed Book.");
+ xmlFreeNode (tree);
return FALSE;
}
- acct = gnc_account_lookup_by_name( ra, guidstr );
- if ( acct == NULL )
+ acct = gnc_account_lookup_by_name (ra, guidstr);
+ if (acct == NULL)
{
- g_warning("no template account with name [%s]", guidstr);
- xmlFreeNode( tree );
+ g_warning ("no template account with name [%s]", guidstr);
+ xmlFreeNode (tree);
return FALSE;
}
- g_debug("template account name [%s] for SX with GncGUID [%s]",
- xaccAccountGetName( acct ), guidstr );
+ g_debug ("template account name [%s] for SX with GncGUID [%s]",
+ xaccAccountGetName (acct), guidstr);
/* FIXME: free existing template account.
* HUH????? We only execute this if there isn't
@@ -772,28 +774,28 @@ gnc_schedXaction_end_handler(gpointer data_for_children,
}
done:
- xmlFreeNode( tree );
+ xmlFreeNode (tree);
return successful;
}
sixtp*
-gnc_schedXaction_sixtp_parser_create(void)
+gnc_schedXaction_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new( gnc_schedXaction_end_handler, NULL, NULL );
+ return sixtp_dom_parser_new (gnc_schedXaction_end_handler, NULL, NULL);
}
static
gboolean
-tt_act_handler( xmlNodePtr node, gpointer data )
+tt_act_handler (xmlNodePtr node, gpointer data)
{
- gnc_template_xaction_data *txd = static_cast<decltype(txd)>(data);
- Account *acc;
- gnc_commodity *com;
+ gnc_template_xaction_data* txd = static_cast<decltype (txd)> (data);
+ Account* acc;
+ gnc_commodity* com;
- acc = dom_tree_to_account(node, txd->book);
+ acc = dom_tree_to_account (node, txd->book);
- if ( acc == NULL )
+ if (acc == NULL)
{
return FALSE;
}
@@ -804,14 +806,14 @@ tt_act_handler( xmlNodePtr node, gpointer data )
/* Check for the lack of a commodity [signifying that the
pre-7/11/2001-CIT-change SX template Account was parsed [but
incorrectly]. */
- if ( xaccAccountGetCommodity( acc ) == NULL )
+ if (xaccAccountGetCommodity (acc) == NULL)
{
#if 1
gnc_commodity_table* table;
- table = gnc_commodity_table_get_table( txd->book );
- com = gnc_commodity_table_lookup( table,
- "template", "template" );
+ table = gnc_commodity_table_get_table (txd->book);
+ com = gnc_commodity_table_lookup (table,
+ "template", "template");
#else
/* FIXME: This should first look in the table of the
book, maybe? The right thing happens [WRT file
@@ -820,15 +822,15 @@ tt_act_handler( xmlNodePtr node, gpointer data )
away at some point, but the same concern still
applies for
SchedXaction.c:xaccSchedXactionInit... */
- com = gnc_commodity_new( txd->book,
+ com = gnc_commodity_new (txd->book,
"template", "template",
"template", "template",
- 1 );
+ 1);
#endif
- xaccAccountSetCommodity( acc, com );
+ xaccAccountSetCommodity (acc, com);
}
- txd->accts = g_list_append( txd->accts, acc );
+ txd->accts = g_list_append (txd->accts, acc);
}
return TRUE;
@@ -836,20 +838,20 @@ tt_act_handler( xmlNodePtr node, gpointer data )
static
gboolean
-tt_trn_handler( xmlNodePtr node, gpointer data )
+tt_trn_handler (xmlNodePtr node, gpointer data)
{
- gnc_template_xaction_data *txd = static_cast<decltype(txd)>(data);
- Transaction *trn;
+ gnc_template_xaction_data* txd = static_cast<decltype (txd)> (data);
+ Transaction* trn;
- trn = dom_tree_to_transaction( node, txd->book );
+ trn = dom_tree_to_transaction (node, txd->book);
- if ( trn == NULL )
+ if (trn == NULL)
{
return FALSE;
}
else
{
- txd->transactions = g_list_append( txd->transactions, trn );
+ txd->transactions = g_list_append (txd->transactions, trn);
}
return TRUE;
@@ -863,19 +865,19 @@ struct dom_tree_handler tt_dom_handlers[] =
};
static gboolean
-gnc_template_transaction_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+gnc_template_transaction_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
gboolean successful = FALSE;
- xmlNodePtr tree = static_cast<decltype(tree)>(data_for_children);
- gxpf_data *gdata = static_cast<decltype(gdata)>(global_data);
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
- GList *n;
+ xmlNodePtr tree = static_cast<decltype (tree)> (data_for_children);
+ gxpf_data* gdata = static_cast<decltype (gdata)> (global_data);
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
+ GList* n;
gnc_template_xaction_data txd;
txd.book = book;
@@ -890,50 +892,50 @@ gnc_template_transaction_end_handler(gpointer data_for_children,
the null-parent account in the book's template-group slot,
the others under it, and the transactions as normal. */
- if ( parent_data )
+ if (parent_data)
{
return TRUE;
}
- if ( !tag )
+ if (!tag)
{
return TRUE;
}
- g_return_val_if_fail( tree, FALSE );
+ g_return_val_if_fail (tree, FALSE);
- successful = dom_tree_generic_parse( tree, tt_dom_handlers, &txd );
+ successful = dom_tree_generic_parse (tree, tt_dom_handlers, &txd);
- if ( successful )
+ if (successful)
{
- gdata->cb( tag, gdata->parsedata, &txd );
+ gdata->cb (tag, gdata->parsedata, &txd);
}
else
{
- g_warning("failed to parse template transaction");
- xmlElemDump( stdout, NULL, tree );
+ g_warning ("failed to parse template transaction");
+ xmlElemDump (stdout, NULL, tree);
}
/* cleanup */
- for ( n = txd.accts; n; n = n->next )
+ for (n = txd.accts; n; n = n->next)
{
n->data = NULL;
}
- for ( n = txd.transactions; n; n = n->next )
+ for (n = txd.transactions; n; n = n->next)
{
n->data = NULL;
}
- g_list_free( txd.accts );
- g_list_free( txd.transactions );
+ g_list_free (txd.accts);
+ g_list_free (txd.transactions);
- xmlFreeNode( tree );
+ xmlFreeNode (tree);
return successful;
}
sixtp*
-gnc_template_transaction_sixtp_parser_create( void )
+gnc_template_transaction_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new( gnc_template_transaction_end_handler,
- NULL, NULL );
+ return sixtp_dom_parser_new (gnc_template_transaction_end_handler,
+ NULL, NULL);
}
diff --git a/src/backend/xml/gnc-tax-table-xml-v2.cpp b/src/backend/xml/gnc-tax-table-xml-v2.cpp
index 618c007..183fe3a 100644
--- a/src/backend/xml/gnc-tax-table-xml-v2.cpp
+++ b/src/backend/xml/gnc-tax-table-xml-v2.cpp
@@ -46,11 +46,11 @@ extern "C"
#include "gnc-tax-table-xml-v2.h"
-#define _GNC_MOD_NAME GNC_ID_TAXTABLE
+#define _GNC_MOD_NAME GNC_ID_TAXTABLE
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *taxtable_version_string = "2.0.0";
+const gchar* taxtable_version_string = "2.0.0";
/* ids */
#define gnc_taxtable_string "gnc:GncTaxTable"
@@ -69,71 +69,71 @@ const gchar *taxtable_version_string = "2.0.0";
#define ttentry_amount_string "tte:amount"
static void
-maybe_add_guid (xmlNodePtr ptr, const char *tag, GncTaxTable *table)
+maybe_add_guid (xmlNodePtr ptr, const char* tag, GncTaxTable* table)
{
if (table)
xmlAddChild (ptr, guid_to_dom_tree (tag,
- qof_instance_get_guid(QOF_INSTANCE(table))));
+ qof_instance_get_guid (QOF_INSTANCE (table))));
}
static xmlNodePtr
-ttentry_dom_tree_create (GncTaxTableEntry *entry)
+ttentry_dom_tree_create (GncTaxTableEntry* entry)
{
xmlNodePtr ret;
- Account *account;
+ Account* account;
gnc_numeric amount;
- ret = xmlNewNode(NULL, BAD_CAST gnc_taxtableentry_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_taxtableentry_string);
account = gncTaxTableEntryGetAccount (entry);
if (account)
- xmlAddChild(ret, guid_to_dom_tree (ttentry_account_string,
- qof_instance_get_guid (QOF_INSTANCE(account))));
+ xmlAddChild (ret, guid_to_dom_tree (ttentry_account_string,
+ qof_instance_get_guid (QOF_INSTANCE (account))));
amount = gncTaxTableEntryGetAmount (entry);
xmlAddChild (ret, gnc_numeric_to_dom_tree (ttentry_amount_string, &amount));
- xmlAddChild(ret, text_to_dom_tree (ttentry_type_string,
- gncAmountTypeToString (
- gncTaxTableEntryGetType (entry))));
+ xmlAddChild (ret, text_to_dom_tree (ttentry_type_string,
+ gncAmountTypeToString (
+ gncTaxTableEntryGetType (entry))));
return ret;
}
static xmlNodePtr
-taxtable_dom_tree_create (GncTaxTable *table)
+taxtable_dom_tree_create (GncTaxTable* table)
{
xmlNodePtr ret, entries;
- GList *list;
+ GList* list;
- ret = xmlNewNode(NULL, BAD_CAST gnc_taxtable_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST taxtable_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_taxtable_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST taxtable_version_string);
- maybe_add_guid(ret, taxtable_guid_string, table);
- xmlAddChild(ret, text_to_dom_tree (taxtable_name_string,
- gncTaxTableGetName (table)));
+ maybe_add_guid (ret, taxtable_guid_string, table);
+ xmlAddChild (ret, text_to_dom_tree (taxtable_name_string,
+ gncTaxTableGetName (table)));
- xmlAddChild(ret, int_to_dom_tree (taxtable_refcount_string,
- gncTaxTableGetRefcount (table)));
- xmlAddChild(ret, int_to_dom_tree (taxtable_invisible_string,
- gncTaxTableGetInvisible (table)));
+ xmlAddChild (ret, int_to_dom_tree (taxtable_refcount_string,
+ gncTaxTableGetRefcount (table)));
+ xmlAddChild (ret, int_to_dom_tree (taxtable_invisible_string,
+ gncTaxTableGetInvisible (table)));
/* We should not be our own child */
- if (gncTaxTableGetChild(table) != table)
- maybe_add_guid(ret, taxtable_child_string, gncTaxTableGetChild (table));
+ if (gncTaxTableGetChild (table) != table)
+ maybe_add_guid (ret, taxtable_child_string, gncTaxTableGetChild (table));
- maybe_add_guid(ret, taxtable_parent_string, gncTaxTableGetParent (table));
+ maybe_add_guid (ret, taxtable_parent_string, gncTaxTableGetParent (table));
entries = xmlNewChild (ret, NULL, BAD_CAST taxtable_entries_string, NULL);
for (list = gncTaxTableGetEntries (table); list; list = list->next)
{
- GncTaxTableEntry *entry = static_cast<decltype(entry)>(list->data);
- xmlAddChild(entries, ttentry_dom_tree_create (entry));
+ GncTaxTableEntry* entry = static_cast<decltype (entry)> (list->data);
+ xmlAddChild (entries, ttentry_dom_tree_create (entry));
}
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(taxtable_slots_string,
- QOF_INSTANCE(table)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (taxtable_slots_string,
+ QOF_INSTANCE (table)));
return ret;
}
@@ -141,16 +141,16 @@ taxtable_dom_tree_create (GncTaxTable *table)
struct ttentry_pdata
{
- GncTaxTableEntry *ttentry;
- QofBook *book;
+ GncTaxTableEntry* ttentry;
+ QofBook* book;
};
static gboolean
ttentry_acct_handler (xmlNodePtr node, gpointer ttentry_pdata)
{
- struct ttentry_pdata *pdata = static_cast<decltype(pdata)>(ttentry_pdata);
- GncGUID *guid;
- Account * acc;
+ struct ttentry_pdata* pdata = static_cast<decltype (pdata)> (ttentry_pdata);
+ GncGUID* guid;
+ Account* acc;
guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
@@ -165,9 +165,9 @@ ttentry_acct_handler (xmlNodePtr node, gpointer ttentry_pdata)
static gboolean
ttentry_type_handler (xmlNodePtr node, gpointer ttentry_pdata)
{
- struct ttentry_pdata *pdata = static_cast<decltype(pdata)>(ttentry_pdata);
+ struct ttentry_pdata* pdata = static_cast<decltype (pdata)> (ttentry_pdata);
GncAmountType type;
- char *str;
+ char* str;
gboolean ret;
str = dom_tree_to_text (node);
@@ -185,12 +185,12 @@ ttentry_type_handler (xmlNodePtr node, gpointer ttentry_pdata)
static gboolean
ttentry_amount_handler (xmlNodePtr node, gpointer ttentry_pdata)
{
- struct ttentry_pdata *pdata = static_cast<decltype(pdata)>(ttentry_pdata);
- gnc_numeric* num = dom_tree_to_gnc_numeric(node);
- g_return_val_if_fail(num, FALSE);
+ struct ttentry_pdata* pdata = static_cast<decltype (pdata)> (ttentry_pdata);
+ gnc_numeric* num = dom_tree_to_gnc_numeric (node);
+ g_return_val_if_fail (num, FALSE);
gncTaxTableEntrySetAmount (pdata->ttentry, *num);
- g_free(num);
+ g_free (num);
return TRUE;
}
@@ -203,7 +203,7 @@ static struct dom_tree_handler ttentry_handlers_v2[] =
};
static GncTaxTableEntry*
-dom_tree_to_ttentry (xmlNodePtr node, QofBook *book)
+dom_tree_to_ttentry (xmlNodePtr node, QofBook* book)
{
struct ttentry_pdata ttentry_pdata;
gboolean successful;
@@ -228,18 +228,18 @@ dom_tree_to_ttentry (xmlNodePtr node, QofBook *book)
struct taxtable_pdata
{
- GncTaxTable *table;
- QofBook *book;
+ GncTaxTable* table;
+ QofBook* book;
};
static gboolean
-set_parent_child (xmlNodePtr node, struct taxtable_pdata *pdata,
- void (*func)(GncTaxTable *, GncTaxTable *))
+set_parent_child (xmlNodePtr node, struct taxtable_pdata* pdata,
+ void (*func) (GncTaxTable*, GncTaxTable*))
{
- GncGUID *guid;
- GncTaxTable *table;
+ GncGUID* guid;
+ GncTaxTable* table;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
table = gncTaxTableLookup (pdata->book, guid);
@@ -267,11 +267,11 @@ set_parent_child (xmlNodePtr node, struct taxtable_pdata *pdata,
static gboolean
taxtable_guid_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
- struct taxtable_pdata *pdata = static_cast<decltype(pdata)>(taxtable_pdata);
- GncGUID *guid;
- GncTaxTable *table;
+ struct taxtable_pdata* pdata = static_cast<decltype (pdata)> (taxtable_pdata);
+ GncGUID* guid;
+ GncTaxTable* table;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
table = gncTaxTableLookup (pdata->book, guid);
if (table)
@@ -282,10 +282,10 @@ taxtable_guid_handler (xmlNodePtr node, gpointer taxtable_pdata)
}
else
{
- gncTaxTableSetGUID(pdata->table, guid);
+ gncTaxTableSetGUID (pdata->table, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -293,22 +293,22 @@ taxtable_guid_handler (xmlNodePtr node, gpointer taxtable_pdata)
static gboolean
taxtable_name_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
- struct taxtable_pdata *pdata = static_cast<decltype(pdata)>(taxtable_pdata);
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ struct taxtable_pdata* pdata = static_cast<decltype (pdata)> (taxtable_pdata);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
gncTaxTableSetName (pdata->table, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
static gboolean
taxtable_refcount_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
- struct taxtable_pdata *pdata = static_cast<decltype(pdata)>(taxtable_pdata);
+ struct taxtable_pdata* pdata = static_cast<decltype (pdata)> (taxtable_pdata);
gint64 val;
- dom_tree_to_integer(node, &val);
+ dom_tree_to_integer (node, &val);
gncTaxTableSetRefcount (pdata->table, val);
return TRUE;
}
@@ -316,10 +316,10 @@ taxtable_refcount_handler (xmlNodePtr node, gpointer taxtable_pdata)
static gboolean
taxtable_invisible_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
- struct taxtable_pdata *pdata = static_cast<decltype(pdata)>(taxtable_pdata);
+ struct taxtable_pdata* pdata = static_cast<decltype (pdata)> (taxtable_pdata);
gint64 val;
- dom_tree_to_integer(node, &val);
+ dom_tree_to_integer (node, &val);
if (val)
gncTaxTableMakeInvisible (pdata->table);
return TRUE;
@@ -328,21 +328,21 @@ taxtable_invisible_handler (xmlNodePtr node, gpointer taxtable_pdata)
static gboolean
taxtable_parent_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
- struct taxtable_pdata *pdata = static_cast<decltype(pdata)>(taxtable_pdata);
+ struct taxtable_pdata* pdata = static_cast<decltype (pdata)> (taxtable_pdata);
return set_parent_child (node, pdata, gncTaxTableSetParent);
}
static gboolean
taxtable_child_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
- struct taxtable_pdata *pdata = static_cast<decltype(pdata)>(taxtable_pdata);
+ struct taxtable_pdata* pdata = static_cast<decltype (pdata)> (taxtable_pdata);
return set_parent_child (node, pdata, gncTaxTableSetChild);
}
static gboolean
taxtable_entries_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
- struct taxtable_pdata *pdata = static_cast<decltype(pdata)>(taxtable_pdata);
+ struct taxtable_pdata* pdata = static_cast<decltype (pdata)> (taxtable_pdata);
xmlNodePtr mark;
g_return_val_if_fail (node, FALSE);
@@ -350,7 +350,7 @@ taxtable_entries_handler (xmlNodePtr node, gpointer taxtable_pdata)
for (mark = node->xmlChildrenNode; mark; mark = mark->next)
{
- GncTaxTableEntry *entry;
+ GncTaxTableEntry* entry;
if (g_strcmp0 ("text", (char*)mark->name) == 0)
continue;
@@ -372,9 +372,9 @@ taxtable_entries_handler (xmlNodePtr node, gpointer taxtable_pdata)
static gboolean
taxtable_slots_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
- struct taxtable_pdata *pdata = static_cast<decltype(pdata)>(taxtable_pdata);
+ struct taxtable_pdata* pdata = static_cast<decltype (pdata)> (taxtable_pdata);
- return dom_tree_create_instance_slots(node, QOF_INSTANCE (pdata->table));
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->table));
}
static struct dom_tree_handler taxtable_handlers_v2[] =
@@ -391,7 +391,7 @@ static struct dom_tree_handler taxtable_handlers_v2[] =
};
static GncTaxTable*
-dom_tree_to_taxtable (xmlNodePtr node, QofBook *book)
+dom_tree_to_taxtable (xmlNodePtr node, QofBook* book)
{
struct taxtable_pdata taxtable_pdata;
gboolean successful;
@@ -416,15 +416,15 @@ dom_tree_to_taxtable (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_taxtable_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_taxtable_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncTaxTable *table;
+ GncTaxTable* table;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
{
@@ -438,34 +438,34 @@ gnc_taxtable_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
table = dom_tree_to_taxtable (tree, book);
if (table != NULL)
{
- gdata->cb(tag, gdata->parsedata, table);
+ gdata->cb (tag, gdata->parsedata, table);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return table != NULL;
}
-static sixtp *
-taxtable_sixtp_parser_create(void)
+static sixtp*
+taxtable_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_taxtable_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_taxtable_end_handler, NULL, NULL);
}
static void
-do_count (QofInstance * table_p, gpointer count_p)
+do_count (QofInstance* table_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
+ int* count = static_cast<decltype (count)> (count_p);
(*count)++;
}
static int
-taxtable_get_count (QofBook *book)
+taxtable_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -473,49 +473,50 @@ taxtable_get_count (QofBook *book)
}
static void
-xml_add_taxtable (QofInstance * table_p, gpointer out_p)
+xml_add_taxtable (QofInstance* table_p, gpointer out_p)
{
xmlNodePtr node;
- GncTaxTable *table = (GncTaxTable *) table_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncTaxTable* table = (GncTaxTable*) table_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
node = taxtable_dom_tree_create (table);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-taxtable_write (FILE *out, QofBook *book)
+taxtable_write (FILE* out, QofBook* book)
{
- qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_taxtable, (gpointer) out);
- return ferror(out) == 0;
+ qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_taxtable,
+ (gpointer) out);
+ return ferror (out) == 0;
}
static gboolean
-taxtable_is_grandchild (GncTaxTable *table)
+taxtable_is_grandchild (GncTaxTable* table)
{
- return (gncTaxTableGetParent(gncTaxTableGetParent(table)) != NULL);
+ return (gncTaxTableGetParent (gncTaxTableGetParent (table)) != NULL);
}
-static GncTaxTable *
-taxtable_find_senior (GncTaxTable *table)
+static GncTaxTable*
+taxtable_find_senior (GncTaxTable* table)
{
- GncTaxTable *temp, *parent, *gp = NULL;
+ GncTaxTable* temp, *parent, *gp = NULL;
temp = table;
do
{
/* See if "temp" is a grandchild */
- parent = gncTaxTableGetParent(temp);
+ parent = gncTaxTableGetParent (temp);
if (!parent)
break;
- gp = gncTaxTableGetParent(parent);
+ gp = gncTaxTableGetParent (parent);
if (!gp)
break;
@@ -540,128 +541,129 @@ taxtable_find_senior (GncTaxTable *table)
/* build a list of tax tables that are grandchildren or bogus (empty entry list). */
static void
-taxtable_scrub_cb (QofInstance * table_p, gpointer list_p)
+taxtable_scrub_cb (QofInstance* table_p, gpointer list_p)
{
- GncTaxTable *table = GNC_TAXTABLE(table_p);
- GList **list = static_cast<decltype(list)>(list_p);
+ GncTaxTable* table = GNC_TAXTABLE (table_p);
+ GList** list = static_cast<decltype (list)> (list_p);
- if (taxtable_is_grandchild(table) || gncTaxTableGetEntries(table) == NULL)
- *list = g_list_prepend(*list, table);
+ if (taxtable_is_grandchild (table) || gncTaxTableGetEntries (table) == NULL)
+ *list = g_list_prepend (*list, table);
}
/* for each entry, check the tax tables. If the tax tables are
* grandchildren, then fix them to point to the most senior child
*/
static void
-taxtable_scrub_entries (QofInstance * entry_p, gpointer ht_p)
+taxtable_scrub_entries (QofInstance* entry_p, gpointer ht_p)
{
- GHashTable *ht = static_cast<decltype(ht)>(ht_p);
- GncEntry *entry = GNC_ENTRY(entry_p);
- GncTaxTable *table, *new_tt;
+ GHashTable* ht = static_cast<decltype (ht)> (ht_p);
+ GncEntry* entry = GNC_ENTRY (entry_p);
+ GncTaxTable* table, *new_tt;
gint32 count;
- table = gncEntryGetInvTaxTable(entry);
+ table = gncEntryGetInvTaxTable (entry);
if (table)
{
- if (taxtable_is_grandchild(table))
+ if (taxtable_is_grandchild (table))
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(entry)),guidstr);
- PINFO("Fixing i-taxtable on entry %s\n",guidstr);
- new_tt = taxtable_find_senior(table);
- gncEntryBeginEdit(entry);
- gncEntrySetInvTaxTable(entry, new_tt);
- gncEntryCommitEdit(entry);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (entry)), guidstr);
+ PINFO ("Fixing i-taxtable on entry %s\n", guidstr);
+ new_tt = taxtable_find_senior (table);
+ gncEntryBeginEdit (entry);
+ gncEntrySetInvTaxTable (entry, new_tt);
+ gncEntryCommitEdit (entry);
table = new_tt;
}
if (table)
{
- count = GPOINTER_TO_INT(g_hash_table_lookup(ht, table));
+ count = GPOINTER_TO_INT (g_hash_table_lookup (ht, table));
count++;
- g_hash_table_insert(ht, table, GINT_TO_POINTER(count));
+ g_hash_table_insert (ht, table, GINT_TO_POINTER (count));
}
}
- table = gncEntryGetBillTaxTable(entry);
+ table = gncEntryGetBillTaxTable (entry);
if (table)
{
- if (taxtable_is_grandchild(table))
+ if (taxtable_is_grandchild (table))
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(entry)),guidstr);
- PINFO("Fixing b-taxtable on entry %s\n",guidstr);
- new_tt = taxtable_find_senior(table);
- gncEntryBeginEdit(entry);
- gncEntrySetBillTaxTable(entry, new_tt);
- gncEntryCommitEdit(entry);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (entry)), guidstr);
+ PINFO ("Fixing b-taxtable on entry %s\n", guidstr);
+ new_tt = taxtable_find_senior (table);
+ gncEntryBeginEdit (entry);
+ gncEntrySetBillTaxTable (entry, new_tt);
+ gncEntryCommitEdit (entry);
table = new_tt;
}
if (table)
{
- count = GPOINTER_TO_INT(g_hash_table_lookup(ht, table));
+ count = GPOINTER_TO_INT (g_hash_table_lookup (ht, table));
count++;
- g_hash_table_insert(ht, table, GINT_TO_POINTER(count));
+ g_hash_table_insert (ht, table, GINT_TO_POINTER (count));
}
}
}
static void
-taxtable_scrub_cust (QofInstance * cust_p, gpointer ht_p)
+taxtable_scrub_cust (QofInstance* cust_p, gpointer ht_p)
{
- GHashTable *ht = static_cast<decltype(ht)>(ht_p);
- GncCustomer *cust = GNC_CUSTOMER(cust_p);
- GncTaxTable *table;
+ GHashTable* ht = static_cast<decltype (ht)> (ht_p);
+ GncCustomer* cust = GNC_CUSTOMER (cust_p);
+ GncTaxTable* table;
gint32 count;
- table = gncCustomerGetTaxTable(cust);
+ table = gncCustomerGetTaxTable (cust);
if (table)
{
- count = GPOINTER_TO_INT(g_hash_table_lookup(ht, table));
+ count = GPOINTER_TO_INT (g_hash_table_lookup (ht, table));
count++;
- g_hash_table_insert(ht, table, GINT_TO_POINTER(count));
+ g_hash_table_insert (ht, table, GINT_TO_POINTER (count));
}
}
static void
-taxtable_scrub_vendor (QofInstance * vendor_p, gpointer ht_p)
+taxtable_scrub_vendor (QofInstance* vendor_p, gpointer ht_p)
{
- GHashTable *ht = static_cast<decltype(ht)>(ht_p);
- GncVendor *vendor = GNC_VENDOR(vendor_p);
- GncTaxTable *table;
+ GHashTable* ht = static_cast<decltype (ht)> (ht_p);
+ GncVendor* vendor = GNC_VENDOR (vendor_p);
+ GncTaxTable* table;
gint32 count;
- table = gncVendorGetTaxTable(vendor);
+ table = gncVendorGetTaxTable (vendor);
if (table)
{
- count = GPOINTER_TO_INT(g_hash_table_lookup(ht, table));
+ count = GPOINTER_TO_INT (g_hash_table_lookup (ht, table));
count++;
- g_hash_table_insert(ht, table, GINT_TO_POINTER(count));
+ g_hash_table_insert (ht, table, GINT_TO_POINTER (count));
}
}
static void
taxtable_reset_refcount (gpointer key, gpointer value, gpointer notused)
{
- GncTaxTable *table = static_cast<decltype(table)>(key);
- gint32 count = GPOINTER_TO_INT(value);
+ GncTaxTable* table = static_cast<decltype (table)> (key);
+ gint32 count = GPOINTER_TO_INT (value);
- if (count != gncTaxTableGetRefcount(table) && !gncTaxTableGetInvisible(table))
+ if (count != gncTaxTableGetRefcount (table) &&
+ !gncTaxTableGetInvisible (table))
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(table)),guidstr);
- PWARN("Fixing refcount on taxtable %s (%" G_GINT64_FORMAT " -> %d)\n",
- guidstr,gncTaxTableGetRefcount(table), count);
- gncTaxTableSetRefcount(table, count);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (table)), guidstr);
+ PWARN ("Fixing refcount on taxtable %s (%" G_GINT64_FORMAT " -> %d)\n",
+ guidstr, gncTaxTableGetRefcount (table), count);
+ gncTaxTableSetRefcount (table, count);
}
}
static void
-taxtable_scrub (QofBook *book)
+taxtable_scrub (QofBook* book)
{
- GList *list = NULL;
- GList *node;
- GncTaxTable *parent, *table;
- GHashTable *ht = g_hash_table_new(g_direct_hash, g_direct_equal);
+ GList* list = NULL;
+ GList* node;
+ GncTaxTable* parent, *table;
+ GHashTable* ht = g_hash_table_new (g_direct_hash, g_direct_equal);
qof_object_foreach (GNC_ID_ENTRY, book, taxtable_scrub_entries, ht);
qof_object_foreach (GNC_ID_CUSTOMER, book, taxtable_scrub_cust, ht);
@@ -671,35 +673,35 @@ taxtable_scrub (QofBook *book)
/* destroy the list of "grandchildren" tax tables */
for (node = list; node; node = node->next)
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- table = static_cast<decltype(table)>(node->data);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ table = static_cast<decltype (table)> (node->data);
- guid_to_string_buff(qof_instance_get_guid(QOF_INSTANCE(table)),guidstr);
+ guid_to_string_buff (qof_instance_get_guid (QOF_INSTANCE (table)), guidstr);
PINFO ("deleting grandchild taxtable: %s\n", guidstr);
/* Make sure the parent has no children */
- parent = gncTaxTableGetParent(table);
- gncTaxTableSetChild(parent, NULL);
+ parent = gncTaxTableGetParent (table);
+ gncTaxTableSetChild (parent, NULL);
/* Destroy this tax table */
- gncTaxTableBeginEdit(table);
- gncTaxTableDestroy(table);
+ gncTaxTableBeginEdit (table);
+ gncTaxTableDestroy (table);
}
/* reset the refcounts as necessary */
- g_hash_table_foreach(ht, taxtable_reset_refcount, NULL);
+ g_hash_table_foreach (ht, taxtable_reset_refcount, NULL);
- g_list_free(list);
- g_hash_table_destroy(ht);
+ g_list_free (list);
+ g_hash_table_destroy (ht);
}
static gboolean
-taxtable_ns(FILE *out)
+taxtable_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
+ g_return_val_if_fail (out, FALSE);
return
- gnc_xml2_write_namespace_decl(out, "taxtable")
- && gnc_xml2_write_namespace_decl(out, "tte");
+ gnc_xml2_write_namespace_decl (out, "taxtable")
+ && gnc_xml2_write_namespace_decl (out, "tte");
}
void
@@ -710,7 +712,7 @@ gnc_taxtable_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_taxtable_string,
taxtable_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
taxtable_get_count,
taxtable_write,
taxtable_scrub,
diff --git a/src/backend/xml/gnc-transaction-xml-v2.cpp b/src/backend/xml/gnc-transaction-xml-v2.cpp
index 1fb6820..4992fac 100644
--- a/src/backend/xml/gnc-transaction-xml-v2.cpp
+++ b/src/backend/xml/gnc-transaction-xml-v2.cpp
@@ -48,148 +48,148 @@ extern "C"
#include "sixtp-dom-parsers.h"
-const gchar *transaction_version_string = "2.0.0";
+const gchar* transaction_version_string = "2.0.0";
static void
-add_gnc_num(xmlNodePtr node, const gchar *tag, gnc_numeric num)
+add_gnc_num (xmlNodePtr node, const gchar* tag, gnc_numeric num)
{
- xmlAddChild(node, gnc_numeric_to_dom_tree(tag, &num));
+ xmlAddChild (node, gnc_numeric_to_dom_tree (tag, &num));
}
static void
-add_timespec(xmlNodePtr node, const gchar *tag, Timespec tms, gboolean always)
+add_timespec (xmlNodePtr node, const gchar* tag, Timespec tms, gboolean always)
{
- if (always || !((tms.tv_sec == 0) && (tms.tv_nsec == 0)))
+ if (always || ! ((tms.tv_sec == 0) && (tms.tv_nsec == 0)))
{
- xmlAddChild(node, timespec_to_dom_tree(tag, &tms));
+ xmlAddChild (node, timespec_to_dom_tree (tag, &tms));
}
}
static xmlNodePtr
-split_to_dom_tree(const gchar *tag, Split *spl)
+split_to_dom_tree (const gchar* tag, Split* spl)
{
xmlNodePtr ret;
- ret = xmlNewNode(NULL, BAD_CAST tag);
+ ret = xmlNewNode (NULL, BAD_CAST tag);
- xmlAddChild(ret, guid_to_dom_tree("split:id", xaccSplitGetGUID(spl)));
+ xmlAddChild (ret, guid_to_dom_tree ("split:id", xaccSplitGetGUID (spl)));
{
- char *memo = g_strdup (xaccSplitGetMemo(spl));
+ char* memo = g_strdup (xaccSplitGetMemo (spl));
- if (memo && g_strcmp0(memo, "") != 0)
+ if (memo && g_strcmp0 (memo, "") != 0)
{
- xmlNewTextChild(ret, NULL, BAD_CAST "split:memo",
- checked_char_cast (memo));
+ xmlNewTextChild (ret, NULL, BAD_CAST "split:memo",
+ checked_char_cast (memo));
}
- g_free (memo);
+ g_free (memo);
}
{
- char *action = g_strdup (xaccSplitGetAction(spl));
+ char* action = g_strdup (xaccSplitGetAction (spl));
- if (action && g_strcmp0(action, "") != 0)
+ if (action && g_strcmp0 (action, "") != 0)
{
- xmlNewTextChild(ret, NULL, BAD_CAST "split:action",
- checked_char_cast (action));
+ xmlNewTextChild (ret, NULL, BAD_CAST "split:action",
+ checked_char_cast (action));
}
- g_free (action);
+ g_free (action);
}
{
char tmp[2];
- tmp[0] = xaccSplitGetReconcile(spl);
+ tmp[0] = xaccSplitGetReconcile (spl);
tmp[1] = '\0';
- xmlNewTextChild(ret, NULL, BAD_CAST "split:reconciled-state",
- BAD_CAST tmp);
+ xmlNewTextChild (ret, NULL, BAD_CAST "split:reconciled-state",
+ BAD_CAST tmp);
}
- add_timespec(ret, "split:reconcile-date",
- xaccSplitRetDateReconciledTS(spl), FALSE);
+ add_timespec (ret, "split:reconcile-date",
+ xaccSplitRetDateReconciledTS (spl), FALSE);
- add_gnc_num(ret, "split:value", xaccSplitGetValue(spl));
+ add_gnc_num (ret, "split:value", xaccSplitGetValue (spl));
- add_gnc_num(ret, "split:quantity", xaccSplitGetAmount(spl));
+ add_gnc_num (ret, "split:quantity", xaccSplitGetAmount (spl));
{
- Account * account = xaccSplitGetAccount (spl);
+ Account* account = xaccSplitGetAccount (spl);
- xmlAddChild (ret, guid_to_dom_tree("split:account",
- xaccAccountGetGUID (account)));
+ xmlAddChild (ret, guid_to_dom_tree ("split:account",
+ xaccAccountGetGUID (account)));
}
{
- GNCLot * lot = xaccSplitGetLot (spl);
+ GNCLot* lot = xaccSplitGetLot (spl);
if (lot)
{
- xmlAddChild (ret, guid_to_dom_tree("split:lot",
- gnc_lot_get_guid(lot)));
+ xmlAddChild (ret, guid_to_dom_tree ("split:lot",
+ gnc_lot_get_guid (lot)));
}
}
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree("split:slots",
- QOF_INSTANCE(spl)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree ("split:slots",
+ QOF_INSTANCE (spl)));
return ret;
}
static void
-add_trans_splits(xmlNodePtr node, Transaction *trn)
+add_trans_splits (xmlNodePtr node, Transaction* trn)
{
- GList *n;
+ GList* n;
xmlNodePtr toaddto;
- toaddto = xmlNewChild(node, NULL, BAD_CAST "trn:splits", NULL);
+ toaddto = xmlNewChild (node, NULL, BAD_CAST "trn:splits", NULL);
- for (n = xaccTransGetSplitList(trn); n; n = n->next)
+ for (n = xaccTransGetSplitList (trn); n; n = n->next)
{
- Split *s = static_cast<decltype(s)>(n->data);
- xmlAddChild(toaddto, split_to_dom_tree("trn:split", s));
+ Split* s = static_cast<decltype (s)> (n->data);
+ xmlAddChild (toaddto, split_to_dom_tree ("trn:split", s));
}
}
xmlNodePtr
-gnc_transaction_dom_tree_create(Transaction *trn)
+gnc_transaction_dom_tree_create (Transaction* trn)
{
xmlNodePtr ret;
- gchar *str = NULL;
+ gchar* str = NULL;
- ret = xmlNewNode(NULL, BAD_CAST "gnc:transaction");
+ ret = xmlNewNode (NULL, BAD_CAST "gnc:transaction");
- xmlSetProp(ret, BAD_CAST "version",
- BAD_CAST transaction_version_string);
+ xmlSetProp (ret, BAD_CAST "version",
+ BAD_CAST transaction_version_string);
- xmlAddChild(ret, guid_to_dom_tree("trn:id", xaccTransGetGUID(trn)));
+ xmlAddChild (ret, guid_to_dom_tree ("trn:id", xaccTransGetGUID (trn)));
- xmlAddChild(ret, commodity_ref_to_dom_tree("trn:currency",
- xaccTransGetCurrency(trn)));
- str = g_strdup (xaccTransGetNum(trn));
- if (str && (g_strcmp0(str, "") != 0))
+ xmlAddChild (ret, commodity_ref_to_dom_tree ("trn:currency",
+ xaccTransGetCurrency (trn)));
+ str = g_strdup (xaccTransGetNum (trn));
+ if (str && (g_strcmp0 (str, "") != 0))
{
- xmlNewTextChild(ret, NULL, BAD_CAST "trn:num",
- checked_char_cast (str));
+ xmlNewTextChild (ret, NULL, BAD_CAST "trn:num",
+ checked_char_cast (str));
}
g_free (str);
- add_timespec(ret, "trn:date-posted", xaccTransRetDatePostedTS(trn), TRUE);
+ add_timespec (ret, "trn:date-posted", xaccTransRetDatePostedTS (trn), TRUE);
- add_timespec(ret, "trn:date-entered",
- xaccTransRetDateEnteredTS(trn), TRUE);
+ add_timespec (ret, "trn:date-entered",
+ xaccTransRetDateEnteredTS (trn), TRUE);
- str = g_strdup (xaccTransGetDescription(trn));
+ str = g_strdup (xaccTransGetDescription (trn));
if (str)
{
- xmlNewTextChild(ret, NULL, BAD_CAST "trn:description",
- checked_char_cast (str));
+ xmlNewTextChild (ret, NULL, BAD_CAST "trn:description",
+ checked_char_cast (str));
}
g_free (str);
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree("trn:slots",
- QOF_INSTANCE(trn)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree ("trn:slots",
+ QOF_INSTANCE (trn)));
- add_trans_splits(ret, trn);
+ add_trans_splits (ret, trn);
return ret;
}
@@ -198,121 +198,121 @@ gnc_transaction_dom_tree_create(Transaction *trn)
struct split_pdata
{
- Split *split;
- QofBook *book;
+ Split* split;
+ QofBook* book;
};
static inline gboolean
-set_spl_string(xmlNodePtr node, Split *spl,
- void (*func)(Split *spl, const char *txt))
+set_spl_string (xmlNodePtr node, Split* spl,
+ void (*func) (Split* spl, const char* txt))
{
- gchar *tmp = dom_tree_to_text(node);
- g_return_val_if_fail(tmp, FALSE);
+ gchar* tmp = dom_tree_to_text (node);
+ g_return_val_if_fail (tmp, FALSE);
- func(spl, tmp);
+ func (spl, tmp);
- g_free(tmp);
+ g_free (tmp);
return TRUE;
}
static inline gboolean
-set_spl_gnc_num(xmlNodePtr node, Split* spl,
- void (*func)(Split *spl, gnc_numeric gn))
+set_spl_gnc_num (xmlNodePtr node, Split* spl,
+ void (*func) (Split* spl, gnc_numeric gn))
{
- gnc_numeric *num = dom_tree_to_gnc_numeric(node);
- g_return_val_if_fail(num, FALSE);
+ gnc_numeric* num = dom_tree_to_gnc_numeric (node);
+ g_return_val_if_fail (num, FALSE);
- func(spl, *num);
+ func (spl, *num);
- g_free(num);
+ g_free (num);
return FALSE;
}
static gboolean
-spl_id_handler(xmlNodePtr node, gpointer data)
+spl_id_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
- GncGUID *tmp = dom_tree_to_guid(node);
- g_return_val_if_fail(tmp, FALSE);
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
+ GncGUID* tmp = dom_tree_to_guid (node);
+ g_return_val_if_fail (tmp, FALSE);
- xaccSplitSetGUID(pdata->split, tmp);
+ xaccSplitSetGUID (pdata->split, tmp);
- g_free(tmp);
+ g_free (tmp);
return TRUE;
}
static gboolean
-spl_memo_handler(xmlNodePtr node, gpointer data)
+spl_memo_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
- return set_spl_string(node, pdata->split, xaccSplitSetMemo);
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
+ return set_spl_string (node, pdata->split, xaccSplitSetMemo);
}
static gboolean
-spl_action_handler(xmlNodePtr node, gpointer data)
+spl_action_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
- return set_spl_string(node, pdata->split, xaccSplitSetAction);
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
+ return set_spl_string (node, pdata->split, xaccSplitSetAction);
}
static gboolean
-spl_reconciled_state_handler(xmlNodePtr node, gpointer data)
+spl_reconciled_state_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
- gchar *tmp = dom_tree_to_text(node);
- g_return_val_if_fail(tmp, FALSE);
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
+ gchar* tmp = dom_tree_to_text (node);
+ g_return_val_if_fail (tmp, FALSE);
- xaccSplitSetReconcile(pdata->split, tmp[0]);
+ xaccSplitSetReconcile (pdata->split, tmp[0]);
- g_free(tmp);
+ g_free (tmp);
return TRUE;
}
static gboolean
-spl_reconcile_date_handler(xmlNodePtr node, gpointer data)
+spl_reconcile_date_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
Timespec ts;
- ts = dom_tree_to_timespec(node);
- if (!dom_tree_valid_timespec(&ts, node->name)) return FALSE;
+ ts = dom_tree_to_timespec (node);
+ if (!dom_tree_valid_timespec (&ts, node->name)) return FALSE;
- xaccSplitSetDateReconciledTS(pdata->split, &ts);
+ xaccSplitSetDateReconciledTS (pdata->split, &ts);
return TRUE;
}
static gboolean
-spl_value_handler(xmlNodePtr node, gpointer data)
+spl_value_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
- return set_spl_gnc_num(node, pdata->split, xaccSplitSetValue);
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
+ return set_spl_gnc_num (node, pdata->split, xaccSplitSetValue);
}
static gboolean
-spl_quantity_handler(xmlNodePtr node, gpointer data)
+spl_quantity_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
- return set_spl_gnc_num(node, pdata->split, xaccSplitSetAmount);
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
+ return set_spl_gnc_num (node, pdata->split, xaccSplitSetAmount);
}
gboolean gnc_transaction_xml_v2_testing = FALSE;
static gboolean
-spl_account_handler(xmlNodePtr node, gpointer data)
+spl_account_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
- GncGUID *id = dom_tree_to_guid(node);
- Account *account;
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
+ GncGUID* id = dom_tree_to_guid (node);
+ Account* account;
- g_return_val_if_fail(id, FALSE);
+ g_return_val_if_fail (id, FALSE);
account = xaccAccountLookup (id, pdata->book);
if (!account && gnc_transaction_xml_v2_testing &&
- !guid_equal (id, guid_null ()))
+ !guid_equal (id, guid_null ()))
{
account = xaccMallocAccount (pdata->book);
xaccAccountSetGUID (account, id);
@@ -322,23 +322,23 @@ spl_account_handler(xmlNodePtr node, gpointer data)
xaccAccountInsertSplit (account, pdata->split);
- g_free(id);
+ g_free (id);
return TRUE;
}
static gboolean
-spl_lot_handler(xmlNodePtr node, gpointer data)
+spl_lot_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
- GncGUID *id = dom_tree_to_guid(node);
- GNCLot *lot;
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
+ GncGUID* id = dom_tree_to_guid (node);
+ GNCLot* lot;
- g_return_val_if_fail(id, FALSE);
+ g_return_val_if_fail (id, FALSE);
lot = gnc_lot_lookup (id, pdata->book);
if (!lot && gnc_transaction_xml_v2_testing &&
- !guid_equal (id, guid_null ()))
+ !guid_equal (id, guid_null ()))
{
lot = gnc_lot_new (pdata->book);
gnc_lot_set_guid (lot, *id);
@@ -346,20 +346,20 @@ spl_lot_handler(xmlNodePtr node, gpointer data)
gnc_lot_add_split (lot, pdata->split);
- g_free(id);
+ g_free (id);
return TRUE;
}
static gboolean
-spl_slots_handler(xmlNodePtr node, gpointer data)
+spl_slots_handler (xmlNodePtr node, gpointer data)
{
- struct split_pdata *pdata = static_cast<decltype(pdata)>(data);
+ struct split_pdata* pdata = static_cast<decltype (pdata)> (data);
gboolean successful;
- successful = dom_tree_create_instance_slots(node,
- QOF_INSTANCE (pdata->split));
- g_return_val_if_fail(successful, FALSE);
+ successful = dom_tree_create_instance_slots (node,
+ QOF_INSTANCE (pdata->split));
+ g_return_val_if_fail (successful, FALSE);
return TRUE;
}
@@ -380,27 +380,27 @@ struct dom_tree_handler spl_dom_handlers[] =
};
static Split*
-dom_tree_to_split(xmlNodePtr node, QofBook *book)
+dom_tree_to_split (xmlNodePtr node, QofBook* book)
{
struct split_pdata pdata;
- Split *ret;
+ Split* ret;
g_return_val_if_fail (book, NULL);
- ret = xaccMallocSplit(book);
- g_return_val_if_fail(ret, NULL);
+ ret = xaccMallocSplit (book);
+ g_return_val_if_fail (ret, NULL);
pdata.split = ret;
pdata.book = book;
/* this isn't going to work in a testing setup */
- if (dom_tree_generic_parse(node, spl_dom_handlers, &pdata))
+ if (dom_tree_generic_parse (node, spl_dom_handlers, &pdata))
{
return ret;
}
else
{
- xaccSplitDestroy(ret);
+ xaccSplitDestroy (ret);
return NULL;
}
}
@@ -409,148 +409,148 @@ dom_tree_to_split(xmlNodePtr node, QofBook *book)
struct trans_pdata
{
- Transaction *trans;
- QofBook *book;
+ Transaction* trans;
+ QofBook* book;
};
static inline gboolean
-set_tran_string(xmlNodePtr node, Transaction *trn,
- void (*func)(Transaction *trn, const char *txt))
+set_tran_string (xmlNodePtr node, Transaction* trn,
+ void (*func) (Transaction* trn, const char* txt))
{
- gchar *tmp;
+ gchar* tmp;
- tmp = dom_tree_to_text(node);
+ tmp = dom_tree_to_text (node);
- g_return_val_if_fail(tmp, FALSE);
+ g_return_val_if_fail (tmp, FALSE);
- func(trn, tmp);
+ func (trn, tmp);
- g_free(tmp);
+ g_free (tmp);
return TRUE;
}
static inline gboolean
-set_tran_date(xmlNodePtr node, Transaction *trn,
- void (*func)(Transaction *trn, const Timespec *tm))
+set_tran_date (xmlNodePtr node, Transaction* trn,
+ void (*func) (Transaction* trn, const Timespec* tm))
{
Timespec tm;
- tm = dom_tree_to_timespec(node);
+ tm = dom_tree_to_timespec (node);
- if (!dom_tree_valid_timespec(&tm, node->name)) return FALSE;
+ if (!dom_tree_valid_timespec (&tm, node->name)) return FALSE;
- func(trn, &tm);
+ func (trn, &tm);
return TRUE;
}
static gboolean
-trn_id_handler(xmlNodePtr node, gpointer trans_pdata)
+trn_id_handler (xmlNodePtr node, gpointer trans_pdata)
{
- struct trans_pdata *pdata = static_cast<decltype(pdata)>(trans_pdata);
- Transaction *trn = pdata->trans;
- GncGUID *tmp = dom_tree_to_guid(node);
+ struct trans_pdata* pdata = static_cast<decltype (pdata)> (trans_pdata);
+ Transaction* trn = pdata->trans;
+ GncGUID* tmp = dom_tree_to_guid (node);
- g_return_val_if_fail(tmp, FALSE);
+ g_return_val_if_fail (tmp, FALSE);
- xaccTransSetGUID((Transaction*)trn, tmp);
+ xaccTransSetGUID ((Transaction*)trn, tmp);
- g_free(tmp);
+ g_free (tmp);
return TRUE;
}
static gboolean
-trn_currency_handler(xmlNodePtr node, gpointer trans_pdata)
+trn_currency_handler (xmlNodePtr node, gpointer trans_pdata)
{
- struct trans_pdata *pdata = static_cast<decltype(pdata)>(trans_pdata);
- Transaction *trn = pdata->trans;
- gnc_commodity *ref;
+ struct trans_pdata* pdata = static_cast<decltype (pdata)> (trans_pdata);
+ Transaction* trn = pdata->trans;
+ gnc_commodity* ref;
- ref = dom_tree_to_commodity_ref(node, pdata->book);
- xaccTransSetCurrency(trn, ref);
+ ref = dom_tree_to_commodity_ref (node, pdata->book);
+ xaccTransSetCurrency (trn, ref);
return TRUE;
}
static gboolean
-trn_num_handler(xmlNodePtr node, gpointer trans_pdata)
+trn_num_handler (xmlNodePtr node, gpointer trans_pdata)
{
- struct trans_pdata *pdata = static_cast<decltype(pdata)>(trans_pdata);
- Transaction *trn = pdata->trans;
+ struct trans_pdata* pdata = static_cast<decltype (pdata)> (trans_pdata);
+ Transaction* trn = pdata->trans;
- return set_tran_string(node, trn, xaccTransSetNum);
+ return set_tran_string (node, trn, xaccTransSetNum);
}
static gboolean
-trn_date_posted_handler(xmlNodePtr node, gpointer trans_pdata)
+trn_date_posted_handler (xmlNodePtr node, gpointer trans_pdata)
{
- struct trans_pdata *pdata = static_cast<decltype(pdata)>(trans_pdata);
- Transaction *trn = pdata->trans;
+ struct trans_pdata* pdata = static_cast<decltype (pdata)> (trans_pdata);
+ Transaction* trn = pdata->trans;
- return set_tran_date(node, trn, xaccTransSetDatePostedTS);
+ return set_tran_date (node, trn, xaccTransSetDatePostedTS);
}
static gboolean
-trn_date_entered_handler(xmlNodePtr node, gpointer trans_pdata)
+trn_date_entered_handler (xmlNodePtr node, gpointer trans_pdata)
{
- struct trans_pdata *pdata = static_cast<decltype(pdata)>(trans_pdata);
- Transaction *trn = pdata->trans;
+ struct trans_pdata* pdata = static_cast<decltype (pdata)> (trans_pdata);
+ Transaction* trn = pdata->trans;
- return set_tran_date(node, trn, xaccTransSetDateEnteredTS);
+ return set_tran_date (node, trn, xaccTransSetDateEnteredTS);
}
static gboolean
-trn_description_handler(xmlNodePtr node, gpointer trans_pdata)
+trn_description_handler (xmlNodePtr node, gpointer trans_pdata)
{
- struct trans_pdata *pdata = static_cast<decltype(pdata)>(trans_pdata);
- Transaction *trn = pdata->trans;
+ struct trans_pdata* pdata = static_cast<decltype (pdata)> (trans_pdata);
+ Transaction* trn = pdata->trans;
- return set_tran_string(node, trn, xaccTransSetDescription);
+ return set_tran_string (node, trn, xaccTransSetDescription);
}
static gboolean
-trn_slots_handler(xmlNodePtr node, gpointer trans_pdata)
+trn_slots_handler (xmlNodePtr node, gpointer trans_pdata)
{
- struct trans_pdata *pdata = static_cast<decltype(pdata)>(trans_pdata);
- Transaction *trn = pdata->trans;
+ struct trans_pdata* pdata = static_cast<decltype (pdata)> (trans_pdata);
+ Transaction* trn = pdata->trans;
gboolean successful;
- successful = dom_tree_create_instance_slots(node, QOF_INSTANCE (trn));
+ successful = dom_tree_create_instance_slots (node, QOF_INSTANCE (trn));
- g_return_val_if_fail(successful, FALSE);
+ g_return_val_if_fail (successful, FALSE);
return TRUE;
}
static gboolean
-trn_splits_handler(xmlNodePtr node, gpointer trans_pdata)
+trn_splits_handler (xmlNodePtr node, gpointer trans_pdata)
{
- struct trans_pdata *pdata = static_cast<decltype(pdata)>(trans_pdata);
- Transaction *trn = pdata->trans;
+ struct trans_pdata* pdata = static_cast<decltype (pdata)> (trans_pdata);
+ Transaction* trn = pdata->trans;
xmlNodePtr mark;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(node->xmlChildrenNode, FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (node->xmlChildrenNode, FALSE);
for (mark = node->xmlChildrenNode; mark; mark = mark->next)
{
- Split *spl;
+ Split* spl;
- if (g_strcmp0("text", (char*)mark->name) == 0)
+ if (g_strcmp0 ("text", (char*)mark->name) == 0)
continue;
- if (g_strcmp0("trn:split", (char*)mark->name))
+ if (g_strcmp0 ("trn:split", (char*)mark->name))
{
return FALSE;
}
- spl = dom_tree_to_split(mark, pdata->book);
+ spl = dom_tree_to_split (mark, pdata->book);
if (spl)
{
- xaccTransAppendSplit(trn, spl);
+ xaccTransAppendSplit (trn, spl);
}
else
{
@@ -574,14 +574,14 @@ struct dom_tree_handler trn_dom_handlers[] =
};
static gboolean
-gnc_transaction_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_transaction_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Transaction *trn = NULL;
+ Transaction* trn = NULL;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
+ gxpf_data* gdata = (gxpf_data*)global_data;
if (parent_data)
{
@@ -595,47 +595,47 @@ gnc_transaction_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- trn = dom_tree_to_transaction(tree,
- static_cast<QofBook*>(gdata->bookdata));
+ trn = dom_tree_to_transaction (tree,
+ static_cast<QofBook*> (gdata->bookdata));
if (trn != NULL)
{
- gdata->cb(tag, gdata->parsedata, trn);
+ gdata->cb (tag, gdata->parsedata, trn);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return trn != NULL;
}
-Transaction *
-dom_tree_to_transaction( xmlNodePtr node, QofBook *book )
+Transaction*
+dom_tree_to_transaction (xmlNodePtr node, QofBook* book)
{
- Transaction *trn;
+ Transaction* trn;
gboolean successful;
struct trans_pdata pdata;
- g_return_val_if_fail(node, NULL);
- g_return_val_if_fail(book, NULL);
+ g_return_val_if_fail (node, NULL);
+ g_return_val_if_fail (book, NULL);
- trn = xaccMallocTransaction(book);
- g_return_val_if_fail(trn, NULL);
- xaccTransBeginEdit(trn);
+ trn = xaccMallocTransaction (book);
+ g_return_val_if_fail (trn, NULL);
+ xaccTransBeginEdit (trn);
pdata.trans = trn;
pdata.book = book;
- successful = dom_tree_generic_parse(node, trn_dom_handlers, &pdata);
+ successful = dom_tree_generic_parse (node, trn_dom_handlers, &pdata);
- xaccTransCommitEdit(trn);
+ xaccTransCommitEdit (trn);
- if ( !successful )
+ if (!successful)
{
- xmlElemDump(stdout, NULL, node);
- xaccTransBeginEdit(trn);
- xaccTransDestroy(trn);
- xaccTransCommitEdit(trn);
+ xmlElemDump (stdout, NULL, node);
+ xaccTransBeginEdit (trn);
+ xaccTransDestroy (trn);
+ xaccTransCommitEdit (trn);
trn = NULL;
}
@@ -643,7 +643,7 @@ dom_tree_to_transaction( xmlNodePtr node, QofBook *book )
}
sixtp*
-gnc_transaction_sixtp_parser_create(void)
+gnc_transaction_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_transaction_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_transaction_end_handler, NULL, NULL);
}
diff --git a/src/backend/xml/gnc-vendor-xml-v2.cpp b/src/backend/xml/gnc-vendor-xml-v2.cpp
index 41d3f13..f897502 100644
--- a/src/backend/xml/gnc-vendor-xml-v2.cpp
+++ b/src/backend/xml/gnc-vendor-xml-v2.cpp
@@ -50,11 +50,11 @@ extern "C"
#include "xml-helpers.h"
#include "gnc-bill-term-xml-v2.h"
-#define _GNC_MOD_NAME GNC_ID_VENDOR
+#define _GNC_MOD_NAME GNC_ID_VENDOR
static QofLogModule log_module = GNC_MOD_IO;
-const gchar *vendor_version_string = "2.0.0";
+const gchar* vendor_version_string = "2.0.0";
/* ids */
#define gnc_vendor_string "gnc:GncVendor"
@@ -72,56 +72,56 @@ const gchar *vendor_version_string = "2.0.0";
#define vendor_slots_string "vendor:slots"
static xmlNodePtr
-vendor_dom_tree_create (GncVendor *vendor)
+vendor_dom_tree_create (GncVendor* vendor)
{
xmlNodePtr ret;
- GncBillTerm *term;
- GncTaxTable *taxtable;
+ GncBillTerm* term;
+ GncTaxTable* taxtable;
- ret = xmlNewNode(NULL, BAD_CAST gnc_vendor_string);
- xmlSetProp(ret, BAD_CAST "version", BAD_CAST vendor_version_string);
+ ret = xmlNewNode (NULL, BAD_CAST gnc_vendor_string);
+ xmlSetProp (ret, BAD_CAST "version", BAD_CAST vendor_version_string);
- xmlAddChild(ret, guid_to_dom_tree(vendor_guid_string,
- qof_instance_get_guid (QOF_INSTANCE(vendor))));
+ xmlAddChild (ret, guid_to_dom_tree (vendor_guid_string,
+ qof_instance_get_guid (QOF_INSTANCE (vendor))));
- xmlAddChild(ret, text_to_dom_tree(vendor_name_string,
- gncVendorGetName (vendor)));
+ xmlAddChild (ret, text_to_dom_tree (vendor_name_string,
+ gncVendorGetName (vendor)));
- xmlAddChild(ret, text_to_dom_tree(vendor_id_string,
- gncVendorGetID (vendor)));
+ xmlAddChild (ret, text_to_dom_tree (vendor_id_string,
+ gncVendorGetID (vendor)));
- xmlAddChild(ret, gnc_address_to_dom_tree(vendor_addr_string,
- gncVendorGetAddr (vendor)));
+ xmlAddChild (ret, gnc_address_to_dom_tree (vendor_addr_string,
+ gncVendorGetAddr (vendor)));
maybe_add_string (ret, vendor_notes_string, gncVendorGetNotes (vendor));
term = gncVendorGetTerms (vendor);
if (term)
- xmlAddChild(ret, guid_to_dom_tree(vendor_terms_string,
- qof_instance_get_guid(QOF_INSTANCE(term))));
+ xmlAddChild (ret, guid_to_dom_tree (vendor_terms_string,
+ qof_instance_get_guid (QOF_INSTANCE (term))));
- xmlAddChild(ret, text_to_dom_tree(vendor_taxincluded_string,
- gncTaxIncludedTypeToString (
- gncVendorGetTaxIncluded (vendor))));
+ xmlAddChild (ret, text_to_dom_tree (vendor_taxincluded_string,
+ gncTaxIncludedTypeToString (
+ gncVendorGetTaxIncluded (vendor))));
- xmlAddChild(ret, int_to_dom_tree(vendor_active_string,
- gncVendorGetActive (vendor)));
+ xmlAddChild (ret, int_to_dom_tree (vendor_active_string,
+ gncVendorGetActive (vendor)));
xmlAddChild
(ret,
- commodity_ref_to_dom_tree(vendor_currency_string,
- gncVendorGetCurrency (vendor)));
+ commodity_ref_to_dom_tree (vendor_currency_string,
+ gncVendorGetCurrency (vendor)));
xmlAddChild (ret, int_to_dom_tree (vendor_taxtableoverride_string,
gncVendorGetTaxTableOverride (vendor)));
taxtable = gncVendorGetTaxTable (vendor);
if (taxtable)
xmlAddChild (ret, guid_to_dom_tree (vendor_taxtable_string,
- qof_instance_get_guid(QOF_INSTANCE(taxtable))));
+ qof_instance_get_guid (QOF_INSTANCE (taxtable))));
/* xmlAddChild won't do anything with a NULL, so tests are superfluous. */
- xmlAddChild(ret, qof_instance_slots_to_dom_tree(vendor_slots_string,
- QOF_INSTANCE(vendor)));
+ xmlAddChild (ret, qof_instance_slots_to_dom_tree (vendor_slots_string,
+ QOF_INSTANCE (vendor)));
return ret;
}
@@ -129,34 +129,34 @@ vendor_dom_tree_create (GncVendor *vendor)
struct vendor_pdata
{
- GncVendor *vendor;
- QofBook *book;
+ GncVendor* vendor;
+ QofBook* book;
};
static gboolean
-set_string(xmlNodePtr node, GncVendor* vendor,
- void (*func)(GncVendor *vendor, const char *txt))
+set_string (xmlNodePtr node, GncVendor* vendor,
+ void (*func) (GncVendor* vendor, const char* txt))
{
- char* txt = dom_tree_to_text(node);
- g_return_val_if_fail(txt, FALSE);
+ char* txt = dom_tree_to_text (node);
+ g_return_val_if_fail (txt, FALSE);
- func(vendor, txt);
+ func (vendor, txt);
- g_free(txt);
+ g_free (txt);
return TRUE;
}
static gboolean
-set_boolean(xmlNodePtr node, GncVendor* vendor,
- void (*func)(GncVendor* vendor, gboolean b))
+set_boolean (xmlNodePtr node, GncVendor* vendor,
+ void (*func) (GncVendor* vendor, gboolean b))
{
gint64 val;
gboolean ret;
- ret = dom_tree_to_integer(node, &val);
+ ret = dom_tree_to_integer (node, &val);
if (ret)
- func(vendor, (gboolean)val);
+ func (vendor, (gboolean)val);
return ret;
}
@@ -164,20 +164,20 @@ set_boolean(xmlNodePtr node, GncVendor* vendor,
static gboolean
vendor_name_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
- return set_string(node, pdata->vendor, gncVendorSetName);
+ return set_string (node, pdata->vendor, gncVendorSetName);
}
static gboolean
vendor_guid_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
- GncGUID *guid;
- GncVendor *vendor;
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
+ GncGUID* guid;
+ GncVendor* vendor;
- guid = dom_tree_to_guid(node);
- g_return_val_if_fail(guid, FALSE);
+ guid = dom_tree_to_guid (node);
+ g_return_val_if_fail (guid, FALSE);
vendor = gncVendorLookup (pdata->book, guid);
if (vendor)
{
@@ -187,10 +187,10 @@ vendor_guid_handler (xmlNodePtr node, gpointer vendor_pdata)
}
else
{
- gncVendorSetGUID(pdata->vendor, guid);
+ gncVendorSetGUID (pdata->vendor, guid);
}
- g_free(guid);
+ g_free (guid);
return TRUE;
}
@@ -198,30 +198,30 @@ vendor_guid_handler (xmlNodePtr node, gpointer vendor_pdata)
static gboolean
vendor_id_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
- return set_string(node, pdata->vendor, gncVendorSetID);
+ return set_string (node, pdata->vendor, gncVendorSetID);
}
static gboolean
vendor_notes_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
- return set_string(node, pdata->vendor, gncVendorSetNotes);
+ return set_string (node, pdata->vendor, gncVendorSetNotes);
}
static gboolean
vendor_terms_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
- GncGUID *guid;
- GncBillTerm *term;
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
+ GncGUID* guid;
+ GncBillTerm* term;
- guid = dom_tree_to_guid(node);
+ guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
- term = gnc_billterm_xml_find_or_create(pdata->book, guid);
- g_assert(term);
+ term = gnc_billterm_xml_find_or_create (pdata->book, guid);
+ g_assert (term);
g_free (guid);
gncVendorSetTerms (pdata->vendor, term);
@@ -231,17 +231,17 @@ vendor_terms_handler (xmlNodePtr node, gpointer vendor_pdata)
static gboolean
vendor_addr_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
- return gnc_dom_tree_to_address (node, gncVendorGetAddr(pdata->vendor));
+ return gnc_dom_tree_to_address (node, gncVendorGetAddr (pdata->vendor));
}
static gboolean
vendor_taxincluded_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
GncTaxIncluded type;
- char *str;
+ char* str;
gboolean ret;
str = dom_tree_to_text (node);
@@ -251,7 +251,7 @@ vendor_taxincluded_handler (xmlNodePtr node, gpointer vendor_pdata)
g_free (str);
if (ret)
- gncVendorSetTaxIncluded(pdata->vendor, type);
+ gncVendorSetTaxIncluded (pdata->vendor, type);
return ret;
}
@@ -259,17 +259,17 @@ vendor_taxincluded_handler (xmlNodePtr node, gpointer vendor_pdata)
static gboolean
vendor_active_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
return set_boolean (node, pdata->vendor, gncVendorSetActive);
}
static gboolean
vendor_currency_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
- gnc_commodity *com;
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
+ gnc_commodity* com;
- com = dom_tree_to_commodity_ref(node, pdata->book);
+ com = dom_tree_to_commodity_ref (node, pdata->book);
g_return_val_if_fail (com, FALSE);
gncVendorSetCurrency (pdata->vendor, com);
@@ -280,9 +280,9 @@ vendor_currency_handler (xmlNodePtr node, gpointer vendor_pdata)
static gboolean
vendor_taxtable_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
- GncGUID *guid;
- GncTaxTable *taxtable;
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
+ GncGUID* guid;
+ GncTaxTable* taxtable;
guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE);
@@ -298,22 +298,22 @@ vendor_taxtable_handler (xmlNodePtr node, gpointer vendor_pdata)
gncTaxTableDecRef (taxtable);
gncVendorSetTaxTable (pdata->vendor, taxtable);
- g_free(guid);
+ g_free (guid);
return TRUE;
}
static gboolean
vendor_taxtableoverride_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
return set_boolean (node, pdata->vendor, gncVendorSetTaxTableOverride);
}
static gboolean
vendor_slots_handler (xmlNodePtr node, gpointer vendor_pdata)
{
- struct vendor_pdata *pdata = static_cast<decltype(pdata)>(vendor_pdata);
- return dom_tree_create_instance_slots(node, QOF_INSTANCE(pdata->vendor));
+ struct vendor_pdata* pdata = static_cast<decltype (pdata)> (vendor_pdata);
+ return dom_tree_create_instance_slots (node, QOF_INSTANCE (pdata->vendor));
}
@@ -336,12 +336,12 @@ static struct dom_tree_handler vendor_handlers_v2[] =
};
static GncVendor*
-dom_tree_to_vendor (xmlNodePtr node, QofBook *book)
+dom_tree_to_vendor (xmlNodePtr node, QofBook* book)
{
struct vendor_pdata vendor_pdata;
gboolean successful;
- vendor_pdata.vendor = gncVendorCreate(book);
+ vendor_pdata.vendor = gncVendorCreate (book);
vendor_pdata.book = book;
gncVendorBeginEdit (vendor_pdata.vendor);
@@ -361,15 +361,15 @@ dom_tree_to_vendor (xmlNodePtr node, QofBook *book)
}
static gboolean
-gnc_vendor_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_vendor_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncVendor *vendor;
+ GncVendor* vendor;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- QofBook *book = static_cast<decltype(book)>(gdata->bookdata);
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ QofBook* book = static_cast<decltype (book)> (gdata->bookdata);
if (parent_data)
{
@@ -383,29 +383,29 @@ gnc_vendor_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
- vendor = dom_tree_to_vendor(tree, book);
+ vendor = dom_tree_to_vendor (tree, book);
if (vendor != NULL)
{
- gdata->cb(tag, gdata->parsedata, vendor);
+ gdata->cb (tag, gdata->parsedata, vendor);
}
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return vendor != NULL;
}
-static sixtp *
-vendor_sixtp_parser_create(void)
+static sixtp*
+vendor_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_vendor_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_vendor_end_handler, NULL, NULL);
}
static gboolean
-vendor_should_be_saved (GncVendor *vendor)
+vendor_should_be_saved (GncVendor* vendor)
{
- const char *id;
+ const char* id;
/* make sure this is a valid vendor before we save it -- should have an ID */
id = gncVendorGetID (vendor);
@@ -416,15 +416,15 @@ vendor_should_be_saved (GncVendor *vendor)
}
static void
-do_count (QofInstance * vendor_p, gpointer count_p)
+do_count (QofInstance* vendor_p, gpointer count_p)
{
- int *count = static_cast<decltype(count)>(count_p);
- if (vendor_should_be_saved ((GncVendor *)vendor_p))
+ int* count = static_cast<decltype (count)> (count_p);
+ if (vendor_should_be_saved ((GncVendor*)vendor_p))
(*count)++;
}
static int
-vendor_get_count (QofBook *book)
+vendor_get_count (QofBook* book)
{
int count = 0;
qof_object_foreach (_GNC_MOD_NAME, book, do_count, (gpointer) &count);
@@ -432,36 +432,37 @@ vendor_get_count (QofBook *book)
}
static void
-xml_add_vendor (QofInstance * vendor_p, gpointer out_p)
+xml_add_vendor (QofInstance* vendor_p, gpointer out_p)
{
xmlNodePtr node;
- GncVendor *vendor = (GncVendor *) vendor_p;
- FILE *out = static_cast<decltype(out)>(out_p);
+ GncVendor* vendor = (GncVendor*) vendor_p;
+ FILE* out = static_cast<decltype (out)> (out_p);
- if (ferror(out))
+ if (ferror (out))
return;
if (!vendor_should_be_saved (vendor))
return;
node = vendor_dom_tree_create (vendor);
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return;
}
static gboolean
-vendor_write (FILE *out, QofBook *book)
+vendor_write (FILE* out, QofBook* book)
{
- qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_vendor, (gpointer) out);
- return ferror(out) == 0;
+ qof_object_foreach_sorted (_GNC_MOD_NAME, book, xml_add_vendor,
+ (gpointer) out);
+ return ferror (out) == 0;
}
static gboolean
-vendor_ns(FILE *out)
+vendor_ns (FILE* out)
{
- g_return_val_if_fail(out, FALSE);
- return gnc_xml2_write_namespace_decl(out, "vendor");
+ g_return_val_if_fail (out, FALSE);
+ return gnc_xml2_write_namespace_decl (out, "vendor");
}
void
@@ -472,10 +473,10 @@ gnc_vendor_xml_initialize (void)
GNC_FILE_BACKEND_VERS,
gnc_vendor_string,
vendor_sixtp_parser_create,
- NULL, /* add_item */
+ NULL, /* add_item */
vendor_get_count,
vendor_write,
- NULL, /* scrub */
+ NULL, /* scrub */
vendor_ns,
};
diff --git a/src/backend/xml/gnc-xml-helper.cpp b/src/backend/xml/gnc-xml-helper.cpp
index 4dfb050..61df6c2 100644
--- a/src/backend/xml/gnc-xml-helper.cpp
+++ b/src/backend/xml/gnc-xml-helper.cpp
@@ -29,13 +29,13 @@ extern "C"
#include "gnc-xml-helper.h"
xmlChar*
-checked_char_cast (gchar *val)
+checked_char_cast (gchar* val)
{
const int length = -1; /* Assumes val is null-terminated */
- gchar *end;
+ gchar* end;
if (val == NULL) return NULL;
/* Replace any invalid UTF-8 characters with a sequence of '?' */
- while (!g_utf8_validate (val, length, (const gchar**)(&end)))
+ while (!g_utf8_validate (val, length, (const gchar**) (&end)))
*end = '?';
/* Replace any invalid (for XML) control characters (everything < 0x20
* except \n, \t, and \r) with '?'. Technically we should replace
@@ -44,9 +44,9 @@ checked_char_cast (gchar *val)
* would use intentionally use one of these characters anyway.
*/
- for (end = val; *end; ++end)
- if (*end > 0 && *end < 0x20 && *end != 0x09 &&
- *end != 0x0a && *end != 0x0d)
- *end = '?';
- return (xmlChar*)(val);
+ for (end = val; *end; ++end)
+ if (*end > 0 && *end < 0x20 && *end != 0x09 &&
+ *end != 0x0a && *end != 0x0d)
+ *end = '?';
+ return (xmlChar*) (val);
}
diff --git a/src/backend/xml/gnc-xml-helper.h b/src/backend/xml/gnc-xml-helper.h
index db9657d..601f89b 100644
--- a/src/backend/xml/gnc-xml-helper.h
+++ b/src/backend/xml/gnc-xml-helper.h
@@ -44,6 +44,6 @@ extern "C"
# define xmlAttrPropertyValue children
# endif /* ifndef xmlAttrPropertyValue */
-xmlChar* checked_char_cast (gchar *val);
+xmlChar* checked_char_cast (gchar* val);
#endif /* _GNC_XML_HELPER_H_ */
diff --git a/src/backend/xml/gnc-xml.h b/src/backend/xml/gnc-xml.h
index 58080b0..164a124 100644
--- a/src/backend/xml/gnc-xml.h
+++ b/src/backend/xml/gnc-xml.h
@@ -36,35 +36,35 @@ extern "C"
#include "gnc-xml-helper.h"
#include "sixtp.h"
-xmlNodePtr gnc_account_dom_tree_create(Account *act, gboolean exporting,
- gboolean allow_incompat);
-sixtp* gnc_account_sixtp_parser_create(void);
+xmlNodePtr gnc_account_dom_tree_create (Account* act, gboolean exporting,
+ gboolean allow_incompat);
+sixtp* gnc_account_sixtp_parser_create (void);
-xmlNodePtr gnc_book_dom_tree_create(QofBook *book);
-sixtp* gnc_book_sixtp_parser_create(void);
-sixtp* gnc_book_id_sixtp_parser_create(void);
-sixtp* gnc_book_slots_sixtp_parser_create(void);
+xmlNodePtr gnc_book_dom_tree_create (QofBook* book);
+sixtp* gnc_book_sixtp_parser_create (void);
+sixtp* gnc_book_id_sixtp_parser_create (void);
+sixtp* gnc_book_slots_sixtp_parser_create (void);
-xmlNodePtr gnc_commodity_dom_tree_create(const gnc_commodity *com);
-sixtp* gnc_commodity_sixtp_parser_create(void);
+xmlNodePtr gnc_commodity_dom_tree_create (const gnc_commodity* com);
+sixtp* gnc_commodity_sixtp_parser_create (void);
-sixtp* gnc_freqSpec_sixtp_parser_create(void);
+sixtp* gnc_freqSpec_sixtp_parser_create (void);
-xmlNodePtr gnc_lot_dom_tree_create(GNCLot *);
-sixtp* gnc_lot_sixtp_parser_create(void);
+xmlNodePtr gnc_lot_dom_tree_create (GNCLot*);
+sixtp* gnc_lot_sixtp_parser_create (void);
-xmlNodePtr gnc_pricedb_dom_tree_create(GNCPriceDB *db);
-sixtp* gnc_pricedb_sixtp_parser_create(void);
+xmlNodePtr gnc_pricedb_dom_tree_create (GNCPriceDB* db);
+sixtp* gnc_pricedb_sixtp_parser_create (void);
-xmlNodePtr gnc_schedXaction_dom_tree_create( SchedXaction *sx );
-sixtp* gnc_schedXaction_sixtp_parser_create(void);
+xmlNodePtr gnc_schedXaction_dom_tree_create (SchedXaction* sx);
+sixtp* gnc_schedXaction_sixtp_parser_create (void);
-xmlNodePtr gnc_budget_dom_tree_create( GncBudget *bgt );
-sixtp* gnc_budget_sixtp_parser_create(void);
+xmlNodePtr gnc_budget_dom_tree_create (GncBudget* bgt);
+sixtp* gnc_budget_sixtp_parser_create (void);
-xmlNodePtr gnc_transaction_dom_tree_create(Transaction *txn);
-sixtp* gnc_transaction_sixtp_parser_create(void);
+xmlNodePtr gnc_transaction_dom_tree_create (Transaction* txn);
+sixtp* gnc_transaction_sixtp_parser_create (void);
-sixtp* gnc_template_transaction_sixtp_parser_create(void);
+sixtp* gnc_template_transaction_sixtp_parser_create (void);
#endif /* GNC_XML_H */
diff --git a/src/backend/xml/gncmod-backend-xml.cpp b/src/backend/xml/gncmod-backend-xml.cpp
index 4c8b68c..ddf6d1e 100644
--- a/src/backend/xml/gncmod-backend-xml.cpp
+++ b/src/backend/xml/gncmod-backend-xml.cpp
@@ -28,57 +28,57 @@ extern "C"
{
#include <stdio.h>
#include <gmodule.h>
-/* #include <glib-gobject.h> */
+ /* #include <glib-gobject.h> */
#include "gnc-module.h"
#include "gnc-module-api.h"
-GNC_MODULE_API_DECL(libgncmod_backend_file)
+ GNC_MODULE_API_DECL (libgncmod_backend_file)
-/* version of the gnc module system interface we require */
-int libgnc_backend_file_utils_gnc_module_system_interface = 0;
+ /* version of the gnc module system interface we require */
+ int libgnc_backend_file_utils_gnc_module_system_interface = 0;
-/* module versioning uses libtool semantics. */
-int libgncmod_backend_file_gnc_module_current = 0;
-int libgncmod_backend_file_gnc_module_revision = 0;
-int libgncmod_backend_file_gnc_module_age = 0;
+ /* module versioning uses libtool semantics. */
+ int libgncmod_backend_file_gnc_module_current = 0;
+ int libgncmod_backend_file_gnc_module_revision = 0;
+ int libgncmod_backend_file_gnc_module_age = 0;
-static GNCModule engine;
+ static GNCModule engine;
-char *
-libgncmod_backend_file_gnc_module_path(void)
-{
- return g_strdup("gnucash/backend/file");
-}
+ char*
+ libgncmod_backend_file_gnc_module_path (void)
+ {
+ return g_strdup ("gnucash/backend/file");
+ }
-char *
-libgncmod_backend_file_gnc_module_description(void)
-{
- return g_strdup("The binary and XML (v1 and v2) backends for GnuCash");
-}
+ char*
+ libgncmod_backend_file_gnc_module_description (void)
+ {
+ return g_strdup ("The binary and XML (v1 and v2) backends for GnuCash");
+ }
-int
-libgncmod_backend_file_gnc_module_init(int refcount)
-{
- engine = gnc_module_load("gnucash/engine", 0);
- if (!engine) return FALSE;
+ int
+ libgncmod_backend_file_gnc_module_init (int refcount)
+ {
+ engine = gnc_module_load ("gnucash/engine", 0);
+ if (!engine) return FALSE;
- return TRUE;
-}
+ return TRUE;
+ }
-int
-libgncmod_backend_file_gnc_module_end(int refcount)
-{
- int unload = TRUE;
+ int
+ libgncmod_backend_file_gnc_module_end (int refcount)
+ {
+ int unload = TRUE;
- if (engine)
- unload = libgnc_backend_file_utils_gnc_module_unload(engine);
+ if (engine)
+ unload = libgnc_backend_file_utils_gnc_module_unload (engine);
- if (refcount == 0)
- engine = NULL;
+ if (refcount == 0)
+ engine = NULL;
- return unload;
-}
+ return unload;
+ }
} //extern "C"
diff --git a/src/backend/xml/io-example-account.cpp b/src/backend/xml/io-example-account.cpp
index e72e7b0..c024d6a 100644
--- a/src/backend/xml/io-example-account.cpp
+++ b/src/backend/xml/io-example-account.cpp
@@ -74,50 +74,50 @@ static QofLogModule log_module = GNC_MOD_IO;
#define GNC_ACCOUNT_SELECTED "gnc-act:start-selected"
void
-gnc_destroy_example_account(GncExampleAccount *gea)
+gnc_destroy_example_account (GncExampleAccount* gea)
{
if (gea->title != NULL)
{
- g_free(gea->title);
+ g_free (gea->title);
gea->title = NULL;
}
if (gea->filename != NULL)
{
- g_free(gea->filename);
+ g_free (gea->filename);
gea->filename = NULL;
}
if (gea->root != NULL)
{
xaccAccountBeginEdit (gea->root);
- xaccAccountDestroy(gea->root);
+ xaccAccountDestroy (gea->root);
gea->root = NULL;
}
if (gea->short_description != NULL)
{
- g_free(gea->short_description);
+ g_free (gea->short_description);
gea->short_description = NULL;
}
if (gea->long_description != NULL)
{
- g_free(gea->long_description);
+ g_free (gea->long_description);
gea->long_description = NULL;
}
if (gea->book != NULL)
{
- qof_book_destroy(gea->book);
+ qof_book_destroy (gea->book);
gea->book = NULL;
}
- g_free(gea);
+ g_free (gea);
}
static void
-clear_up_account_commodity(
- gnc_commodity_table *tbl, Account *act,
- gnc_commodity * (*getter) (const Account *account),
- void (*setter) (Account *account, gnc_commodity *comm))
+clear_up_account_commodity (
+ gnc_commodity_table* tbl, Account* act,
+ gnc_commodity * (*getter) (const Account* account),
+ void (*setter) (Account* account, gnc_commodity* comm))
{
- gnc_commodity *gcom;
- gnc_commodity *com = getter(act);
+ gnc_commodity* gcom;
+ gnc_commodity* com = getter (act);
if (!com)
{
@@ -126,9 +126,9 @@ clear_up_account_commodity(
g_return_if_fail (tbl != NULL);
- gcom = gnc_commodity_table_lookup(tbl,
- gnc_commodity_get_namespace(com),
- gnc_commodity_get_mnemonic(com));
+ gcom = gnc_commodity_table_lookup (tbl,
+ gnc_commodity_get_namespace (com),
+ gnc_commodity_get_mnemonic (com));
if (gcom == com)
{
@@ -136,69 +136,69 @@ clear_up_account_commodity(
}
else if (!gcom)
{
- PWARN("unable to find global commodity for %s adding new",
- gnc_commodity_get_unique_name(com));
- gnc_commodity_table_insert(tbl, com);
+ PWARN ("unable to find global commodity for %s adding new",
+ gnc_commodity_get_unique_name (com));
+ gnc_commodity_table_insert (tbl, com);
}
else
{
- setter(act, gcom);
- gnc_commodity_destroy(com);
+ setter (act, gcom);
+ gnc_commodity_destroy (com);
}
}
static void
-add_account_local(GncExampleAccount *gea, Account *act)
+add_account_local (GncExampleAccount* gea, Account* act)
{
- gnc_commodity_table *table;
+ gnc_commodity_table* table;
table = gnc_commodity_table_get_table (gea->book);
- clear_up_account_commodity(table, act,
- xaccAccountGetCommodity,
- xaccAccountSetCommodity);
+ clear_up_account_commodity (table, act,
+ xaccAccountGetCommodity,
+ xaccAccountSetCommodity);
xaccAccountScrubCommodity (act);
- if (xaccAccountGetType(act) == ACCT_TYPE_ROOT)
+ if (xaccAccountGetType (act) == ACCT_TYPE_ROOT)
{
gea->root = act;
}
- else if (!gnc_account_get_parent(act))
+ else if (!gnc_account_get_parent (act))
{
if (!gea->root)
{
- g_warning("The example account file should declared a ROOT "
- "account before declaring any other accounts.");
- gea->root = gnc_book_get_root_account(gea->book);
+ g_warning ("The example account file should declared a ROOT "
+ "account before declaring any other accounts.");
+ gea->root = gnc_book_get_root_account (gea->book);
}
- gnc_account_append_child(gea->root, act);
+ gnc_account_append_child (gea->root, act);
}
}
static gboolean
-generic_callback(const char *tag, gpointer globaldata, gpointer data)
+generic_callback (const char* tag, gpointer globaldata, gpointer data)
{
- GncExampleAccount *gea = (GncExampleAccount*)globaldata;
+ GncExampleAccount* gea = (GncExampleAccount*)globaldata;
- if (g_strcmp0(tag, "gnc:account") == 0)
+ if (g_strcmp0 (tag, "gnc:account") == 0)
{
- add_account_local(gea, (Account*)data);
+ add_account_local (gea, (Account*)data);
}
return TRUE;
}
static char*
-squash_extra_whitespace(char *text)
+squash_extra_whitespace (char* text)
{
int spot;
- int length = strlen(text);
+ int length = strlen (text);
for (spot = 1; spot < length; spot++)
{
- if (isspace(text[spot]) && isspace(text[spot - 1]))
+ if (isspace (text[spot]) && isspace (text[spot - 1]))
{
- memmove(text + spot, text + spot + 1, length - spot + 1);
+ memmove (text + spot, text + spot + 1, length - spot + 1);
length--;
}
else
@@ -210,59 +210,59 @@ squash_extra_whitespace(char *text)
}
static char*
-grab_clean_string(xmlNodePtr tree)
+grab_clean_string (xmlNodePtr tree)
{
- return squash_extra_whitespace(g_strstrip(dom_tree_to_text(tree)));
+ return squash_extra_whitespace (g_strstrip (dom_tree_to_text (tree)));
}
static gboolean
-gnc_short_descrip_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_short_descrip_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncExampleAccount *gea =
- (GncExampleAccount*)((gxpf_data*)global_data)->parsedata;
+ GncExampleAccount* gea =
+ (GncExampleAccount*) ((gxpf_data*)global_data)->parsedata;
- gea->short_description = grab_clean_string((xmlNodePtr)data_for_children);
+ gea->short_description = grab_clean_string ((xmlNodePtr)data_for_children);
return TRUE;
}
static sixtp*
-gnc_short_descrip_sixtp_parser_create(void)
+gnc_short_descrip_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_short_descrip_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_short_descrip_end_handler, NULL, NULL);
}
static gboolean
-gnc_long_descrip_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_long_descrip_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncExampleAccount *gea =
- (GncExampleAccount*)((gxpf_data*)global_data)->parsedata;
+ GncExampleAccount* gea =
+ (GncExampleAccount*) ((gxpf_data*)global_data)->parsedata;
- gea->long_description = grab_clean_string((xmlNodePtr)data_for_children);
+ gea->long_description = grab_clean_string ((xmlNodePtr)data_for_children);
return TRUE;
}
static sixtp*
-gnc_long_descrip_sixtp_parser_create(void)
+gnc_long_descrip_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_long_descrip_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_long_descrip_end_handler, NULL, NULL);
}
static gboolean
-gnc_excludep_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_excludep_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncExampleAccount *gea =
- (GncExampleAccount*)((gxpf_data*)global_data)->parsedata;
+ GncExampleAccount* gea =
+ (GncExampleAccount*) ((gxpf_data*)global_data)->parsedata;
gint64 val = 0;
dom_tree_to_integer ((xmlNodePtr)data_for_children, &val);
@@ -272,19 +272,19 @@ gnc_excludep_end_handler(gpointer data_for_children,
}
static sixtp*
-gnc_excludep_sixtp_parser_create(void)
+gnc_excludep_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_excludep_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_excludep_end_handler, NULL, NULL);
}
static gboolean
-gnc_selected_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_selected_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncExampleAccount *gea =
- (GncExampleAccount*)((gxpf_data*)global_data)->parsedata;
+ GncExampleAccount* gea =
+ (GncExampleAccount*) ((gxpf_data*)global_data)->parsedata;
gint64 val = 0;
dom_tree_to_integer ((xmlNodePtr)data_for_children, &val);
@@ -294,78 +294,78 @@ gnc_selected_end_handler(gpointer data_for_children,
}
static sixtp*
-gnc_selected_sixtp_parser_create(void)
+gnc_selected_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_selected_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_selected_end_handler, NULL, NULL);
}
static gboolean
-gnc_title_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_title_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GncExampleAccount *gea =
- (GncExampleAccount*)((gxpf_data*)global_data)->parsedata;
+ GncExampleAccount* gea =
+ (GncExampleAccount*) ((gxpf_data*)global_data)->parsedata;
- gea->title = grab_clean_string((xmlNodePtr)data_for_children);
+ gea->title = grab_clean_string ((xmlNodePtr)data_for_children);
return TRUE;
}
static sixtp*
-gnc_titse_sixtp_parser_create(void)
+gnc_titse_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_title_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_title_end_handler, NULL, NULL);
}
GncExampleAccount*
-gnc_read_example_account(const gchar *filename)
+gnc_read_example_account (const gchar* filename)
{
- GncExampleAccount *gea;
- sixtp *top_parser;
- sixtp *main_parser;
+ GncExampleAccount* gea;
+ sixtp* top_parser;
+ sixtp* main_parser;
g_return_val_if_fail (filename != NULL, NULL);
- gea = g_new0(GncExampleAccount, 1);
+ gea = g_new0 (GncExampleAccount, 1);
- gea->book = qof_book_new();
- gea->filename = g_strdup(filename);
+ gea->book = qof_book_new ();
+ gea->filename = g_strdup (filename);
- top_parser = sixtp_new();
- main_parser = sixtp_new();
+ top_parser = sixtp_new ();
+ main_parser = sixtp_new ();
- if (!sixtp_add_some_sub_parsers(
- top_parser, TRUE,
- GNC_ACCOUNT_STRING, main_parser,
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ top_parser, TRUE,
+ GNC_ACCOUNT_STRING, main_parser,
+ NULL, NULL))
{
- gnc_destroy_example_account(gea);
+ gnc_destroy_example_account (gea);
return FALSE;
}
- if (!sixtp_add_some_sub_parsers(
- main_parser, TRUE,
- GNC_ACCOUNT_TITLE, gnc_titse_sixtp_parser_create(),
- GNC_ACCOUNT_SHORT, gnc_short_descrip_sixtp_parser_create(),
- GNC_ACCOUNT_LONG, gnc_long_descrip_sixtp_parser_create(),
- GNC_ACCOUNT_EXCLUDEP, gnc_excludep_sixtp_parser_create(),
- GNC_ACCOUNT_SELECTED, gnc_selected_sixtp_parser_create(),
- "gnc:account", gnc_account_sixtp_parser_create(),
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ main_parser, TRUE,
+ GNC_ACCOUNT_TITLE, gnc_titse_sixtp_parser_create (),
+ GNC_ACCOUNT_SHORT, gnc_short_descrip_sixtp_parser_create (),
+ GNC_ACCOUNT_LONG, gnc_long_descrip_sixtp_parser_create (),
+ GNC_ACCOUNT_EXCLUDEP, gnc_excludep_sixtp_parser_create (),
+ GNC_ACCOUNT_SELECTED, gnc_selected_sixtp_parser_create (),
+ "gnc:account", gnc_account_sixtp_parser_create (),
+ NULL, NULL))
{
- gnc_destroy_example_account(gea);
+ gnc_destroy_example_account (gea);
return FALSE;
}
- if (!gnc_xml_parse_file(top_parser, filename,
- generic_callback, gea, gea->book))
+ if (!gnc_xml_parse_file (top_parser, filename,
+ generic_callback, gea, gea->book))
{
- sixtp_destroy(top_parser);
+ sixtp_destroy (top_parser);
xaccLogEnable ();
- gnc_destroy_example_account(gea);
+ gnc_destroy_example_account (gea);
return FALSE;
}
@@ -373,61 +373,61 @@ gnc_read_example_account(const gchar *filename)
}
static void
-write_string_part(FILE *out, const char *tag, const char *data)
+write_string_part (FILE* out, const char* tag, const char* data)
{
xmlNodePtr node;
- node = text_to_dom_tree(tag, data);
+ node = text_to_dom_tree (tag, data);
- xmlElemDump(out, NULL, node);
- fprintf(out, "\n");
+ xmlElemDump (out, NULL, node);
+ fprintf (out, "\n");
- xmlFreeNode(node);
+ xmlFreeNode (node);
}
static void
-write_bool_part(FILE *out, const char *tag, gboolean data)
+write_bool_part (FILE* out, const char* tag, gboolean data)
{
xmlNodePtr node;
- node = int_to_dom_tree(tag, data);
+ node = int_to_dom_tree (tag, data);
- xmlElemDump(out, NULL, node);
- fprintf(out, "\n");
+ xmlElemDump (out, NULL, node);
+ fprintf (out, "\n");
- xmlFreeNode(node);
+ xmlFreeNode (node);
}
gboolean
-gnc_write_example_account(GncExampleAccount *gea, const gchar *filename)
+gnc_write_example_account (GncExampleAccount* gea, const gchar* filename)
{
- FILE *out;
+ FILE* out;
sixtp_gdv2 data = { 0 };;
- out = g_fopen(filename, "w");
+ out = g_fopen (filename, "w");
if (out == NULL)
{
return FALSE;
}
- fprintf(out, "<?xml version=\"1.0\"?>\n");
- fprintf(out, "<" GNC_ACCOUNT_STRING ">\n");
+ fprintf (out, "<?xml version=\"1.0\"?>\n");
+ fprintf (out, "<" GNC_ACCOUNT_STRING ">\n");
- write_string_part(out, GNC_ACCOUNT_TITLE, gea->title);
+ write_string_part (out, GNC_ACCOUNT_TITLE, gea->title);
- write_string_part(out, GNC_ACCOUNT_SHORT, gea->short_description);
+ write_string_part (out, GNC_ACCOUNT_SHORT, gea->short_description);
- write_string_part(out, GNC_ACCOUNT_LONG, gea->long_description);
+ write_string_part (out, GNC_ACCOUNT_LONG, gea->long_description);
- write_bool_part(out, GNC_ACCOUNT_EXCLUDEP, gea->exclude_from_select_all);
+ write_bool_part (out, GNC_ACCOUNT_EXCLUDEP, gea->exclude_from_select_all);
- write_account_tree(out, gea->root, &data);
+ write_account_tree (out, gea->root, &data);
- fprintf(out, "</" GNC_ACCOUNT_STRING ">\n\n");
+ fprintf (out, "</" GNC_ACCOUNT_STRING ">\n\n");
- write_emacs_trailer(out);
+ write_emacs_trailer (out);
- fclose(out);
+ fclose (out);
return TRUE;
@@ -436,33 +436,33 @@ gnc_write_example_account(GncExampleAccount *gea, const gchar *filename)
/***********************************************************************/
static void
-slist_destroy_example_account(gpointer data, gpointer user_data)
+slist_destroy_example_account (gpointer data, gpointer user_data)
{
if (data != NULL)
{
- gnc_destroy_example_account((GncExampleAccount*)data);
+ gnc_destroy_example_account ((GncExampleAccount*)data);
}
else
{
- PWARN("GncExampleAccount pointer in slist was NULL");
+ PWARN ("GncExampleAccount pointer in slist was NULL");
}
}
void
-gnc_free_example_account_list(GSList *list)
+gnc_free_example_account_list (GSList* list)
{
- g_slist_foreach(list, slist_destroy_example_account, NULL);
- g_slist_free(list);
+ g_slist_foreach (list, slist_destroy_example_account, NULL);
+ g_slist_free (list);
}
GSList*
-gnc_load_example_account_list(const char *dirname)
+gnc_load_example_account_list (const char* dirname)
{
- GSList *ret;
- GDir *dir;
- const gchar *direntry;
+ GSList* ret;
+ GDir* dir;
+ const gchar* direntry;
- dir = g_dir_open(dirname, 0, NULL);
+ dir = g_dir_open (dirname, 0, NULL);
if (dir == NULL)
{
@@ -471,34 +471,34 @@ gnc_load_example_account_list(const char *dirname)
ret = NULL;
- for (direntry = g_dir_read_name(dir); direntry != NULL;
- direntry = g_dir_read_name(dir))
+ for (direntry = g_dir_read_name (dir); direntry != NULL;
+ direntry = g_dir_read_name (dir))
{
- gchar *filename;
- GncExampleAccount *gea;
- if (!g_str_has_suffix(direntry, "xea"))
+ gchar* filename;
+ GncExampleAccount* gea;
+ if (!g_str_has_suffix (direntry, "xea"))
continue;
- filename = g_build_filename(dirname, direntry, (gchar*) NULL);
+ filename = g_build_filename (dirname, direntry, (gchar*) NULL);
- if (!g_file_test(filename, G_FILE_TEST_IS_DIR))
+ if (!g_file_test (filename, G_FILE_TEST_IS_DIR))
{
- gea = gnc_read_example_account(filename);
+ gea = gnc_read_example_account (filename);
if (gea == NULL)
{
- g_free(filename);
- gnc_free_example_account_list(ret);
- g_dir_close(dir);
+ g_free (filename);
+ gnc_free_example_account_list (ret);
+ g_dir_close (dir);
return NULL;
}
- ret = g_slist_append(ret, gea);
+ ret = g_slist_append (ret, gea);
}
- g_free(filename);
+ g_free (filename);
}
- g_dir_close(dir);
+ g_dir_close (dir);
return ret;
}
diff --git a/src/backend/xml/io-example-account.h b/src/backend/xml/io-example-account.h
index 9725836..3924ca2 100644
--- a/src/backend/xml/io-example-account.h
+++ b/src/backend/xml/io-example-account.h
@@ -34,26 +34,26 @@ extern "C"
struct GncExampleAccount_struct
{
- gchar *title;
- gchar *filename;
- QofBook *book;
- Account *root;
- gchar *short_description;
- gchar *long_description;
+ gchar* title;
+ gchar* filename;
+ QofBook* book;
+ Account* root;
+ gchar* short_description;
+ gchar* long_description;
gboolean exclude_from_select_all;
gboolean start_selected;
};
typedef struct GncExampleAccount_struct GncExampleAccount;
-void gnc_destroy_example_account(GncExampleAccount *gea);
+void gnc_destroy_example_account (GncExampleAccount* gea);
-gboolean gnc_write_example_account(GncExampleAccount *gea,
- const gchar *filename);
-GncExampleAccount *gnc_read_example_account(const gchar *filename);
+gboolean gnc_write_example_account (GncExampleAccount* gea,
+ const gchar* filename);
+GncExampleAccount* gnc_read_example_account (const gchar* filename);
-void gnc_free_example_account_list(GSList *list);
-GSList* gnc_load_example_account_list(const char *dirname);
+void gnc_free_example_account_list (GSList* list);
+GSList* gnc_load_example_account_list (const char* dirname);
#ifdef __cplusplus
}
#endif
diff --git a/src/backend/xml/io-gncxml-gen.cpp b/src/backend/xml/io-gncxml-gen.cpp
index 19ebe18..6accc4a 100644
--- a/src/backend/xml/io-gncxml-gen.cpp
+++ b/src/backend/xml/io-gncxml-gen.cpp
@@ -29,9 +29,9 @@ extern "C"
#include "io-gncxml-gen.h"
gboolean
-gnc_xml_parse_file(sixtp *top_parser, const char *filename,
- gxpf_callback callback, gpointer parsedata,
- gpointer bookdata)
+gnc_xml_parse_file (sixtp* top_parser, const char* filename,
+ gxpf_callback callback, gpointer parsedata,
+ gpointer bookdata)
{
gpointer parse_result = NULL;
gxpf_data gpdata;
@@ -40,14 +40,14 @@ gnc_xml_parse_file(sixtp *top_parser, const char *filename,
gpdata.parsedata = parsedata;
gpdata.bookdata = bookdata;
- return sixtp_parse_file(top_parser, filename,
- NULL, &gpdata, &parse_result);
+ return sixtp_parse_file (top_parser, filename,
+ NULL, &gpdata, &parse_result);
}
gboolean
-gnc_xml_parse_fd(sixtp *top_parser, FILE *fd,
- gxpf_callback callback, gpointer parsedata,
- gpointer bookdata)
+gnc_xml_parse_fd (sixtp* top_parser, FILE* fd,
+ gxpf_callback callback, gpointer parsedata,
+ gpointer bookdata)
{
gpointer parse_result = NULL;
gxpf_data gpdata;
@@ -56,6 +56,6 @@ gnc_xml_parse_fd(sixtp *top_parser, FILE *fd,
gpdata.parsedata = parsedata;
gpdata.bookdata = bookdata;
- return sixtp_parse_fd(top_parser, fd,
- NULL, &gpdata, &parse_result);
+ return sixtp_parse_fd (top_parser, fd,
+ NULL, &gpdata, &parse_result);
}
diff --git a/src/backend/xml/io-gncxml-gen.h b/src/backend/xml/io-gncxml-gen.h
index 2412b72..5ad7b8e 100644
--- a/src/backend/xml/io-gncxml-gen.h
+++ b/src/backend/xml/io-gncxml-gen.h
@@ -31,8 +31,8 @@ extern "C"
#include "sixtp.h"
-typedef gboolean (*gxpf_callback)(const char *tag, gpointer parsedata,
- gpointer data);
+typedef gboolean (*gxpf_callback) (const char* tag, gpointer parsedata,
+ gpointer data);
struct gxpf_data_struct
{
@@ -44,13 +44,13 @@ struct gxpf_data_struct
typedef struct gxpf_data_struct gxpf_data;
gboolean
-gnc_xml_parse_file(sixtp *top_parser, const char *filename,
- gxpf_callback callback, gpointer parsedata,
- gpointer bookdata);
+gnc_xml_parse_file (sixtp* top_parser, const char* filename,
+ gxpf_callback callback, gpointer parsedata,
+ gpointer bookdata);
gboolean
-gnc_xml_parse_fd(sixtp *top_parser, FILE *fd,
- gxpf_callback callback, gpointer parsedata,
- gpointer bookdata);
+gnc_xml_parse_fd (sixtp* top_parser, FILE* fd,
+ gxpf_callback callback, gpointer parsedata,
+ gpointer bookdata);
#endif /* IO_GNCXML_GEN_H */
diff --git a/src/backend/xml/io-gncxml-v1.cpp b/src/backend/xml/io-gncxml-v1.cpp
index 0c58c05..74aae4f 100644
--- a/src/backend/xml/io-gncxml-v1.cpp
+++ b/src/backend/xml/io-gncxml-v1.cpp
@@ -55,28 +55,28 @@ extern "C"
#include <kvp_frame.hpp>
/* from Transaction-xml-parser-v1.c */
-static sixtp* gnc_transaction_parser_new(void);
+static sixtp* gnc_transaction_parser_new (void);
/* from Account-xml-parser-v1.c */
-static sixtp* gnc_account_parser_new(void);
+static sixtp* gnc_account_parser_new (void);
/* from Ledger-xml-parser-v1.c */
-static sixtp* ledger_data_parser_new(void);
+static sixtp* ledger_data_parser_new (void);
/* from Commodity-xml-parser-v1.c */
-static sixtp* commodity_restore_parser_new(void);
+static sixtp* commodity_restore_parser_new (void);
/* from Commodity-xml-parser-v1.c */
-static sixtp* generic_gnc_commodity_lookup_parser_new(void);
+static sixtp* generic_gnc_commodity_lookup_parser_new (void);
/* from Query-xml-parser-v1.c */
//static sixtp* query_server_parser_new (void);
/* from sixtp-kvp-parser.c */
-static sixtp* kvp_frame_parser_new(void);
+static sixtp* kvp_frame_parser_new (void);
/* from gnc-pricedb-xml-v1.c */
-static sixtp* gnc_pricedb_parser_new(void);
+static sixtp* gnc_pricedb_parser_new (void);
typedef enum
@@ -93,16 +93,16 @@ typedef struct
/* top level <gnc-data> parser - we need this so we can set it up
after we see the file version. */
- sixtp *gnc_parser;
+ sixtp* gnc_parser;
/* The book */
- QofBook *book;
+ QofBook* book;
/* The root account */
- Account *root_account;
+ Account* root_account;
/* The pricedb */
- GNCPriceDB *pricedb;
+ GNCPriceDB* pricedb;
/* The query */
// Query *query;
@@ -148,7 +148,7 @@ static QofLogModule log_module = GNC_MOD_IO;
*/
static gboolean
-gnc_parser_configure_for_input_version(GNCParseStatus *status, gint64 version)
+gnc_parser_configure_for_input_version (GNCParseStatus* status, gint64 version)
{
status->version = version;
@@ -158,51 +158,51 @@ gnc_parser_configure_for_input_version(GNCParseStatus *status, gint64 version)
if (version != 1)
{
status->error = GNC_PARSE_ERR_BAD_VERSION;
- return(FALSE);
+ return (FALSE);
}
/* Now set up the parser based on the version. */
/* add <ledger-data> */
{
- sixtp *ledger_data_pr = ledger_data_parser_new();
- g_return_val_if_fail(ledger_data_pr, FALSE);
- sixtp_add_sub_parser(status->gnc_parser, "ledger-data", ledger_data_pr);
+ sixtp* ledger_data_pr = ledger_data_parser_new ();
+ g_return_val_if_fail (ledger_data_pr, FALSE);
+ sixtp_add_sub_parser (status->gnc_parser, "ledger-data", ledger_data_pr);
}
- return(TRUE);
+ return (TRUE);
}
static gboolean
-gnc_version_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_version_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
gint64 version;
gboolean ok;
- gchar *txt;
+ gchar* txt;
- g_return_val_if_fail(pstatus, FALSE);
- if (pstatus->seen_version) return(FALSE);
+ g_return_val_if_fail (pstatus, FALSE);
+ if (pstatus->seen_version) return (FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = string_to_gint64(txt, &version);
- g_free(txt);
- g_return_val_if_fail(ok, FALSE);
+ ok = string_to_gint64 (txt, &version);
+ g_free (txt);
+ g_return_val_if_fail (ok, FALSE);
- if (!gnc_parser_configure_for_input_version(pstatus, version)) return(FALSE);
+ if (!gnc_parser_configure_for_input_version (pstatus, version)) return (FALSE);
- return(TRUE);
+ return (TRUE);
}
-static sixtp *
-gnc_version_parser_new(void)
+static sixtp*
+gnc_version_parser_new (void)
{
- return(simple_chars_only_parser_new(gnc_version_end_handler));
+ return (simple_chars_only_parser_new (gnc_version_end_handler));
}
/****************************************************************************/
@@ -232,61 +232,61 @@ gnc_version_parser_new(void)
*/
static gboolean
-gnc_parser_before_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
+gnc_parser_before_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
- const gchar *tag,
- const gchar *child_tag)
+ const gchar* tag,
+ const gchar* child_tag)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
- g_return_val_if_fail(pstatus, FALSE);
+ g_return_val_if_fail (pstatus, FALSE);
- if (strcmp(child_tag, "ledger-data") == 0)
+ if (strcmp (child_tag, "ledger-data") == 0)
{
if (pstatus->root_account)
{
- return(FALSE);
+ return (FALSE);
}
}
- return(TRUE);
+ return (TRUE);
}
static gboolean
-gnc_parser_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
+gnc_parser_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- g_return_val_if_fail(pstatus, FALSE);
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ g_return_val_if_fail (pstatus, FALSE);
- if (strcmp(child_tag, "ledger-data") == 0)
+ if (strcmp (child_tag, "ledger-data") == 0)
{
- g_return_val_if_fail(child_result, FALSE);
- g_return_val_if_fail(child_result->data, FALSE);
- pstatus->root_account = (Account *) child_result->data;
+ g_return_val_if_fail (child_result, FALSE);
+ g_return_val_if_fail (child_result->data, FALSE);
+ pstatus->root_account = (Account*) child_result->data;
child_result->should_cleanup = FALSE;
}
- return(TRUE);
+ return (TRUE);
}
static sixtp*
-gnc_parser_new(void)
+gnc_parser_new (void)
{
- return sixtp_set_any(
- sixtp_new(), FALSE,
+ return sixtp_set_any (
+ sixtp_new (), FALSE,
SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
SIXTP_BEFORE_CHILD_HANDLER_ID, gnc_parser_before_child_handler,
SIXTP_AFTER_CHILD_HANDLER_ID, gnc_parser_after_child_handler,
@@ -295,38 +295,38 @@ gnc_parser_new(void)
/* ================================================================== */
-static sixtp *
-gncxml_setup_for_read (GNCParseStatus *global_parse_status)
+static sixtp*
+gncxml_setup_for_read (GNCParseStatus* global_parse_status)
{
- sixtp *top_level_pr;
- sixtp *gnc_pr;
- sixtp *gnc_version_pr;
+ sixtp* top_level_pr;
+ sixtp* gnc_pr;
+ sixtp* gnc_version_pr;
/* top-level: This is just a dummy node. It doesn't do anything.
For now, the result is communicated through the global_data
parser. */
- top_level_pr = sixtp_new();
- g_return_val_if_fail(top_level_pr, FALSE);
- sixtp_set_chars(top_level_pr, allow_and_ignore_only_whitespace);
+ top_level_pr = sixtp_new ();
+ g_return_val_if_fail (top_level_pr, FALSE);
+ sixtp_set_chars (top_level_pr, allow_and_ignore_only_whitespace);
/* <gnc> */
- gnc_pr = gnc_parser_new();
+ gnc_pr = gnc_parser_new ();
if (!gnc_pr)
{
- sixtp_destroy(top_level_pr);
- return(NULL);
+ sixtp_destroy (top_level_pr);
+ return (NULL);
}
- sixtp_add_sub_parser(top_level_pr, "gnc", gnc_pr);
+ sixtp_add_sub_parser (top_level_pr, "gnc", gnc_pr);
/* <version> */
- gnc_version_pr = gnc_version_parser_new();
+ gnc_version_pr = gnc_version_parser_new ();
if (!gnc_version_pr)
{
- sixtp_destroy(top_level_pr);
- return(NULL);
+ sixtp_destroy (top_level_pr);
+ return (NULL);
}
- sixtp_add_sub_parser(gnc_pr, "version", gnc_version_pr);
+ sixtp_add_sub_parser (gnc_pr, "version", gnc_version_pr);
global_parse_status->seen_version = FALSE;
global_parse_status->gnc_parser = gnc_pr;
@@ -341,37 +341,37 @@ gncxml_setup_for_read (GNCParseStatus *global_parse_status)
/* ================================================================== */
gboolean
-qof_session_load_from_xml_file(QofBook *book, const char *filename)
+qof_session_load_from_xml_file (QofBook* book, const char* filename)
{
gboolean parse_ok;
gpointer parse_result = NULL;
- sixtp *top_level_pr;
+ sixtp* top_level_pr;
GNCParseStatus global_parse_status;
- Account *root;
+ Account* root;
global_parse_status.book = book;
- g_return_val_if_fail(book, FALSE);
- g_return_val_if_fail(filename, FALSE);
+ g_return_val_if_fail (book, FALSE);
+ g_return_val_if_fail (filename, FALSE);
- xaccDisableDataScrubbing();
+ xaccDisableDataScrubbing ();
top_level_pr = gncxml_setup_for_read (&global_parse_status);
- g_return_val_if_fail(top_level_pr, FALSE);
+ g_return_val_if_fail (top_level_pr, FALSE);
- parse_ok = sixtp_parse_file(top_level_pr,
- filename,
- NULL,
- &global_parse_status,
- &parse_result);
+ parse_ok = sixtp_parse_file (top_level_pr,
+ filename,
+ NULL,
+ &global_parse_status,
+ &parse_result);
- sixtp_destroy(top_level_pr);
- xaccEnableDataScrubbing();
+ sixtp_destroy (top_level_pr);
+ xaccEnableDataScrubbing ();
if (parse_ok)
{
if (!global_parse_status.root_account) return FALSE;
root = global_parse_status.root_account;
- gnc_book_set_root_account(book, root);
+ gnc_book_set_root_account (book, root);
/* Fix account and transaction commodities */
xaccAccountTreeScrubCommodities (root);
@@ -379,20 +379,20 @@ qof_session_load_from_xml_file(QofBook *book, const char *filename)
/* Fix split amount/value */
xaccAccountTreeScrubSplits (root);
- return(TRUE);
+ return (TRUE);
}
else
{
- return(FALSE);
+ return (FALSE);
}
}
/* ================================================================== */
gboolean
-gnc_is_xml_data_file(const gchar *filename)
+gnc_is_xml_data_file (const gchar* filename)
{
- if ((gnc_is_our_xml_file(filename, NULL)) == GNC_BOOK_XML1_FILE)
+ if ((gnc_is_our_xml_file (filename, NULL)) == GNC_BOOK_XML1_FILE)
return TRUE;
return FALSE;
}
@@ -437,24 +437,24 @@ gnc_is_xml_data_file(const gchar *filename)
static void
-kvp_value_result_cleanup(sixtp_child_result *cr)
+kvp_value_result_cleanup (sixtp_child_result* cr)
{
- KvpValue *v = static_cast<KvpValue*>(cr->data);
+ KvpValue* v = static_cast<KvpValue*> (cr->data);
if (v) delete v;
}
static sixtp*
-simple_kvp_value_parser_new(sixtp_end_handler end_handler)
+simple_kvp_value_parser_new (sixtp_end_handler end_handler)
{
- return sixtp_set_any(sixtp_new(), FALSE,
- SIXTP_CHARACTERS_HANDLER_ID,
- generic_accumulate_chars,
- SIXTP_END_HANDLER_ID, end_handler,
- SIXTP_CLEANUP_RESULT_ID, kvp_value_result_cleanup,
- SIXTP_CLEANUP_CHARS_ID, sixtp_child_free_data,
- SIXTP_RESULT_FAIL_ID, kvp_value_result_cleanup,
- SIXTP_CHARS_FAIL_ID, sixtp_child_free_data,
- SIXTP_NO_MORE_HANDLERS);
+ return sixtp_set_any (sixtp_new (), FALSE,
+ SIXTP_CHARACTERS_HANDLER_ID,
+ generic_accumulate_chars,
+ SIXTP_END_HANDLER_ID, end_handler,
+ SIXTP_CLEANUP_RESULT_ID, kvp_value_result_cleanup,
+ SIXTP_CLEANUP_CHARS_ID, sixtp_child_free_data,
+ SIXTP_RESULT_FAIL_ID, kvp_value_result_cleanup,
+ SIXTP_CHARS_FAIL_ID, sixtp_child_free_data,
+ SIXTP_NO_MORE_HANDLERS);
}
/* <gint64> - gint64 kvp_value parser.
@@ -476,147 +476,147 @@ simple_kvp_value_parser_new(sixtp_end_handler end_handler)
/* ------------------------------------------------------------ */
/* generic type copnversion for kvp types */
-#define KVP_CVT_VALUE(TYPE) \
-{ \
- gchar *txt = NULL; \
- TYPE val; \
- KvpValue *kvpv; \
- gboolean ok; \
- \
- txt = concatenate_child_result_chars(data_from_children); \
- g_return_val_if_fail(txt, FALSE); \
- \
- ok = (gboolean) string_to_##TYPE(txt, &val); \
- g_free(txt); \
- g_return_val_if_fail(ok, FALSE); \
- \
+#define KVP_CVT_VALUE(TYPE) \
+{ \
+ gchar *txt = NULL; \
+ TYPE val; \
+ KvpValue *kvpv; \
+ gboolean ok; \
+ \
+ txt = concatenate_child_result_chars(data_from_children); \
+ g_return_val_if_fail(txt, FALSE); \
+ \
+ ok = (gboolean) string_to_##TYPE(txt, &val); \
+ g_free(txt); \
+ g_return_val_if_fail(ok, FALSE); \
+ \
kvpv = new KvpValue{val}; \
- g_return_val_if_fail(kvpv, FALSE); \
- \
- *result = kvpv; \
- return(TRUE); \
+ g_return_val_if_fail(kvpv, FALSE); \
+ \
+ *result = kvpv; \
+ return(TRUE); \
}
/* ------------------------------------------------------------ */
static gboolean
-gint64_kvp_value_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+gint64_kvp_value_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
KVP_CVT_VALUE (gint64);
}
static sixtp*
-gint64_kvp_value_parser_new(void)
+gint64_kvp_value_parser_new (void)
{
- return(simple_kvp_value_parser_new(gint64_kvp_value_end_handler));
+ return (simple_kvp_value_parser_new (gint64_kvp_value_end_handler));
}
static gboolean
-double_kvp_value_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+double_kvp_value_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
KVP_CVT_VALUE (double);
}
static sixtp*
-double_kvp_value_parser_new(void)
+double_kvp_value_parser_new (void)
{
- return(simple_kvp_value_parser_new(double_kvp_value_end_handler));
+ return (simple_kvp_value_parser_new (double_kvp_value_end_handler));
}
static gboolean
-gnc_numeric_kvp_value_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+gnc_numeric_kvp_value_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
KVP_CVT_VALUE (gnc_numeric);
}
static sixtp*
-gnc_numeric_kvp_value_parser_new(void)
+gnc_numeric_kvp_value_parser_new (void)
{
- return(simple_kvp_value_parser_new(gnc_numeric_kvp_value_end_handler));
+ return (simple_kvp_value_parser_new (gnc_numeric_kvp_value_end_handler));
}
static gboolean
-string_kvp_value_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+string_kvp_value_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
- gchar *txt = NULL;
- KvpValue *kvpv;
+ gchar* txt = NULL;
+ KvpValue* kvpv;
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- kvpv = new KvpValue{g_strdup(txt)};
- g_free(txt);
- g_return_val_if_fail(kvpv, FALSE);
+ kvpv = new KvpValue {g_strdup (txt)};
+ g_free (txt);
+ g_return_val_if_fail (kvpv, FALSE);
*result = kvpv;
- return(TRUE);
+ return (TRUE);
}
static sixtp*
-string_kvp_value_parser_new(void)
+string_kvp_value_parser_new (void)
{
- return(simple_kvp_value_parser_new(string_kvp_value_end_handler));
+ return (simple_kvp_value_parser_new (string_kvp_value_end_handler));
}
/* the guid handler is almost the same as above, but has
* inconsistent type handling */
static gboolean
-guid_kvp_value_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
-{
- gchar *txt = NULL;
+guid_kvp_value_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
+{
+ gchar* txt = NULL;
GncGUID val;
- KvpValue *kvpv;
+ KvpValue* kvpv;
gboolean ok;
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = string_to_guid(txt, &val);
- g_free(txt);
+ ok = string_to_guid (txt, &val);
+ g_free (txt);
- g_return_val_if_fail(ok, FALSE);
+ g_return_val_if_fail (ok, FALSE);
- kvpv = new KvpValue{guid_copy(&val)};
- g_return_val_if_fail(kvpv, FALSE);
+ kvpv = new KvpValue {guid_copy (&val)};
+ g_return_val_if_fail (kvpv, FALSE);
*result = kvpv;
- return(TRUE);
+ return (TRUE);
}
static sixtp*
-guid_kvp_value_parser_new(void)
+guid_kvp_value_parser_new (void)
{
- return(simple_kvp_value_parser_new(guid_kvp_value_end_handler));
+ return (simple_kvp_value_parser_new (guid_kvp_value_end_handler));
}
/*********************************/
@@ -641,69 +641,69 @@ guid_kvp_value_parser_new(void)
static gboolean
-glist_kvp_value_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+glist_kvp_value_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GSList *lp;
- GList *result_glist;
- KvpValue *kvp_result;
+ GSList* lp;
+ GList* result_glist;
+ KvpValue* kvp_result;
result_glist = NULL;
for (lp = data_from_children; lp; lp = lp->next)
{
- sixtp_child_result *cr = (sixtp_child_result *) lp->data;
- KvpValue *kvp = (KvpValue *) cr->data;
+ sixtp_child_result* cr = (sixtp_child_result*) lp->data;
+ KvpValue* kvp = (KvpValue*) cr->data;
/* children are in reverse chron order, so this fixes it. */
- result_glist = g_list_prepend(result_glist, kvp);
+ result_glist = g_list_prepend (result_glist, kvp);
cr->should_cleanup = FALSE;
}
- kvp_result = new KvpValue{result_glist};
+ kvp_result = new KvpValue {result_glist};
if (!kvp_result)
- g_list_free_full(result_glist,
- [](void* data){ delete static_cast<KvpValue*>(data);});
+ g_list_free_full (result_glist,
+ [] (void * data) { delete static_cast<KvpValue*> (data);});
*result = kvp_result;
- return(TRUE);
+ return (TRUE);
}
/* ---------------------------------------------- */
-#define KVP_TOKEN(NAME,TOK) \
- child_pr = NAME##_kvp_value_parser_new(); \
- g_return_val_if_fail(child_pr, FALSE); \
+#define KVP_TOKEN(NAME,TOK) \
+ child_pr = NAME##_kvp_value_parser_new(); \
+ g_return_val_if_fail(child_pr, FALSE); \
sixtp_add_sub_parser(p, TOK, child_pr);
/* ---------------------------------------------- */
static gboolean
-add_all_kvp_value_parsers_as_sub_nodes(sixtp *p,
- sixtp *kvp_frame_parser,
- sixtp *glist_parser)
+add_all_kvp_value_parsers_as_sub_nodes (sixtp* p,
+ sixtp* kvp_frame_parser,
+ sixtp* glist_parser)
{
- sixtp *child_pr;
+ sixtp* child_pr;
- g_return_val_if_fail(p, FALSE);
- g_return_val_if_fail(kvp_frame_parser, FALSE);
+ g_return_val_if_fail (p, FALSE);
+ g_return_val_if_fail (kvp_frame_parser, FALSE);
- KVP_TOKEN(gint64, "gint64");
- KVP_TOKEN(double, "double");
- KVP_TOKEN(gnc_numeric, "numeric");
- KVP_TOKEN(string, "string");
- KVP_TOKEN(guid, "guid");
+ KVP_TOKEN (gint64, "gint64");
+ KVP_TOKEN (double, "double");
+ KVP_TOKEN (gnc_numeric, "numeric");
+ KVP_TOKEN (string, "string");
+ KVP_TOKEN (guid, "guid");
- sixtp_add_sub_parser(p, "glist", glist_parser);
- sixtp_add_sub_parser(p, "frame", kvp_frame_parser);
+ sixtp_add_sub_parser (p, "glist", glist_parser);
+ sixtp_add_sub_parser (p, "frame", kvp_frame_parser);
- return(TRUE);
+ return (TRUE);
}
static sixtp*
-glist_kvp_value_parser_new(sixtp *kvp_frame_parser)
+glist_kvp_value_parser_new (sixtp* kvp_frame_parser)
{
- sixtp *top_level = sixtp_set_any(
- sixtp_new(), FALSE,
+ sixtp* top_level = sixtp_set_any (
+ sixtp_new (), FALSE,
SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
SIXTP_END_HANDLER_ID, glist_kvp_value_end_handler,
SIXTP_CLEANUP_RESULT_ID, kvp_value_result_cleanup,
@@ -714,15 +714,15 @@ glist_kvp_value_parser_new(sixtp *kvp_frame_parser)
return NULL;
}
- if (!add_all_kvp_value_parsers_as_sub_nodes(top_level,
- kvp_frame_parser,
- top_level))
+ if (!add_all_kvp_value_parsers_as_sub_nodes (top_level,
+ kvp_frame_parser,
+ top_level))
{
- sixtp_destroy(top_level);
- return(NULL);
+ sixtp_destroy (top_level);
+ return (NULL);
}
- return(top_level);
+ return (top_level);
}
/*********************************/
@@ -757,46 +757,46 @@ glist_kvp_value_parser_new(sixtp *kvp_frame_parser)
*/
static gboolean
-kvp_frame_slot_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+kvp_frame_slot_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- KvpFrame *f = (KvpFrame *) parent_data;
- GSList *lp;
+ KvpFrame* f = (KvpFrame*) parent_data;
+ GSList* lp;
guint64 key_node_count;
- gchar *key = NULL;
- sixtp_child_result *value_cr = NULL;
- KvpValue *value = NULL;
+ gchar* key = NULL;
+ sixtp_child_result* value_cr = NULL;
+ KvpValue* value = NULL;
gboolean delete_value = FALSE;
- g_return_val_if_fail(f, FALSE);
+ g_return_val_if_fail (f, FALSE);
- if (g_slist_length(data_from_children) != 2) return(FALSE);
+ if (g_slist_length (data_from_children) != 2) return (FALSE);
/* check to see that we got exactly one <key> node */
lp = data_from_children;
key_node_count = 0;
for (lp = data_from_children; lp; lp = lp->next)
{
- sixtp_child_result *cr = (sixtp_child_result *) lp->data;
+ sixtp_child_result* cr = (sixtp_child_result*) lp->data;
- if (is_child_result_from_node_named(cr, "k"))
+ if (is_child_result_from_node_named (cr, "k"))
{
- key = (char *) cr->data;
+ key = (char*) cr->data;
key_node_count++;
}
else
{
- if (is_child_result_from_node_named(cr, "frame"))
+ if (is_child_result_from_node_named (cr, "frame"))
{
- KvpFrame *frame = static_cast<KvpFrame*>(cr->data);
- value = new KvpValue{frame};
+ KvpFrame* frame = static_cast<KvpFrame*> (cr->data);
+ value = new KvpValue {frame};
delete_value = TRUE;
}
else
{
- value = static_cast<KvpValue*>(cr->data);
+ value = static_cast<KvpValue*> (cr->data);
delete_value = FALSE;
}
@@ -804,57 +804,57 @@ kvp_frame_slot_end_handler(gpointer data_for_children,
}
}
- if (key_node_count != 1) return(FALSE);
+ if (key_node_count != 1) return (FALSE);
value_cr->should_cleanup = TRUE;
- f->set(key, value);
+ f->set (key, value);
if (delete_value)
delete value;
- return(TRUE);
+ return (TRUE);
}
static sixtp*
-kvp_frame_slot_parser_new(sixtp *kvp_frame_parser)
+kvp_frame_slot_parser_new (sixtp* kvp_frame_parser)
{
- sixtp *top_level;
- sixtp *child_pr;
- sixtp *glist_pr;
+ sixtp* top_level;
+ sixtp* child_pr;
+ sixtp* glist_pr;
- g_return_val_if_fail(kvp_frame_parser, NULL);
+ g_return_val_if_fail (kvp_frame_parser, NULL);
- if (!(top_level = sixtp_set_any(
- sixtp_new(), FALSE,
- SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
- SIXTP_END_HANDLER_ID, kvp_frame_slot_end_handler,
- SIXTP_NO_MORE_HANDLERS)))
+ if (! (top_level = sixtp_set_any (
+ sixtp_new (), FALSE,
+ SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
+ SIXTP_END_HANDLER_ID, kvp_frame_slot_end_handler,
+ SIXTP_NO_MORE_HANDLERS)))
{
return NULL;
}
- child_pr = simple_chars_only_parser_new(NULL);
+ child_pr = simple_chars_only_parser_new (NULL);
if (!child_pr)
{
- sixtp_destroy(top_level);
- return(NULL);
+ sixtp_destroy (top_level);
+ return (NULL);
}
- sixtp_add_sub_parser(top_level, "k", child_pr);
+ sixtp_add_sub_parser (top_level, "k", child_pr);
- glist_pr = glist_kvp_value_parser_new(kvp_frame_parser);
+ glist_pr = glist_kvp_value_parser_new (kvp_frame_parser);
if (!glist_pr)
{
- sixtp_destroy(top_level);
- return(NULL);
+ sixtp_destroy (top_level);
+ return (NULL);
}
- if (!add_all_kvp_value_parsers_as_sub_nodes(top_level,
- kvp_frame_parser,
- glist_pr))
+ if (!add_all_kvp_value_parsers_as_sub_nodes (top_level,
+ kvp_frame_parser,
+ glist_pr))
{
- sixtp_destroy(top_level);
- return(NULL);
+ sixtp_destroy (top_level);
+ return (NULL);
}
- return(top_level);
+ return (top_level);
}
@@ -876,73 +876,73 @@ kvp_frame_slot_parser_new(sixtp *kvp_frame_parser)
*/
static gboolean
-kvp_frame_start_handler(GSList* sibling_data, gpointer parent_data,
- gpointer global_data, gpointer *data_for_children,
- gpointer *result, const gchar *tag, gchar **attrs)
+kvp_frame_start_handler (GSList* sibling_data, gpointer parent_data,
+ gpointer global_data, gpointer* data_for_children,
+ gpointer* result, const gchar* tag, gchar** attrs)
{
auto f = new KvpFrame;
*data_for_children = f;
- return(TRUE);
+ return (TRUE);
}
static gboolean
-kvp_frame_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+kvp_frame_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- g_return_val_if_fail(data_for_children != NULL, FALSE);
+ g_return_val_if_fail (data_for_children != NULL, FALSE);
*result = data_for_children;
- return(TRUE);
+ return (TRUE);
}
static void
-kvp_frame_fail_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
-{
- auto f = static_cast<KvpFrame*>(data_for_children);
+kvp_frame_fail_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
+{
+ auto f = static_cast<KvpFrame*> (data_for_children);
if (f) delete f;
}
static void
-kvp_frame_result_cleanup(sixtp_child_result *cr)
+kvp_frame_result_cleanup (sixtp_child_result* cr)
{
- auto f = static_cast<KvpFrame*>(cr->data);;
+ auto f = static_cast<KvpFrame*> (cr->data);;
if (f) delete f;
}
static sixtp*
-kvp_frame_parser_new(void)
+kvp_frame_parser_new (void)
{
- sixtp *top_level;
+ sixtp* top_level;
- if (!(top_level = sixtp_set_any(
- sixtp_new(), FALSE,
- SIXTP_START_HANDLER_ID, kvp_frame_start_handler,
- SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
- SIXTP_END_HANDLER_ID, kvp_frame_end_handler,
- SIXTP_CLEANUP_RESULT_ID, kvp_frame_result_cleanup,
- SIXTP_RESULT_FAIL_ID, kvp_frame_result_cleanup,
- SIXTP_FAIL_HANDLER_ID, kvp_frame_fail_handler,
- SIXTP_NO_MORE_HANDLERS)))
+ if (! (top_level = sixtp_set_any (
+ sixtp_new (), FALSE,
+ SIXTP_START_HANDLER_ID, kvp_frame_start_handler,
+ SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
+ SIXTP_END_HANDLER_ID, kvp_frame_end_handler,
+ SIXTP_CLEANUP_RESULT_ID, kvp_frame_result_cleanup,
+ SIXTP_RESULT_FAIL_ID, kvp_frame_result_cleanup,
+ SIXTP_FAIL_HANDLER_ID, kvp_frame_fail_handler,
+ SIXTP_NO_MORE_HANDLERS)))
{
return NULL;
}
- if (!(sixtp_add_some_sub_parsers(
- top_level, TRUE,
- "s", kvp_frame_slot_parser_new(top_level),
- NULL, NULL)))
+ if (! (sixtp_add_some_sub_parsers (
+ top_level, TRUE,
+ "s", kvp_frame_slot_parser_new (top_level),
+ NULL, NULL)))
{
return NULL;
}
- return(top_level);
+ return (top_level);
}
/****************************************************************************/
@@ -969,143 +969,143 @@ kvp_frame_parser_new(void)
static gboolean
-ledger_data_start_handler(GSList* sibling_data, gpointer parent_data,
- gpointer global_data, gpointer *data_for_children,
- gpointer *result, const gchar *tag, gchar **attrs)
+ledger_data_start_handler (GSList* sibling_data, gpointer parent_data,
+ gpointer global_data, gpointer* data_for_children,
+ gpointer* result, const gchar* tag, gchar** attrs)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Account *ra;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Account* ra;
/* disable logging during load; otherwise its just a mess */
- xaccLogDisable();
- ra = xaccMallocAccount(pstatus->book);
+ xaccLogDisable ();
+ ra = xaccMallocAccount (pstatus->book);
- g_return_val_if_fail(ra, FALSE);
+ g_return_val_if_fail (ra, FALSE);
*data_for_children = ra;
- return(ra != NULL);
+ return (ra != NULL);
}
static gboolean
-ledger_data_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
-{
- if (!child_result) return(TRUE);
+ledger_data_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
+{
+ if (!child_result) return (TRUE);
/* if we see the pricedb, deal with it */
- if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(TRUE);
- if (strcmp(child_result->tag, "pricedb") == 0)
+ if (child_result->type != SIXTP_CHILD_RESULT_NODE) return (TRUE);
+ if (strcmp (child_result->tag, "pricedb") == 0)
{
- GNCPriceDB *pdb = (GNCPriceDB *) child_result->data;
- GNCParseStatus *status = (GNCParseStatus *) global_data;
+ GNCPriceDB* pdb = (GNCPriceDB*) child_result->data;
+ GNCParseStatus* status = (GNCParseStatus*) global_data;
- g_return_val_if_fail(pdb, FALSE);
- g_return_val_if_fail(status, FALSE);
+ g_return_val_if_fail (pdb, FALSE);
+ g_return_val_if_fail (status, FALSE);
if (status->pricedb)
{
- PERR("hit pricedb twice in data file.");
+ PERR ("hit pricedb twice in data file.");
return FALSE;
}
status->pricedb = pdb;
child_result->should_cleanup = FALSE;
}
- return(TRUE);
+ return (TRUE);
}
static gboolean
-ledger_data_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+ledger_data_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *ra = (Account *) data_for_children;
- GList *descendants;
+ Account* ra = (Account*) data_for_children;
+ GList* descendants;
- g_return_val_if_fail(ra, FALSE);
+ g_return_val_if_fail (ra, FALSE);
/* commit all accounts, this completes the BeginEdit started when the
* account_end_handler finished reading the account.
*/
- descendants = gnc_account_get_descendants(ra);
- g_list_foreach(descendants, (GFunc)xaccAccountCommitEdit, NULL);
- g_list_free(descendants);
+ descendants = gnc_account_get_descendants (ra);
+ g_list_foreach (descendants, (GFunc)xaccAccountCommitEdit, NULL);
+ g_list_free (descendants);
- xaccLogEnable();
+ xaccLogEnable ();
*result = ra;
- return(TRUE);
+ return (TRUE);
}
static void
-ledger_data_fail_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
-{
- Account *account = (Account *) data_for_children;
+ledger_data_fail_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
+{
+ Account* account = (Account*) data_for_children;
if (account)
{
- xaccAccountBeginEdit(account);
- xaccAccountDestroy(account);
+ xaccAccountBeginEdit (account);
+ xaccAccountDestroy (account);
}
}
static void
-ledger_data_result_cleanup(sixtp_child_result *cr)
+ledger_data_result_cleanup (sixtp_child_result* cr)
{
- Account *account = (Account *) cr->data;
+ Account* account = (Account*) cr->data;
if (account)
{
- xaccAccountBeginEdit(account);
- xaccAccountDestroy(account);
+ xaccAccountBeginEdit (account);
+ xaccAccountDestroy (account);
}
}
static sixtp*
-ledger_data_parser_new(void)
+ledger_data_parser_new (void)
{
- sixtp *top_level;
+ sixtp* top_level;
/* <ledger-data> */
- if (!(top_level = sixtp_set_any(
- sixtp_new(), FALSE,
- SIXTP_START_HANDLER_ID, ledger_data_start_handler,
- SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
- SIXTP_AFTER_CHILD_HANDLER_ID, ledger_data_after_child_handler,
- SIXTP_END_HANDLER_ID, ledger_data_end_handler,
- SIXTP_CLEANUP_RESULT_ID, ledger_data_result_cleanup,
- SIXTP_FAIL_HANDLER_ID, ledger_data_fail_handler,
- SIXTP_RESULT_FAIL_ID, ledger_data_result_cleanup,
- SIXTP_NO_MORE_HANDLERS)))
+ if (! (top_level = sixtp_set_any (
+ sixtp_new (), FALSE,
+ SIXTP_START_HANDLER_ID, ledger_data_start_handler,
+ SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
+ SIXTP_AFTER_CHILD_HANDLER_ID, ledger_data_after_child_handler,
+ SIXTP_END_HANDLER_ID, ledger_data_end_handler,
+ SIXTP_CLEANUP_RESULT_ID, ledger_data_result_cleanup,
+ SIXTP_FAIL_HANDLER_ID, ledger_data_fail_handler,
+ SIXTP_RESULT_FAIL_ID, ledger_data_result_cleanup,
+ SIXTP_NO_MORE_HANDLERS)))
{
return NULL;
}
- if (!sixtp_add_some_sub_parsers(
- top_level, TRUE,
- "commodity", commodity_restore_parser_new(),
- "pricedb", gnc_pricedb_parser_new(),
- "account", gnc_account_parser_new(),
- "transaction", gnc_transaction_parser_new(),
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ top_level, TRUE,
+ "commodity", commodity_restore_parser_new (),
+ "pricedb", gnc_pricedb_parser_new (),
+ "account", gnc_account_parser_new (),
+ "transaction", gnc_transaction_parser_new (),
+ NULL, NULL))
{
return NULL;
}
- return(top_level);
+ return (top_level);
}
/***********************************************************************/
@@ -1141,17 +1141,17 @@ ledger_data_parser_new(void)
*/
static gboolean
-account_start_handler(GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children,
- gpointer *result,
- const gchar *tag,
- gchar **attrs)
+account_start_handler (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children,
+ gpointer* result,
+ const gchar* tag,
+ gchar** attrs)
{
/* pass the parent data down to the children */
*data_for_children = parent_data;
- return(TRUE);
+ return (TRUE);
}
/****************************************************************************/
@@ -1176,44 +1176,44 @@ account_start_handler(GSList* sibling_data,
*/
static gboolean
-account_restore_start_handler(GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children,
- gpointer *result,
- const gchar *tag,
- gchar **attrs)
+account_restore_start_handler (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children,
+ gpointer* result,
+ const gchar* tag,
+ gchar** attrs)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Account *acc = xaccMallocAccount(pstatus->book);
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Account* acc = xaccMallocAccount (pstatus->book);
- g_return_val_if_fail(acc, FALSE);
- xaccAccountBeginEdit(acc);
+ g_return_val_if_fail (acc, FALSE);
+ xaccAccountBeginEdit (acc);
*data_for_children = acc;
*result = acc;
- return(TRUE);
+ return (TRUE);
}
static gboolean
-account_restore_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+account_restore_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *parent = (Account *) parent_data;
- Account *acc = (Account *) * result;
+ Account* parent = (Account*) parent_data;
+ Account* acc = (Account*) * result;
- g_return_val_if_fail((parent && acc), FALSE);
+ g_return_val_if_fail ((parent && acc), FALSE);
/* CHECKME: do we need to xaccAccountRecomputeBalance(acc) here? */
- xaccAccountCommitEdit(acc);
+ xaccAccountCommitEdit (acc);
/* If the account doesn't have a parent yet, just cram it into the
top level */
- if (!gnc_account_get_parent(acc))
- gnc_account_append_child(parent, acc);
+ if (!gnc_account_get_parent (acc))
+ gnc_account_append_child (parent, acc);
*result = NULL;
@@ -1221,70 +1221,70 @@ account_restore_end_handler(gpointer data_for_children,
* all the transactions, we will Commit. This replaces #splits
* rebalances with #accounts rebalances at the end. A BIG win!
*/
- xaccAccountBeginEdit(acc);
- return(TRUE);
+ xaccAccountBeginEdit (acc);
+ return (TRUE);
}
static gboolean
-account_restore_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
-{
- Account *a = (Account *) data_for_children;
+account_restore_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
+{
+ Account* a = (Account*) data_for_children;
/* GNCParseStatus *pstatus = (GNCParseStatus *) global_data; */
- g_return_val_if_fail(a, FALSE);
+ g_return_val_if_fail (a, FALSE);
- if (!child_result) return(TRUE);
- if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(TRUE);
- if (strcmp(child_result->tag, "slots") == 0)
+ if (!child_result) return (TRUE);
+ if (child_result->type != SIXTP_CHILD_RESULT_NODE) return (TRUE);
+ if (strcmp (child_result->tag, "slots") == 0)
{
- auto f = static_cast<KvpFrame*>(child_result->data);
- g_return_val_if_fail(f, FALSE);
+ auto f = static_cast<KvpFrame*> (child_result->data);
+ g_return_val_if_fail (f, FALSE);
if (a->inst.kvp_data) delete a->inst.kvp_data;
a->inst.kvp_data = f;
child_result->should_cleanup = FALSE;
}
- else if (strcmp(child_result->tag, "currency") == 0)
+ else if (strcmp (child_result->tag, "currency") == 0)
{
- gnc_commodity *com = (gnc_commodity *) child_result->data;
- g_return_val_if_fail(com, FALSE);
- if (DxaccAccountGetCurrency(a)) return FALSE;
- DxaccAccountSetCurrency(a, com);
+ gnc_commodity* com = (gnc_commodity*) child_result->data;
+ g_return_val_if_fail (com, FALSE);
+ if (DxaccAccountGetCurrency (a)) return FALSE;
+ DxaccAccountSetCurrency (a, com);
/* let the normal child_result handler clean up com */
}
- else if (strcmp(child_result->tag, "security") == 0)
+ else if (strcmp (child_result->tag, "security") == 0)
{
- gnc_commodity *com = (gnc_commodity *) child_result->data;
- g_return_val_if_fail(com, FALSE);
- if (xaccAccountGetCommodity(a)) return FALSE;
- xaccAccountSetCommodity(a, com);
+ gnc_commodity* com = (gnc_commodity*) child_result->data;
+ g_return_val_if_fail (com, FALSE);
+ if (xaccAccountGetCommodity (a)) return FALSE;
+ xaccAccountSetCommodity (a, com);
/* let the normal child_result handler clean up com */
}
- return(TRUE);
+ return (TRUE);
}
static void
-account_restore_fail_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+account_restore_fail_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
- Account *acc = (Account *) * result;
+ Account* acc = (Account*) * result;
if (acc)
{
xaccAccountBeginEdit (acc);
- xaccAccountDestroy(acc);
+ xaccAccountDestroy (acc);
}
}
@@ -1307,22 +1307,22 @@ account_restore_fail_handler(gpointer data_for_children,
*/
static gboolean
-acc_restore_name_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+acc_restore_name_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *acc = (Account *) parent_data;
- gchar *name = NULL;
+ Account* acc = (Account*) parent_data;
+ gchar* name = NULL;
- g_return_val_if_fail(acc, FALSE);
+ g_return_val_if_fail (acc, FALSE);
- name = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(name, FALSE);
+ name = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (name, FALSE);
- xaccAccountSetName(acc, name);
- g_free(name);
- return(TRUE);
+ xaccAccountSetName (acc, name);
+ g_free (name);
+ return (TRUE);
}
/****************************************************************************/
@@ -1345,34 +1345,34 @@ acc_restore_name_end_handler(gpointer data_for_children,
*/
static gboolean
-acc_restore_guid_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+acc_restore_guid_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Account *acc = (Account *) parent_data;
- gchar *txt = NULL;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Account* acc = (Account*) parent_data;
+ gchar* txt = NULL;
GncGUID gid;
gboolean ok;
- g_return_val_if_fail(acc, FALSE);
+ g_return_val_if_fail (acc, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = string_to_guid(txt, &gid);
- g_free(txt);
+ ok = string_to_guid (txt, &gid);
+ g_free (txt);
- g_return_val_if_fail(ok, FALSE);
+ g_return_val_if_fail (ok, FALSE);
- if (xaccAccountLookup(&gid, pstatus->book))
+ if (xaccAccountLookup (&gid, pstatus->book))
{
- return(FALSE);
+ return (FALSE);
}
- xaccAccountSetGUID(acc, &gid);
- return(TRUE);
+ xaccAccountSetGUID (acc, &gid);
+ return (TRUE);
}
/****************************************************************************/
@@ -1395,28 +1395,28 @@ acc_restore_guid_end_handler(gpointer data_for_children,
*/
static gboolean
-acc_restore_type_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+acc_restore_type_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *acc = (Account *) parent_data;
- gchar *txt = NULL;
+ Account* acc = (Account*) parent_data;
+ gchar* txt = NULL;
GNCAccountType type;
gboolean ok;
- g_return_val_if_fail(acc, FALSE);
+ g_return_val_if_fail (acc, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = xaccAccountStringToType(txt, &type);
- g_free(txt);
+ ok = xaccAccountStringToType (txt, &type);
+ g_free (txt);
- g_return_val_if_fail(ok, FALSE);
+ g_return_val_if_fail (ok, FALSE);
- xaccAccountSetType(acc, type);
- return(TRUE);
+ xaccAccountSetType (acc, type);
+ return (TRUE);
}
/****************************************************************************/
@@ -1439,22 +1439,22 @@ acc_restore_type_end_handler(gpointer data_for_children,
*/
static gboolean
-acc_restore_code_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+acc_restore_code_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *acc = (Account *) parent_data;
- gchar *txt = NULL;
+ Account* acc = (Account*) parent_data;
+ gchar* txt = NULL;
- g_return_val_if_fail(acc, FALSE);
+ g_return_val_if_fail (acc, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- xaccAccountSetCode(acc, txt);
- g_free(txt);
- return(TRUE);
+ xaccAccountSetCode (acc, txt);
+ g_free (txt);
+ return (TRUE);
}
/****************************************************************************/
@@ -1478,22 +1478,22 @@ acc_restore_code_end_handler(gpointer data_for_children,
*/
static gboolean
-acc_restore_description_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+acc_restore_description_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *acc = (Account *) parent_data;
- gchar *txt = NULL;
+ Account* acc = (Account*) parent_data;
+ gchar* txt = NULL;
- g_return_val_if_fail(acc, FALSE);
+ g_return_val_if_fail (acc, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- xaccAccountSetDescription(acc, txt);
- g_free(txt);
- return(TRUE);
+ xaccAccountSetDescription (acc, txt);
+ g_free (txt);
+ return (TRUE);
}
/****************************************************************************/
@@ -1516,22 +1516,22 @@ acc_restore_description_end_handler(gpointer data_for_children,
*/
static gboolean
-acc_restore_notes_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+acc_restore_notes_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *acc = (Account *) parent_data;
- gchar *txt = NULL;
+ Account* acc = (Account*) parent_data;
+ gchar* txt = NULL;
- g_return_val_if_fail(acc, FALSE);
+ g_return_val_if_fail (acc, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- xaccAccountSetNotes(acc, txt);
- g_free(txt);
- return(TRUE);
+ xaccAccountSetNotes (acc, txt);
+ g_free (txt);
+ return (TRUE);
}
/****************************************************************************/
@@ -1557,69 +1557,69 @@ acc_restore_notes_end_handler(gpointer data_for_children,
*/
static gboolean
-acc_restore_parent_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
-{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Account *acc = (Account *) parent_data;
- Account *parent;
- sixtp_child_result *child_result;
+acc_restore_parent_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
+{
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Account* acc = (Account*) parent_data;
+ Account* parent;
+ sixtp_child_result* child_result;
GncGUID gid;
- g_return_val_if_fail(acc, FALSE);
+ g_return_val_if_fail (acc, FALSE);
- if (g_slist_length(data_from_children) != 1)
- return(FALSE);
+ if (g_slist_length (data_from_children) != 1)
+ return (FALSE);
- child_result = (sixtp_child_result *) data_from_children->data;
+ child_result = (sixtp_child_result*) data_from_children->data;
- if (!is_child_result_from_node_named(child_result, "guid"))
- return(FALSE);
+ if (!is_child_result_from_node_named (child_result, "guid"))
+ return (FALSE);
/* otherwise this must be a good result - use it */
- gid = *((GncGUID *) child_result->data);
+ gid = * ((GncGUID*) child_result->data);
- parent = xaccAccountLookup(&gid, pstatus->book);
+ parent = xaccAccountLookup (&gid, pstatus->book);
- g_return_val_if_fail(parent, FALSE);
+ g_return_val_if_fail (parent, FALSE);
- gnc_account_append_child(parent, acc);
+ gnc_account_append_child (parent, acc);
- return(TRUE);
+ return (TRUE);
}
-static sixtp *
-parent_lookup_parser_new(void)
+static sixtp*
+parent_lookup_parser_new (void)
{
- return sixtp_set_any(sixtp_new(), TRUE,
- SIXTP_CHARACTERS_HANDLER_ID,
- allow_and_ignore_only_whitespace,
- SIXTP_END_HANDLER_ID,
- acc_restore_parent_end_handler,
- SIXTP_NO_MORE_HANDLERS);
+ return sixtp_set_any (sixtp_new (), TRUE,
+ SIXTP_CHARACTERS_HANDLER_ID,
+ allow_and_ignore_only_whitespace,
+ SIXTP_END_HANDLER_ID,
+ acc_restore_parent_end_handler,
+ SIXTP_NO_MORE_HANDLERS);
}
-static sixtp *
-gnc_account_parser_new(void)
+static sixtp*
+gnc_account_parser_new (void)
{
- sixtp *restore_pr;
- sixtp *ret;
+ sixtp* restore_pr;
+ sixtp* ret;
/* <account> */
- if (!(ret = sixtp_set_any(
- sixtp_new(), FALSE,
- SIXTP_START_HANDLER_ID, account_start_handler,
- SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
- SIXTP_NO_MORE_HANDLERS)))
+ if (! (ret = sixtp_set_any (
+ sixtp_new (), FALSE,
+ SIXTP_START_HANDLER_ID, account_start_handler,
+ SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
+ SIXTP_NO_MORE_HANDLERS)))
{
return NULL;
}
/* <account> <restore> */
- if (!(restore_pr =
- sixtp_set_any(sixtp_new(), FALSE,
+ if (! (restore_pr =
+ sixtp_set_any (sixtp_new (), FALSE,
SIXTP_START_HANDLER_ID, account_restore_start_handler,
SIXTP_END_HANDLER_ID, account_restore_end_handler,
SIXTP_FAIL_HANDLER_ID, account_restore_fail_handler,
@@ -1627,37 +1627,37 @@ gnc_account_parser_new(void)
account_restore_after_child_handler,
SIXTP_NO_MORE_HANDLERS)))
{
- sixtp_destroy(ret);
+ sixtp_destroy (ret);
return NULL;
}
/* <restore> (<name> | <guid> | <type> | <code> | <description> | <notes>)*/
- if (!sixtp_add_some_sub_parsers(
- restore_pr, TRUE,
- "name", restore_char_generator(acc_restore_name_end_handler),
- "guid", restore_char_generator(acc_restore_guid_end_handler),
- "type", restore_char_generator(acc_restore_type_end_handler),
- "code", restore_char_generator(acc_restore_code_end_handler),
- "description",
- restore_char_generator(acc_restore_description_end_handler),
- "notes", restore_char_generator(acc_restore_notes_end_handler),
- /* <account> <restore> <currency> */
- "currency", generic_gnc_commodity_lookup_parser_new(),
- /* <account> <restore> <security> */
- "security", generic_gnc_commodity_lookup_parser_new(),
- /* <account> <restore> <parent> */
- "parent", sixtp_add_some_sub_parsers(
- parent_lookup_parser_new(), TRUE,
- "guid", generic_guid_parser_new(),
- NULL, NULL),
- "slots", kvp_frame_parser_new(),
- NULL, NULL))
- {
- sixtp_destroy(ret);
+ if (!sixtp_add_some_sub_parsers (
+ restore_pr, TRUE,
+ "name", restore_char_generator (acc_restore_name_end_handler),
+ "guid", restore_char_generator (acc_restore_guid_end_handler),
+ "type", restore_char_generator (acc_restore_type_end_handler),
+ "code", restore_char_generator (acc_restore_code_end_handler),
+ "description",
+ restore_char_generator (acc_restore_description_end_handler),
+ "notes", restore_char_generator (acc_restore_notes_end_handler),
+ /* <account> <restore> <currency> */
+ "currency", generic_gnc_commodity_lookup_parser_new (),
+ /* <account> <restore> <security> */
+ "security", generic_gnc_commodity_lookup_parser_new (),
+ /* <account> <restore> <parent> */
+ "parent", sixtp_add_some_sub_parsers (
+ parent_lookup_parser_new (), TRUE,
+ "guid", generic_guid_parser_new (),
+ NULL, NULL),
+ "slots", kvp_frame_parser_new (),
+ NULL, NULL))
+ {
+ sixtp_destroy (ret);
return NULL;
}
- sixtp_add_sub_parser(ret, "restore", restore_pr);
+ sixtp_add_sub_parser (ret, "restore", restore_pr);
return ret;
}
@@ -1711,65 +1711,65 @@ gnc_account_parser_new(void)
typedef struct
{
- gchar *space;
- gchar *id;
- gchar *name;
- gchar *xcode;
+ gchar* space;
+ gchar* id;
+ gchar* name;
+ gchar* xcode;
gboolean seen_fraction;
int fraction;
} CommodityParseInfo;
static gboolean
-commodity_restore_start_handler(GSList* sibling_data, gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children, gpointer *result,
- const gchar *tag, gchar **attrs)
+commodity_restore_start_handler (GSList* sibling_data, gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children, gpointer* result,
+ const gchar* tag, gchar** attrs)
{
- CommodityParseInfo *cpi =
- (CommodityParseInfo *) g_new0(CommodityParseInfo, 1);
+ CommodityParseInfo* cpi =
+ (CommodityParseInfo*) g_new0 (CommodityParseInfo, 1);
- g_return_val_if_fail(cpi, FALSE);
+ g_return_val_if_fail (cpi, FALSE);
*data_for_children = cpi;
- return(TRUE);
+ return (TRUE);
}
/* ----------------------------------------------------*/
-#define COMMOD_TOKEN(NAME) \
- if(strcmp(child_result->tag, #NAME) == 0) { \
- if(cpi->NAME) return(FALSE); \
- cpi->NAME = (gchar *) child_result->data; \
- child_result->should_cleanup = FALSE; \
- } \
+#define COMMOD_TOKEN(NAME) \
+ if(strcmp(child_result->tag, #NAME) == 0) { \
+ if(cpi->NAME) return(FALSE); \
+ cpi->NAME = (gchar *) child_result->data; \
+ child_result->should_cleanup = FALSE; \
+ } \
else
/* ----------------------------------------------------*/
static gboolean
-commodity_restore_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
-{
- CommodityParseInfo *cpi = (CommodityParseInfo *) data_for_children;
-
- g_return_val_if_fail(cpi, FALSE);
- g_return_val_if_fail(child_result, FALSE);
-
- COMMOD_TOKEN(space)
- COMMOD_TOKEN(id)
- COMMOD_TOKEN(name)
- COMMOD_TOKEN(xcode)
- if (strcmp(child_result->tag, "fraction") == 0)
+commodity_restore_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
+{
+ CommodityParseInfo* cpi = (CommodityParseInfo*) data_for_children;
+
+ g_return_val_if_fail (cpi, FALSE);
+ g_return_val_if_fail (child_result, FALSE);
+
+ COMMOD_TOKEN (space)
+ COMMOD_TOKEN (id)
+ COMMOD_TOKEN (name)
+ COMMOD_TOKEN (xcode)
+ if (strcmp (child_result->tag, "fraction") == 0)
{
gint64 frac;
- if (cpi->seen_fraction) return(FALSE);
- string_to_gint64((gchar *) child_result->data, &frac);
+ if (cpi->seen_fraction) return (FALSE);
+ string_to_gint64 ((gchar*) child_result->data, &frac);
cpi->fraction = frac;
cpi->seen_fraction = TRUE;
child_result->should_cleanup = TRUE;
@@ -1777,101 +1777,101 @@ commodity_restore_after_child_handler(gpointer data_for_children,
else
{
/* redundant because the parser won't allow any other children */
- return(FALSE);
+ return (FALSE);
}
- return(TRUE);
+ return (TRUE);
}
static gboolean
-commodity_restore_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+commodity_restore_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- CommodityParseInfo *cpi = (CommodityParseInfo *) data_for_children;
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
+ CommodityParseInfo* cpi = (CommodityParseInfo*) data_for_children;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
gboolean ok = FALSE;
- gnc_commodity *comm = NULL;
+ gnc_commodity* comm = NULL;
- g_return_val_if_fail(cpi, FALSE);
+ g_return_val_if_fail (cpi, FALSE);
if (cpi->seen_fraction)
{
- gnc_commodity *comm;
+ gnc_commodity* comm;
- if (!cpi->space) cpi->space = g_strdup("");
- if (!cpi->id) cpi->id = g_strdup("");
- if (!cpi->name) cpi->name = g_strdup("");
- if (!cpi->xcode) cpi->xcode = g_strdup("");
+ if (!cpi->space) cpi->space = g_strdup ("");
+ if (!cpi->id) cpi->id = g_strdup ("");
+ if (!cpi->name) cpi->name = g_strdup ("");
+ if (!cpi->xcode) cpi->xcode = g_strdup ("");
- comm = gnc_commodity_new(pstatus->book,
- cpi->name,
- cpi->space,
- cpi->id,
- cpi->xcode,
- cpi->fraction);
+ comm = gnc_commodity_new (pstatus->book,
+ cpi->name,
+ cpi->space,
+ cpi->id,
+ cpi->xcode,
+ cpi->fraction);
if (comm)
{
- gnc_commodity_table *ctab;
+ gnc_commodity_table* ctab;
ctab = gnc_commodity_table_get_table (pstatus->book);
if (ctab)
{
- gnc_commodity_table_insert(ctab, comm);
+ gnc_commodity_table_insert (ctab, comm);
ok = TRUE;
}
}
}
- g_free(cpi->space);
- g_free(cpi->id);
- g_free(cpi->name);
- g_free(cpi->xcode);
- g_free(cpi);
+ g_free (cpi->space);
+ g_free (cpi->id);
+ g_free (cpi->name);
+ g_free (cpi->xcode);
+ g_free (cpi);
- if (!ok) gnc_commodity_destroy(comm);
+ if (!ok) gnc_commodity_destroy (comm);
- return(ok);
+ return (ok);
}
-static sixtp *
-commodity_restore_parser_new(void)
+static sixtp*
+commodity_restore_parser_new (void)
{
- sixtp *top_level;
- sixtp *restore_pr;
+ sixtp* top_level;
+ sixtp* restore_pr;
- top_level = sixtp_new();
- g_return_val_if_fail(top_level, NULL);
+ top_level = sixtp_new ();
+ g_return_val_if_fail (top_level, NULL);
- if (!(restore_pr = sixtp_set_any(
- sixtp_new(), FALSE,
- SIXTP_START_HANDLER_ID, commodity_restore_start_handler,
- SIXTP_END_HANDLER_ID, commodity_restore_end_handler,
- SIXTP_FAIL_HANDLER_ID, generic_free_data_for_children,
- SIXTP_AFTER_CHILD_HANDLER_ID, commodity_restore_after_child_handler,
- SIXTP_NO_MORE_HANDLERS)))
+ if (! (restore_pr = sixtp_set_any (
+ sixtp_new (), FALSE,
+ SIXTP_START_HANDLER_ID, commodity_restore_start_handler,
+ SIXTP_END_HANDLER_ID, commodity_restore_end_handler,
+ SIXTP_FAIL_HANDLER_ID, generic_free_data_for_children,
+ SIXTP_AFTER_CHILD_HANDLER_ID, commodity_restore_after_child_handler,
+ SIXTP_NO_MORE_HANDLERS)))
{
- sixtp_destroy(top_level);
- return(NULL);
+ sixtp_destroy (top_level);
+ return (NULL);
}
- sixtp_add_sub_parser(top_level, "restore", restore_pr);
+ sixtp_add_sub_parser (top_level, "restore", restore_pr);
- if (!sixtp_add_some_sub_parsers(
- restore_pr, TRUE,
- "space", simple_chars_only_parser_new(NULL),
- "id", simple_chars_only_parser_new(NULL),
- "name", simple_chars_only_parser_new(NULL),
- "xcode", simple_chars_only_parser_new(NULL),
- "fraction", simple_chars_only_parser_new(NULL),
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ restore_pr, TRUE,
+ "space", simple_chars_only_parser_new (NULL),
+ "id", simple_chars_only_parser_new (NULL),
+ "name", simple_chars_only_parser_new (NULL),
+ "xcode", simple_chars_only_parser_new (NULL),
+ "fraction", simple_chars_only_parser_new (NULL),
+ NULL, NULL))
{
return NULL;
}
- return(top_level);
+ return (top_level);
}
/****************************************************************************/
@@ -1913,82 +1913,82 @@ commodity_restore_parser_new(void)
typedef struct
{
- gchar *name_space;
- gchar *id;
+ gchar* name_space;
+ gchar* id;
} CommodityLookupParseInfo;
static gboolean
-generic_gnc_commodity_lookup_start_handler(
+generic_gnc_commodity_lookup_start_handler (
GSList* sibling_data, gpointer parent_data, gpointer global_data,
- gpointer *data_for_children, gpointer *result, const gchar *tag,
- gchar **attrs)
+ gpointer* data_for_children, gpointer* result, const gchar* tag,
+ gchar** attrs)
{
- CommodityLookupParseInfo *cpi = g_new0(CommodityLookupParseInfo, 1);
- g_return_val_if_fail(cpi, FALSE);
+ CommodityLookupParseInfo* cpi = g_new0 (CommodityLookupParseInfo, 1);
+ g_return_val_if_fail (cpi, FALSE);
*data_for_children = cpi;
- return(TRUE);
+ return (TRUE);
}
static gboolean
-generic_gnc_commodity_lookup_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
-{
- CommodityLookupParseInfo *cpi =
- (CommodityLookupParseInfo *) data_for_children;
-
- g_return_val_if_fail(cpi, FALSE);
- g_return_val_if_fail(child_result, FALSE);
- if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(FALSE);
-
- if (strcmp(child_result->tag, "space") == 0)
- {
- if (cpi->name_space) return(FALSE);
- cpi->name_space = (gchar *) child_result->data;
+generic_gnc_commodity_lookup_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
+{
+ CommodityLookupParseInfo* cpi =
+ (CommodityLookupParseInfo*) data_for_children;
+
+ g_return_val_if_fail (cpi, FALSE);
+ g_return_val_if_fail (child_result, FALSE);
+ if (child_result->type != SIXTP_CHILD_RESULT_NODE) return (FALSE);
+
+ if (strcmp (child_result->tag, "space") == 0)
+ {
+ if (cpi->name_space) return (FALSE);
+ cpi->name_space = (gchar*) child_result->data;
child_result->should_cleanup = FALSE;
}
- else if (strcmp(child_result->tag, "id") == 0)
+ else if (strcmp (child_result->tag, "id") == 0)
{
- if (cpi->id) return(FALSE);
- cpi->id = (gchar *) child_result->data;
+ if (cpi->id) return (FALSE);
+ cpi->id = (gchar*) child_result->data;
child_result->should_cleanup = FALSE;
}
else
{
/* redundant because the parser won't allow any other children */
- return(FALSE);
+ return (FALSE);
}
- return(TRUE);
+ return (TRUE);
}
static gboolean
-generic_gnc_commodity_lookup_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
-{
- CommodityLookupParseInfo *cpi =
- (CommodityLookupParseInfo *) data_for_children;
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
+generic_gnc_commodity_lookup_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
+{
+ CommodityLookupParseInfo* cpi =
+ (CommodityLookupParseInfo*) data_for_children;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
gboolean ok = FALSE;
- g_return_val_if_fail(cpi, FALSE);
+ g_return_val_if_fail (cpi, FALSE);
if (cpi->name_space && cpi->id)
{
- gnc_commodity_table *table;
- gnc_commodity *com;
+ gnc_commodity_table* table;
+ gnc_commodity* com;
table = gnc_commodity_table_get_table (pstatus->book);
- com = gnc_commodity_table_lookup(table, cpi->name_space, cpi->id);
+ com = gnc_commodity_table_lookup (table, cpi->name_space, cpi->id);
if (com)
{
@@ -1997,42 +1997,42 @@ generic_gnc_commodity_lookup_end_handler(gpointer data_for_children,
}
}
- g_free(cpi->name_space);
- g_free(cpi->id);
- g_free(cpi);
+ g_free (cpi->name_space);
+ g_free (cpi->id);
+ g_free (cpi);
- return(ok);
+ return (ok);
}
-static sixtp *
-generic_gnc_commodity_lookup_parser_new(void)
+static sixtp*
+generic_gnc_commodity_lookup_parser_new (void)
{
- sixtp *top_level;
+ sixtp* top_level;
- if (!(top_level = sixtp_set_any(
- sixtp_new(), FALSE,
- SIXTP_START_HANDLER_ID, generic_gnc_commodity_lookup_start_handler,
- SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
- SIXTP_END_HANDLER_ID, generic_gnc_commodity_lookup_end_handler,
- SIXTP_FAIL_HANDLER_ID, generic_free_data_for_children,
- SIXTP_AFTER_CHILD_HANDLER_ID,
- generic_gnc_commodity_lookup_after_child_handler,
- SIXTP_NO_MORE_HANDLERS)))
+ if (! (top_level = sixtp_set_any (
+ sixtp_new (), FALSE,
+ SIXTP_START_HANDLER_ID, generic_gnc_commodity_lookup_start_handler,
+ SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
+ SIXTP_END_HANDLER_ID, generic_gnc_commodity_lookup_end_handler,
+ SIXTP_FAIL_HANDLER_ID, generic_free_data_for_children,
+ SIXTP_AFTER_CHILD_HANDLER_ID,
+ generic_gnc_commodity_lookup_after_child_handler,
+ SIXTP_NO_MORE_HANDLERS)))
{
return NULL;
}
- if (!sixtp_add_some_sub_parsers(
- top_level, TRUE,
- "space", simple_chars_only_parser_new(NULL),
- "id", simple_chars_only_parser_new(NULL),
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ top_level, TRUE,
+ "space", simple_chars_only_parser_new (NULL),
+ "id", simple_chars_only_parser_new (NULL),
+ NULL, NULL))
{
return NULL;
}
- return(top_level);
+ return (top_level);
}
/****************************************************************************/
@@ -2067,13 +2067,13 @@ generic_gnc_commodity_lookup_parser_new(void)
*/
static gboolean
-transaction_start_handler(GSList* sibling_data, gpointer parent_data,
- gpointer global_data, gpointer *data_for_children,
- gpointer *result, const gchar *tag, gchar **attrs)
+transaction_start_handler (GSList* sibling_data, gpointer parent_data,
+ gpointer global_data, gpointer* data_for_children,
+ gpointer* result, const gchar* tag, gchar** attrs)
{
/* pass the parent data down to the children */
*data_for_children = parent_data;
- return(TRUE);
+ return (TRUE);
}
/****************************************************************************/
@@ -2111,91 +2111,91 @@ transaction_start_handler(GSList* sibling_data, gpointer parent_data,
*/
static gboolean
-txn_restore_start_handler(GSList* sibling_data, gpointer parent_data,
- gpointer global_data, gpointer *data_for_children,
- gpointer *result, const gchar *tag, gchar **attrs)
+txn_restore_start_handler (GSList* sibling_data, gpointer parent_data,
+ gpointer global_data, gpointer* data_for_children,
+ gpointer* result, const gchar* tag, gchar** attrs)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Transaction *trans = xaccMallocTransaction(pstatus->book);
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Transaction* trans = xaccMallocTransaction (pstatus->book);
- g_return_val_if_fail(trans, FALSE);
+ g_return_val_if_fail (trans, FALSE);
- xaccTransBeginEdit(trans);
+ xaccTransBeginEdit (trans);
*data_for_children = trans;
- return(TRUE);
+ return (TRUE);
}
static gboolean
-txn_restore_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Account *parent = (Account *) parent_data;
- Transaction *trans = (Transaction *) data_for_children;
+ Account* parent = (Account*) parent_data;
+ Transaction* trans = (Transaction*) data_for_children;
- g_return_val_if_fail(trans, FALSE);
+ g_return_val_if_fail (trans, FALSE);
if (!parent)
{
- xaccTransDestroy(trans);
- xaccTransCommitEdit(trans);
- return(FALSE);
+ xaccTransDestroy (trans);
+ xaccTransCommitEdit (trans);
+ return (FALSE);
}
- if (!xaccTransGetGUID(trans))
+ if (!xaccTransGetGUID (trans))
{
/* must at least have a GncGUID for a restore */
- xaccTransDestroy(trans);
- xaccTransCommitEdit(trans);
- return(FALSE);
+ xaccTransDestroy (trans);
+ xaccTransCommitEdit (trans);
+ return (FALSE);
}
/* FIXME: what if the trans has no splits? */
- xaccTransCommitEdit(trans);
+ xaccTransCommitEdit (trans);
- return(TRUE);
+ return (TRUE);
}
static gboolean
-txn_restore_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
-{
- Transaction *trans = (Transaction *) data_for_children;
- g_return_val_if_fail(trans, FALSE);
- if (!child_result) return(TRUE);
- if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(TRUE);
- if (strcmp(child_result->tag, "slots") == 0)
- {
- KvpFrame *f = (KvpFrame *) child_result->data;
- g_return_val_if_fail(f, FALSE);
- qof_instance_set_slots(QOF_INSTANCE(trans), f);
+txn_restore_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
+{
+ Transaction* trans = (Transaction*) data_for_children;
+ g_return_val_if_fail (trans, FALSE);
+ if (!child_result) return (TRUE);
+ if (child_result->type != SIXTP_CHILD_RESULT_NODE) return (TRUE);
+ if (strcmp (child_result->tag, "slots") == 0)
+ {
+ KvpFrame* f = (KvpFrame*) child_result->data;
+ g_return_val_if_fail (f, FALSE);
+ qof_instance_set_slots (QOF_INSTANCE (trans), f);
child_result->should_cleanup = FALSE;
}
- return(TRUE);
+ return (TRUE);
}
static void
-txn_restore_fail_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
-{
- Transaction *trans = (Transaction *) data_for_children;
+txn_restore_fail_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
+{
+ Transaction* trans = (Transaction*) data_for_children;
if (trans)
{
- xaccTransDestroy(trans);
- xaccTransCommitEdit(trans);
+ xaccTransDestroy (trans);
+ xaccTransCommitEdit (trans);
}
}
@@ -2221,34 +2221,34 @@ txn_restore_fail_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_guid_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_guid_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Transaction *t = (Transaction *) parent_data;
- gchar *txt = NULL;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Transaction* t = (Transaction*) parent_data;
+ gchar* txt = NULL;
GncGUID gid;
gboolean ok;
- g_return_val_if_fail(t, FALSE);
+ g_return_val_if_fail (t, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = string_to_guid(txt, &gid);
- g_free(txt);
+ ok = string_to_guid (txt, &gid);
+ g_free (txt);
- g_return_val_if_fail(ok, FALSE);
+ g_return_val_if_fail (ok, FALSE);
- if (xaccTransLookup(&gid, pstatus->book))
+ if (xaccTransLookup (&gid, pstatus->book))
{
- return(FALSE);
+ return (FALSE);
}
- xaccTransSetGUID(t, &gid);
- return(TRUE);
+ xaccTransSetGUID (t, &gid);
+ return (TRUE);
}
/****************************************************************************/
@@ -2273,22 +2273,22 @@ txn_restore_guid_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_num_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_num_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Transaction *t = (Transaction *) parent_data;
- gchar *txt = NULL;
+ Transaction* t = (Transaction*) parent_data;
+ gchar* txt = NULL;
- g_return_val_if_fail(t, FALSE);
+ g_return_val_if_fail (t, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- xaccTransSetNum(t, txt);
- g_free(txt);
- return(TRUE);
+ xaccTransSetNum (t, txt);
+ g_free (txt);
+ return (TRUE);
}
/****************************************************************************/
@@ -2313,22 +2313,22 @@ txn_restore_num_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_description_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_description_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Transaction *t = (Transaction *) parent_data;
- gchar *txt = NULL;
+ Transaction* t = (Transaction*) parent_data;
+ gchar* txt = NULL;
- g_return_val_if_fail(t, FALSE);
+ g_return_val_if_fail (t, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- xaccTransSetDescription(t, txt);
- g_free(txt);
- return(TRUE);
+ xaccTransSetDescription (t, txt);
+ g_free (txt);
+ return (TRUE);
}
/****************************************************************************/
@@ -2343,24 +2343,24 @@ txn_restore_description_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_rest_date_posted_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_rest_date_posted_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Transaction *t = (Transaction *) parent_data;
- TimespecParseInfo *info = (TimespecParseInfo *) data_for_children;
+ Transaction* t = (Transaction*) parent_data;
+ TimespecParseInfo* info = (TimespecParseInfo*) data_for_children;
- g_return_val_if_fail(info, FALSE);
- if (!t || !timespec_parse_ok(info))
+ g_return_val_if_fail (info, FALSE);
+ if (!t || !timespec_parse_ok (info))
{
- g_free(info);
- return(FALSE);
+ g_free (info);
+ return (FALSE);
}
- xaccTransSetDatePostedTS(t, &(info->ts));
- g_free(info);
- return(TRUE);
+ xaccTransSetDatePostedTS (t, & (info->ts));
+ g_free (info);
+ return (TRUE);
}
/****************************************************************************/
@@ -2375,24 +2375,24 @@ txn_rest_date_posted_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_rest_date_entered_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_rest_date_entered_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Transaction *t = (Transaction *) parent_data;
- TimespecParseInfo *info = (TimespecParseInfo *) data_for_children;
+ Transaction* t = (Transaction*) parent_data;
+ TimespecParseInfo* info = (TimespecParseInfo*) data_for_children;
- g_return_val_if_fail(info, FALSE);
- if (!t || !timespec_parse_ok(info))
+ g_return_val_if_fail (info, FALSE);
+ if (!t || !timespec_parse_ok (info))
{
- g_free(info);
- return(FALSE);
+ g_free (info);
+ return (FALSE);
}
- xaccTransSetDateEnteredTS(t, &(info->ts));
- g_free(info);
- return(TRUE);
+ xaccTransSetDateEnteredTS (t, & (info->ts));
+ g_free (info);
+ return (TRUE);
}
@@ -2422,98 +2422,98 @@ txn_rest_date_entered_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_split_start_handler(GSList* sibling_data, gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children, gpointer *result,
- const gchar *tag, gchar **attrs)
-{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Split *s = xaccMallocSplit(pstatus->book);
- g_return_val_if_fail(s, FALSE);
+txn_restore_split_start_handler (GSList* sibling_data, gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children, gpointer* result,
+ const gchar* tag, gchar** attrs)
+{
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Split* s = xaccMallocSplit (pstatus->book);
+ g_return_val_if_fail (s, FALSE);
*data_for_children = s;
- return(TRUE);
+ return (TRUE);
}
static gboolean
-txn_restore_split_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_split_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Transaction *t = (Transaction *) parent_data;
- Split *s = (Split *) data_for_children;
+ Transaction* t = (Transaction*) parent_data;
+ Split* s = (Split*) data_for_children;
- g_return_val_if_fail(s, FALSE);
+ g_return_val_if_fail (s, FALSE);
if (!t)
{
- xaccSplitDestroy(s);
- return(FALSE);
+ xaccSplitDestroy (s);
+ return (FALSE);
}
- if (!xaccSplitGetGUID(s))
+ if (!xaccSplitGetGUID (s))
{
/* must at least have a GncGUID for a restore */
- xaccSplitDestroy(s);
- return(FALSE);
+ xaccSplitDestroy (s);
+ return (FALSE);
}
- xaccTransAppendSplit(t, s);
- return(TRUE);
+ xaccTransAppendSplit (t, s);
+ return (TRUE);
}
static gboolean
-txn_restore_split_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
-{
- Split *s = (Split *) data_for_children;
- g_return_val_if_fail(s, FALSE);
- if (!child_result) return(TRUE);
- if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(TRUE);
-
- if (strcmp(child_result->tag, "slots") == 0)
- {
- KvpFrame *f = static_cast<KvpFrame*>(child_result->data);
- g_return_val_if_fail(f, FALSE);
+txn_restore_split_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
+{
+ Split* s = (Split*) data_for_children;
+ g_return_val_if_fail (s, FALSE);
+ if (!child_result) return (TRUE);
+ if (child_result->type != SIXTP_CHILD_RESULT_NODE) return (TRUE);
+
+ if (strcmp (child_result->tag, "slots") == 0)
+ {
+ KvpFrame* f = static_cast<KvpFrame*> (child_result->data);
+ g_return_val_if_fail (f, FALSE);
if (s->inst.kvp_data) delete s->inst.kvp_data;
s->inst.kvp_data = f;
child_result->should_cleanup = FALSE;
}
- else if (strcmp(child_result->tag, "quantity") == 0)
+ else if (strcmp (child_result->tag, "quantity") == 0)
{
- gnc_numeric *n = (gnc_numeric *) child_result->data;
- g_return_val_if_fail(n, FALSE);
- xaccSplitSetAmount(s, *n);
+ gnc_numeric* n = (gnc_numeric*) child_result->data;
+ g_return_val_if_fail (n, FALSE);
+ xaccSplitSetAmount (s, *n);
/* let the normal child_result handler clean up n */
}
- else if (strcmp(child_result->tag, "value") == 0)
+ else if (strcmp (child_result->tag, "value") == 0)
{
- gnc_numeric *n = (gnc_numeric *) child_result->data;
- g_return_val_if_fail(n, FALSE);
- xaccSplitSetValue(s, *n);
+ gnc_numeric* n = (gnc_numeric*) child_result->data;
+ g_return_val_if_fail (n, FALSE);
+ xaccSplitSetValue (s, *n);
/* let the normal child_result handler clean up n */
}
- return(TRUE);
+ return (TRUE);
}
static void
-txn_restore_split_fail_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+txn_restore_split_fail_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
- Split *s = (Split *) data_for_children;
- if (s) xaccSplitDestroy(s);
+ Split* s = (Split*) data_for_children;
+ if (s) xaccSplitDestroy (s);
}
/****************************************************************************/
@@ -2538,34 +2538,34 @@ txn_restore_split_fail_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_split_guid_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_split_guid_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Split *s = (Split *) parent_data;
- gchar *txt = NULL;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Split* s = (Split*) parent_data;
+ gchar* txt = NULL;
GncGUID gid;
gboolean ok;
- g_return_val_if_fail(s, FALSE);
+ g_return_val_if_fail (s, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = string_to_guid(txt, &gid);
- g_free(txt);
+ ok = string_to_guid (txt, &gid);
+ g_free (txt);
- g_return_val_if_fail(ok, FALSE);
+ g_return_val_if_fail (ok, FALSE);
- if (xaccSplitLookup(&gid, pstatus->book))
+ if (xaccSplitLookup (&gid, pstatus->book))
{
- return(FALSE);
+ return (FALSE);
}
- xaccSplitSetGUID(s, &gid);
- return(TRUE);
+ xaccSplitSetGUID (s, &gid);
+ return (TRUE);
}
/****************************************************************************/
@@ -2590,22 +2590,22 @@ txn_restore_split_guid_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_split_memo_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_split_memo_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Split *s = (Split *) parent_data;
- gchar *txt = NULL;
+ Split* s = (Split*) parent_data;
+ gchar* txt = NULL;
- g_return_val_if_fail(s, FALSE);
+ g_return_val_if_fail (s, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- xaccSplitSetMemo(s, txt);
- g_free(txt);
- return(TRUE);
+ xaccSplitSetMemo (s, txt);
+ g_free (txt);
+ return (TRUE);
}
/****************************************************************************/
@@ -2630,22 +2630,22 @@ txn_restore_split_memo_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_split_action_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_split_action_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Split *s = (Split *) parent_data;
- gchar *txt = NULL;
+ Split* s = (Split*) parent_data;
+ gchar* txt = NULL;
- g_return_val_if_fail(s, FALSE);
+ g_return_val_if_fail (s, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- xaccSplitSetAction(s, txt);
- g_free(txt);
- return(TRUE);
+ xaccSplitSetAction (s, txt);
+ g_free (txt);
+ return (TRUE);
}
/****************************************************************************/
@@ -2670,28 +2670,28 @@ txn_restore_split_action_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_split_reconcile_state_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_split_reconcile_state_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Split *s = (Split *) parent_data;
- gchar *txt = NULL;
+ Split* s = (Split*) parent_data;
+ gchar* txt = NULL;
- g_return_val_if_fail(s, FALSE);
+ g_return_val_if_fail (s, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- if (strlen(txt) != 1)
+ if (strlen (txt) != 1)
{
- g_free(txt);
- return(FALSE);
+ g_free (txt);
+ return (FALSE);
}
- xaccSplitSetReconcile(s, txt[0]);
- g_free(txt);
- return(TRUE);
+ xaccSplitSetReconcile (s, txt[0]);
+ g_free (txt);
+ return (TRUE);
}
/****************************************************************************/
@@ -2706,24 +2706,24 @@ txn_restore_split_reconcile_state_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_split_reconcile_date_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+txn_restore_split_reconcile_date_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- Split *s = (Split *) parent_data;
- TimespecParseInfo *info = (TimespecParseInfo *) data_for_children;
+ Split* s = (Split*) parent_data;
+ TimespecParseInfo* info = (TimespecParseInfo*) data_for_children;
- g_return_val_if_fail(info, FALSE);
- if (!s || !timespec_parse_ok(info))
+ g_return_val_if_fail (info, FALSE);
+ if (!s || !timespec_parse_ok (info))
{
- g_free(info);
- return(FALSE);
+ g_free (info);
+ return (FALSE);
}
- xaccSplitSetDateReconciledTS(s, &(info->ts));
- g_free(info);
- return(TRUE);
+ xaccSplitSetDateReconciledTS (s, & (info->ts));
+ g_free (info);
+ return (TRUE);
}
/****************************************************************************/
@@ -2748,33 +2748,33 @@ txn_restore_split_reconcile_date_end_handler(gpointer data_for_children,
*/
static gboolean
-txn_restore_split_account_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
-{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- Split *s = (Split *) parent_data;
- Account *acct;
- gchar *txt = NULL;
+txn_restore_split_account_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
+{
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ Split* s = (Split*) parent_data;
+ Account* acct;
+ gchar* txt = NULL;
GncGUID gid;
gboolean ok;
- g_return_val_if_fail(s, FALSE);
+ g_return_val_if_fail (s, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = string_to_guid(txt, &gid);
- g_free(txt);
+ ok = string_to_guid (txt, &gid);
+ g_free (txt);
- g_return_val_if_fail(ok, FALSE);
+ g_return_val_if_fail (ok, FALSE);
- acct = xaccAccountLookup(&gid, pstatus->book);
- g_return_val_if_fail(acct, FALSE);
+ acct = xaccAccountLookup (&gid, pstatus->book);
+ g_return_val_if_fail (acct, FALSE);
- xaccAccountInsertSplit(acct, s);
- return(TRUE);
+ xaccAccountInsertSplit (acct, s);
+ return (TRUE);
}
@@ -2783,13 +2783,13 @@ txn_restore_split_account_end_handler(gpointer data_for_children,
/****************************************************************************/
-static sixtp *
-gnc_txn_restore_split_parser_new(void)
+static sixtp*
+gnc_txn_restore_split_parser_new (void)
{
- sixtp *top_level;
+ sixtp* top_level;
- if (!(top_level =
- sixtp_set_any(sixtp_new(), FALSE,
+ if (! (top_level =
+ sixtp_set_any (sixtp_new (), FALSE,
SIXTP_START_HANDLER_ID, txn_restore_split_start_handler,
SIXTP_CHARACTERS_HANDLER_ID,
allow_and_ignore_only_whitespace,
@@ -2802,40 +2802,40 @@ gnc_txn_restore_split_parser_new(void)
return NULL;
}
- if (!sixtp_add_some_sub_parsers(
- top_level, TRUE,
- "guid", restore_char_generator(txn_restore_split_guid_end_handler),
- "memo", restore_char_generator(txn_restore_split_memo_end_handler),
- "action",
- restore_char_generator(txn_restore_split_action_end_handler),
- "account",
- restore_char_generator(txn_restore_split_account_end_handler),
- "reconcile-state",
- restore_char_generator(txn_restore_split_reconcile_state_end_handler),
- "reconcile-date",
- generic_timespec_parser_new(
- txn_restore_split_reconcile_date_end_handler),
- "quantity", generic_gnc_numeric_parser_new(),
- "value", generic_gnc_numeric_parser_new(),
- "slots", kvp_frame_parser_new(),
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ top_level, TRUE,
+ "guid", restore_char_generator (txn_restore_split_guid_end_handler),
+ "memo", restore_char_generator (txn_restore_split_memo_end_handler),
+ "action",
+ restore_char_generator (txn_restore_split_action_end_handler),
+ "account",
+ restore_char_generator (txn_restore_split_account_end_handler),
+ "reconcile-state",
+ restore_char_generator (txn_restore_split_reconcile_state_end_handler),
+ "reconcile-date",
+ generic_timespec_parser_new (
+ txn_restore_split_reconcile_date_end_handler),
+ "quantity", generic_gnc_numeric_parser_new (),
+ "value", generic_gnc_numeric_parser_new (),
+ "slots", kvp_frame_parser_new (),
+ NULL, NULL))
{
return NULL;
}
- return(top_level);
+ return (top_level);
}
/***************************************************************************/
-static sixtp *
-gnc_transaction_parser_new(void)
+static sixtp*
+gnc_transaction_parser_new (void)
{
- sixtp *top_level;
- sixtp *restore_pr;
+ sixtp* top_level;
+ sixtp* restore_pr;
- if (!(top_level =
- sixtp_set_any(sixtp_new(), FALSE,
+ if (! (top_level =
+ sixtp_set_any (sixtp_new (), FALSE,
SIXTP_START_HANDLER_ID, transaction_start_handler,
SIXTP_CHARACTERS_HANDLER_ID,
allow_and_ignore_only_whitespace,
@@ -2847,8 +2847,8 @@ gnc_transaction_parser_new(void)
}
/* <restore> */
- if (!(restore_pr =
- sixtp_set_any(sixtp_new(), FALSE,
+ if (! (restore_pr =
+ sixtp_set_any (sixtp_new (), FALSE,
SIXTP_START_HANDLER_ID, txn_restore_start_handler,
SIXTP_END_HANDLER_ID, txn_restore_end_handler,
SIXTP_FAIL_HANDLER_ID, txn_restore_fail_handler,
@@ -2856,30 +2856,30 @@ gnc_transaction_parser_new(void)
txn_restore_after_child_handler,
SIXTP_NO_MORE_HANDLERS)))
{
- sixtp_destroy(top_level);
- return(NULL);
- }
- sixtp_add_sub_parser(top_level, "restore", restore_pr);
-
- if (!(sixtp_add_some_sub_parsers(
- restore_pr, TRUE,
- "guid", restore_char_generator(txn_restore_guid_end_handler),
- "num", restore_char_generator(txn_restore_num_end_handler),
- "description",
- restore_char_generator(txn_restore_description_end_handler),
- "date-posted",
- generic_timespec_parser_new(txn_rest_date_posted_end_handler),
- "date-entered",
- generic_timespec_parser_new(txn_rest_date_entered_end_handler),
- "slots", kvp_frame_parser_new(),
- "split", gnc_txn_restore_split_parser_new(),
- NULL, NULL)))
- {
- sixtp_destroy(top_level);
+ sixtp_destroy (top_level);
+ return (NULL);
+ }
+ sixtp_add_sub_parser (top_level, "restore", restore_pr);
+
+ if (! (sixtp_add_some_sub_parsers (
+ restore_pr, TRUE,
+ "guid", restore_char_generator (txn_restore_guid_end_handler),
+ "num", restore_char_generator (txn_restore_num_end_handler),
+ "description",
+ restore_char_generator (txn_restore_description_end_handler),
+ "date-posted",
+ generic_timespec_parser_new (txn_rest_date_posted_end_handler),
+ "date-entered",
+ generic_timespec_parser_new (txn_rest_date_entered_end_handler),
+ "slots", kvp_frame_parser_new (),
+ "split", gnc_txn_restore_split_parser_new (),
+ NULL, NULL)))
+ {
+ sixtp_destroy (top_level);
return NULL;
}
- return(top_level);
+ return (top_level);
}
/****************************************************************************/
@@ -2931,76 +2931,76 @@ gnc_transaction_parser_new(void)
*/
static gboolean
-price_parse_xml_sub_node(GNCPrice *p, xmlNodePtr sub_node, QofBook *book)
+price_parse_xml_sub_node (GNCPrice* p, xmlNodePtr sub_node, QofBook* book)
{
if (!p || !sub_node) return FALSE;
gnc_price_begin_edit (p);
- if (g_strcmp0("price:id", (char*)sub_node->name) == 0)
+ if (g_strcmp0 ("price:id", (char*)sub_node->name) == 0)
{
- GncGUID *c = dom_tree_to_guid(sub_node);
+ GncGUID* c = dom_tree_to_guid (sub_node);
if (!c) return FALSE;
- gnc_price_set_guid(p, c);
- g_free(c);
+ gnc_price_set_guid (p, c);
+ g_free (c);
}
- else if (g_strcmp0("price:commodity", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:commodity", (char*)sub_node->name) == 0)
{
- gnc_commodity *c = dom_tree_to_commodity_ref(sub_node, book);
+ gnc_commodity* c = dom_tree_to_commodity_ref (sub_node, book);
if (!c) return FALSE;
- gnc_price_set_commodity(p, c);
+ gnc_price_set_commodity (p, c);
}
- else if (g_strcmp0("price:currency", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:currency", (char*)sub_node->name) == 0)
{
- gnc_commodity *c = dom_tree_to_commodity_ref(sub_node, book);
+ gnc_commodity* c = dom_tree_to_commodity_ref (sub_node, book);
if (!c) return FALSE;
- gnc_price_set_currency(p, c);
+ gnc_price_set_currency (p, c);
}
- else if (g_strcmp0("price:time", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:time", (char*)sub_node->name) == 0)
{
- Timespec t = dom_tree_to_timespec(sub_node);
- if (!dom_tree_valid_timespec(&t, sub_node->name)) return FALSE;
- gnc_price_set_time(p, t);
+ Timespec t = dom_tree_to_timespec (sub_node);
+ if (!dom_tree_valid_timespec (&t, sub_node->name)) return FALSE;
+ gnc_price_set_time (p, t);
}
- else if (g_strcmp0("price:source", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:source", (char*)sub_node->name) == 0)
{
- char *text = dom_tree_to_text(sub_node);
+ char* text = dom_tree_to_text (sub_node);
if (!text) return FALSE;
- gnc_price_set_source_string(p, text);
- g_free(text);
+ gnc_price_set_source_string (p, text);
+ g_free (text);
}
- else if (g_strcmp0("price:type", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:type", (char*)sub_node->name) == 0)
{
- char *text = dom_tree_to_text(sub_node);
+ char* text = dom_tree_to_text (sub_node);
if (!text) return FALSE;
- gnc_price_set_typestr(p, text);
- g_free(text);
+ gnc_price_set_typestr (p, text);
+ g_free (text);
}
- else if (g_strcmp0("price:value", (char*)sub_node->name) == 0)
+ else if (g_strcmp0 ("price:value", (char*)sub_node->name) == 0)
{
- gnc_numeric *value = dom_tree_to_gnc_numeric(sub_node);
+ gnc_numeric* value = dom_tree_to_gnc_numeric (sub_node);
if (!value) return FALSE;
- gnc_price_set_value(p, *value);
- g_free(value);
+ gnc_price_set_value (p, *value);
+ g_free (value);
}
gnc_price_commit_edit (p);
return TRUE;
}
static gboolean
-price_parse_xml_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+price_parse_xml_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
gboolean ok = TRUE;
xmlNodePtr price_xml = (xmlNodePtr) data_for_children;
xmlNodePtr child;
- GNCPrice *p = NULL;
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
+ GNCPrice* p = NULL;
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
/* we haven't been handed the *top* level node yet... */
if (parent_data) return TRUE;
@@ -3024,7 +3024,7 @@ price_parse_xml_end_handler(gpointer data_for_children,
goto cleanup_and_exit;
}
- p = gnc_price_create(pstatus->book);
+ p = gnc_price_create (pstatus->book);
if (!p)
{
ok = FALSE;
@@ -3039,14 +3039,14 @@ price_parse_xml_end_handler(gpointer data_for_children,
case XML_TEXT_NODE:
break;
case XML_ELEMENT_NODE:
- if (!price_parse_xml_sub_node(p, child, pstatus->book))
+ if (!price_parse_xml_sub_node (p, child, pstatus->book))
{
ok = FALSE;
goto cleanup_and_exit;
}
break;
default:
- PERR("Unknown node type (%d) while parsing gnc-price xml.", child->type);
+ PERR ("Unknown node type (%d) while parsing gnc-price xml.", child->type);
child = NULL;
ok = FALSE;
goto cleanup_and_exit;
@@ -3062,24 +3062,24 @@ cleanup_and_exit:
else
{
*result = NULL;
- gnc_price_unref(p);
+ gnc_price_unref (p);
}
- xmlFreeNode(price_xml);
+ xmlFreeNode (price_xml);
return ok;
}
static void
-cleanup_gnc_price(sixtp_child_result *result)
+cleanup_gnc_price (sixtp_child_result* result)
{
- if (result->data) gnc_price_unref((GNCPrice *) result->data);
+ if (result->data) gnc_price_unref ((GNCPrice*) result->data);
}
-static sixtp *
+static sixtp*
gnc_price_parser_new (void)
{
- return sixtp_dom_parser_new(price_parse_xml_end_handler,
- cleanup_gnc_price,
- cleanup_gnc_price);
+ return sixtp_dom_parser_new (price_parse_xml_end_handler,
+ cleanup_gnc_price,
+ cleanup_gnc_price);
}
@@ -3100,46 +3100,46 @@ gnc_price_parser_new (void)
*/
static gboolean
-pricedb_start_handler(GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children,
- gpointer *result,
- const gchar *tag,
- gchar **attrs)
-{
- GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
- GNCPriceDB *db = gnc_pricedb_get_db(pstatus->book);
- g_return_val_if_fail(db, FALSE);
+pricedb_start_handler (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children,
+ gpointer* result,
+ const gchar* tag,
+ gchar** attrs)
+{
+ GNCParseStatus* pstatus = (GNCParseStatus*) global_data;
+ GNCPriceDB* db = gnc_pricedb_get_db (pstatus->book);
+ g_return_val_if_fail (db, FALSE);
*result = db;
- return(TRUE);
+ return (TRUE);
}
static gboolean
-pricedb_after_child_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result)
+pricedb_after_child_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result)
{
- GNCPriceDB *db = (GNCPriceDB *) * result;
+ GNCPriceDB* db = (GNCPriceDB*) * result;
- g_return_val_if_fail(db, FALSE);
+ g_return_val_if_fail (db, FALSE);
/* right now children have to produce results :> */
- if (!child_result) return(FALSE);
- if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(FALSE);
+ if (!child_result) return (FALSE);
+ if (child_result->type != SIXTP_CHILD_RESULT_NODE) return (FALSE);
- if (strcmp(child_result->tag, "price") == 0)
+ if (strcmp (child_result->tag, "price") == 0)
{
- GNCPrice *p = (GNCPrice *) child_result->data;
+ GNCPrice* p = (GNCPrice*) child_result->data;
- g_return_val_if_fail(p, FALSE);
- gnc_pricedb_add_price(db, p);
+ g_return_val_if_fail (p, FALSE);
+ gnc_pricedb_add_price (db, p);
return TRUE;
}
else
@@ -3150,43 +3150,43 @@ pricedb_after_child_handler(gpointer data_for_children,
}
static void
-pricedb_cleanup_result_handler(sixtp_child_result *result)
+pricedb_cleanup_result_handler (sixtp_child_result* result)
{
if (result->data)
{
- GNCPriceDB *db = (GNCPriceDB *) result->data;
- if (db) gnc_pricedb_destroy(db);
+ GNCPriceDB* db = (GNCPriceDB*) result->data;
+ if (db) gnc_pricedb_destroy (db);
result->data = NULL;
}
}
static sixtp*
-gnc_pricedb_parser_new(void)
+gnc_pricedb_parser_new (void)
{
- sixtp *top_level;
- sixtp *price_parser;
+ sixtp* top_level;
+ sixtp* price_parser;
top_level =
- sixtp_set_any(sixtp_new(), TRUE,
- SIXTP_START_HANDLER_ID, pricedb_start_handler,
- SIXTP_AFTER_CHILD_HANDLER_ID, pricedb_after_child_handler,
- SIXTP_CHARACTERS_HANDLER_ID,
- allow_and_ignore_only_whitespace,
- SIXTP_RESULT_FAIL_ID, pricedb_cleanup_result_handler,
- SIXTP_CLEANUP_RESULT_ID, pricedb_cleanup_result_handler,
- SIXTP_NO_MORE_HANDLERS);
+ sixtp_set_any (sixtp_new (), TRUE,
+ SIXTP_START_HANDLER_ID, pricedb_start_handler,
+ SIXTP_AFTER_CHILD_HANDLER_ID, pricedb_after_child_handler,
+ SIXTP_CHARACTERS_HANDLER_ID,
+ allow_and_ignore_only_whitespace,
+ SIXTP_RESULT_FAIL_ID, pricedb_cleanup_result_handler,
+ SIXTP_CLEANUP_RESULT_ID, pricedb_cleanup_result_handler,
+ SIXTP_NO_MORE_HANDLERS);
if (!top_level) return NULL;
- price_parser = gnc_price_parser_new();
+ price_parser = gnc_price_parser_new ();
if (!price_parser)
{
- sixtp_destroy(top_level);
+ sixtp_destroy (top_level);
return NULL;
}
- sixtp_add_sub_parser(top_level, "price", price_parser);
+ sixtp_add_sub_parser (top_level, "price", price_parser);
return top_level;
}
diff --git a/src/backend/xml/io-gncxml-v2.cpp b/src/backend/xml/io-gncxml-v2.cpp
index fdf32aa..80958bc 100644
--- a/src/backend/xml/io-gncxml-v2.cpp
+++ b/src/backend/xml/io-gncxml-v2.cpp
@@ -86,14 +86,14 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
/* map pointers, e.g. of type FILE*, to GThreads */
-static GHashTable *threads = NULL;
-G_LOCK_DEFINE_STATIC(threads);
+static GHashTable* threads = NULL;
+G_LOCK_DEFINE_STATIC (threads);
typedef struct
{
gint fd;
- gchar *filename;
- gchar *perms;
+ gchar* filename;
+ gchar* perms;
gboolean compress;
} gz_thread_params_t;
@@ -102,38 +102,40 @@ struct file_backend
{
gboolean ok;
gpointer data;
- sixtp_gdv2 * gd;
- const char * tag;
- sixtp * parser;
- FILE * out;
- QofBook * book;
+ sixtp_gdv2* gd;
+ const char* tag;
+ sixtp* parser;
+ FILE* out;
+ QofBook* book;
};
#define GNC_V2_STRING "gnc-v2"
/* non-static because they are used in sixtp.c */
-const gchar *gnc_v2_xml_version_string = GNC_V2_STRING;
-extern const gchar *gnc_v2_book_version_string; /* see gnc-book-xml-v2 */
+const gchar* gnc_v2_xml_version_string = GNC_V2_STRING;
+extern const gchar*
+gnc_v2_book_version_string; /* see gnc-book-xml-v2 */
/* Forward declarations */
-static FILE *try_gz_open (const char *filename, const char *perms, gboolean use_gzip,
+static FILE* try_gz_open (const char* filename, const char* perms,
+ gboolean use_gzip,
gboolean compress);
-static gboolean is_gzipped_file(const gchar *name);
-static gboolean wait_for_gzip(FILE *file);
+static gboolean is_gzipped_file (const gchar* name);
+static gboolean wait_for_gzip (FILE* file);
static void
-clear_up_account_commodity(
- gnc_commodity_table *tbl, Account *act,
- gnc_commodity * (*getter) (const Account *account),
- void (*setter) (Account *account, gnc_commodity *comm),
- int (*scu_getter) (const Account *account),
- void (*scu_setter) (Account *account, int scu))
+clear_up_account_commodity (
+ gnc_commodity_table* tbl, Account* act,
+ gnc_commodity * (*getter) (const Account* account),
+ void (*setter) (Account* account, gnc_commodity* comm),
+ int (*scu_getter) (const Account* account),
+ void (*scu_setter) (Account* account, int scu))
{
- gnc_commodity *gcom;
- gnc_commodity *com = getter(act);
+ gnc_commodity* gcom;
+ gnc_commodity* com = getter (act);
int old_scu;
if (scu_getter)
- old_scu = scu_getter(act);
+ old_scu = scu_getter (act);
else
old_scu = 0;
@@ -142,8 +144,8 @@ clear_up_account_commodity(
return;
}
- gcom = gnc_commodity_table_lookup(tbl, gnc_commodity_get_namespace(com),
- gnc_commodity_get_mnemonic(com));
+ gcom = gnc_commodity_table_lookup (tbl, gnc_commodity_get_namespace (com),
+ gnc_commodity_get_mnemonic (com));
if (gcom == com)
{
@@ -151,35 +153,35 @@ clear_up_account_commodity(
}
else if (!gcom)
{
- PWARN("unable to find global commodity for %s adding new",
- gnc_commodity_get_unique_name(com));
- gnc_commodity_table_insert(tbl, com);
+ PWARN ("unable to find global commodity for %s adding new",
+ gnc_commodity_get_unique_name (com));
+ gnc_commodity_table_insert (tbl, com);
}
else
{
- setter(act, gcom);
+ setter (act, gcom);
if (old_scu != 0 && scu_setter)
- scu_setter(act, old_scu);
- gnc_commodity_destroy(com);
+ scu_setter (act, old_scu);
+ gnc_commodity_destroy (com);
}
}
static void
-clear_up_transaction_commodity(
- gnc_commodity_table *tbl, Transaction *trans,
- gnc_commodity * (*getter) (const Transaction *trans),
- void (*setter) (Transaction *trans, gnc_commodity *comm))
+clear_up_transaction_commodity (
+ gnc_commodity_table* tbl, Transaction* trans,
+ gnc_commodity * (*getter) (const Transaction* trans),
+ void (*setter) (Transaction* trans, gnc_commodity* comm))
{
- gnc_commodity *gcom;
- gnc_commodity *com = getter(trans);
+ gnc_commodity* gcom;
+ gnc_commodity* com = getter (trans);
if (!com)
{
return;
}
- gcom = gnc_commodity_table_lookup(tbl, gnc_commodity_get_namespace(com),
- gnc_commodity_get_mnemonic(com));
+ gcom = gnc_commodity_table_lookup (tbl, gnc_commodity_get_namespace (com),
+ gnc_commodity_get_mnemonic (com));
if (gcom == com)
{
@@ -187,38 +189,38 @@ clear_up_transaction_commodity(
}
else if (!gcom)
{
- PWARN("unable to find global commodity for %s adding new",
- gnc_commodity_get_unique_name(com));
- gnc_commodity_table_insert(tbl, com);
+ PWARN ("unable to find global commodity for %s adding new",
+ gnc_commodity_get_unique_name (com));
+ gnc_commodity_table_insert (tbl, com);
}
else
{
- xaccTransBeginEdit(trans);
- setter(trans, gcom);
- xaccTransCommitEdit(trans);
- gnc_commodity_destroy(com);
+ xaccTransBeginEdit (trans);
+ setter (trans, gcom);
+ xaccTransCommitEdit (trans);
+ gnc_commodity_destroy (com);
}
}
static gboolean
-add_account_local(sixtp_gdv2 *data, Account *act)
+add_account_local (sixtp_gdv2* data, Account* act)
{
- gnc_commodity_table *table;
- Account *parent, *root;
+ gnc_commodity_table* table;
+ Account* parent, *root;
int type;
table = gnc_commodity_table_get_table (data->book);
- clear_up_account_commodity(table, act,
- DxaccAccountGetCurrency,
- DxaccAccountSetCurrency,
- NULL, NULL);
+ clear_up_account_commodity (table, act,
+ DxaccAccountGetCurrency,
+ DxaccAccountSetCurrency,
+ NULL, NULL);
- clear_up_account_commodity(table, act,
- xaccAccountGetCommodity,
- xaccAccountSetCommodity,
- xaccAccountGetCommoditySCUi,
- xaccAccountSetCommoditySCU);
+ clear_up_account_commodity (table, act,
+ xaccAccountGetCommodity,
+ xaccAccountSetCommodity,
+ xaccAccountGetCommoditySCUi,
+ xaccAccountSetCommoditySCU);
xaccAccountScrubCommodity (act);
xaccAccountScrubKvp (act);
@@ -226,137 +228,137 @@ add_account_local(sixtp_gdv2 *data, Account *act)
/* Backwards compatability. If there's no parent, see if this
* account is of type ROOT. If not, find or create a ROOT
* account and make that the parent. */
- type = xaccAccountGetType(act);
+ type = xaccAccountGetType (act);
if (type == ACCT_TYPE_ROOT)
{
- gnc_book_set_root_account(data->book, act);
+ gnc_book_set_root_account (data->book, act);
}
else
{
- parent = gnc_account_get_parent(act);
+ parent = gnc_account_get_parent (act);
if (parent == NULL)
{
- root = gnc_book_get_root_account(data->book);
- gnc_account_append_child(root, act);
+ root = gnc_book_get_root_account (data->book);
+ gnc_account_append_child (root, act);
}
}
data->counter.accounts_loaded++;
- sixtp_run_callback(data, "account");
+ sixtp_run_callback (data, "account");
return FALSE;
}
static gboolean
-add_book_local(sixtp_gdv2 *data, QofBook *book)
+add_book_local (sixtp_gdv2* data, QofBook* book)
{
data->counter.books_loaded++;
- sixtp_run_callback(data, "book");
+ sixtp_run_callback (data, "book");
return FALSE;
}
static gboolean
-add_commodity_local(sixtp_gdv2 *data, gnc_commodity *com)
+add_commodity_local (sixtp_gdv2* data, gnc_commodity* com)
{
- gnc_commodity_table *table;
+ gnc_commodity_table* table;
table = gnc_commodity_table_get_table (data->book);
- gnc_commodity_table_insert(table, com);
+ gnc_commodity_table_insert (table, com);
data->counter.commodities_loaded++;
- sixtp_run_callback(data, "commodities");
+ sixtp_run_callback (data, "commodities");
return TRUE;
}
static gboolean
-add_transaction_local(sixtp_gdv2 *data, Transaction *trn)
+add_transaction_local (sixtp_gdv2* data, Transaction* trn)
{
- gnc_commodity_table *table;
+ gnc_commodity_table* table;
table = gnc_commodity_table_get_table (data->book);
xaccTransBeginEdit (trn);
- clear_up_transaction_commodity(table, trn,
- xaccTransGetCurrency,
- xaccTransSetCurrency);
+ clear_up_transaction_commodity (table, trn,
+ xaccTransGetCurrency,
+ xaccTransSetCurrency);
xaccTransScrubCurrency (trn);
xaccTransCommitEdit (trn);
data->counter.transactions_loaded++;
- sixtp_run_callback(data, "transaction");
+ sixtp_run_callback (data, "transaction");
return TRUE;
}
static gboolean
-add_schedXaction_local(sixtp_gdv2 *data, SchedXaction *sx)
+add_schedXaction_local (sixtp_gdv2* data, SchedXaction* sx)
{
- SchedXactions *sxes;
- sxes = gnc_book_get_schedxactions(data->book);
- gnc_sxes_add_sx(sxes, sx);
+ SchedXactions* sxes;
+ sxes = gnc_book_get_schedxactions (data->book);
+ gnc_sxes_add_sx (sxes, sx);
data->counter.schedXactions_loaded++;
- sixtp_run_callback(data, "schedXactions");
+ sixtp_run_callback (data, "schedXactions");
return TRUE;
}
static gboolean
-add_template_transaction_local( sixtp_gdv2 *data,
- gnc_template_xaction_data *txd )
+add_template_transaction_local (sixtp_gdv2* data,
+ gnc_template_xaction_data* txd)
{
- GList *n;
- Account *acctRoot = NULL;
- QofBook *book;
+ GList* n;
+ Account* acctRoot = NULL;
+ QofBook* book;
book = data->book;
/* expect a struct of: */
/* . template accounts. */
/* . transactions in those accounts. */
- for ( n = txd->accts; n; n = n->next )
+ for (n = txd->accts; n; n = n->next)
{
- if ( gnc_account_get_parent( (Account*)n->data ) == NULL )
+ if (gnc_account_get_parent ((Account*)n->data) == NULL)
{
- if ( xaccAccountGetType( (Account*)n->data ) == ACCT_TYPE_ROOT )
+ if (xaccAccountGetType ((Account*)n->data) == ACCT_TYPE_ROOT)
{
/* replace the gnc_book_init-created root account */
- gnc_book_set_template_root(book, (Account *)n->data);
+ gnc_book_set_template_root (book, (Account*)n->data);
}
else
{
/* This is an old data file that doesn't have a template root
account and this is a top level account. Make it a child
of the template root account. */
- acctRoot = gnc_book_get_template_root(book);
- gnc_account_append_child( acctRoot, (Account*)n->data );
+ acctRoot = gnc_book_get_template_root (book);
+ gnc_account_append_child (acctRoot, (Account*)n->data);
}
}
}
- for ( n = txd->transactions; n; n = n->next )
+ for (n = txd->transactions; n; n = n->next)
{
/* insert transactions into accounts */
- add_transaction_local( data, (Transaction*)n->data );
+ add_transaction_local (data, (Transaction*)n->data);
}
return TRUE;
}
static gboolean
-add_pricedb_local(sixtp_gdv2 *data, GNCPriceDB *db)
+add_pricedb_local (sixtp_gdv2* data, GNCPriceDB* db)
{
/* gnc_pricedb_print_contents(db, stdout); */
return TRUE;
}
static void
-do_counter_cb (const char *type, gpointer data_p, gpointer be_data_p)
+do_counter_cb (const char* type, gpointer data_p, gpointer be_data_p)
{
- GncXmlDataType_t *data = static_cast<decltype(data)>(data_p);
- struct file_backend *be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncXmlDataType_t* data = static_cast<decltype (data)> (data_p);
+ struct file_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
g_return_if_fail (type && data && be_data);
g_return_if_fail (data->version == GNC_FILE_BACKEND_VERS);
@@ -371,17 +373,17 @@ do_counter_cb (const char *type, gpointer data_p, gpointer be_data_p)
}
static gboolean
-gnc_counter_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_counter_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- char *strval;
+ char* strval;
gint64 val;
- char *type;
+ char* type;
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- gxpf_data *gdata = (gxpf_data*)global_data;
- sixtp_gdv2 *sixdata = (sixtp_gdv2*)gdata->parsedata;
+ gxpf_data* gdata = (gxpf_data*)global_data;
+ sixtp_gdv2* sixdata = (sixtp_gdv2*)gdata->parsedata;
gboolean ret = TRUE;
if (parent_data)
@@ -392,45 +394,45 @@ gnc_counter_end_handler(gpointer data_for_children,
if (!tag)
return TRUE;
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
/* Note: BADXML.
*
* This is invalid xml because the namespace isn't declared in the
* tag itself. This should be changed to 'type' at some point. */
- type = (char*)xmlGetProp(tree, BAD_CAST "cd:type");
- strval = dom_tree_to_text(tree);
- if (!string_to_gint64(strval, &val))
+ type = (char*)xmlGetProp (tree, BAD_CAST "cd:type");
+ strval = dom_tree_to_text (tree);
+ if (!string_to_gint64 (strval, &val))
{
PERR ("string_to_gint64 failed with input: %s",
strval ? strval : "(null)");
ret = FALSE;
}
- else if (g_strcmp0(type, "transaction") == 0)
+ else if (g_strcmp0 (type, "transaction") == 0)
{
sixdata->counter.transactions_total = val;
}
- else if (g_strcmp0(type, "account") == 0)
+ else if (g_strcmp0 (type, "account") == 0)
{
sixdata->counter.accounts_total = val;
}
- else if (g_strcmp0(type, "book") == 0)
+ else if (g_strcmp0 (type, "book") == 0)
{
sixdata->counter.books_total = val;
}
- else if (g_strcmp0(type, "commodity") == 0)
+ else if (g_strcmp0 (type, "commodity") == 0)
{
sixdata->counter.commodities_total = val;
}
- else if (g_strcmp0(type, "schedxaction") == 0)
+ else if (g_strcmp0 (type, "schedxaction") == 0)
{
sixdata->counter.schedXactions_total = val;
}
- else if (g_strcmp0(type, "budget") == 0)
+ else if (g_strcmp0 (type, "budget") == 0)
{
sixdata->counter.budgets_total = val;
}
- else if (g_strcmp0(type, "price") == 0)
+ else if (g_strcmp0 (type, "price") == 0)
{
sixdata->counter.prices_total = val;
}
@@ -445,7 +447,7 @@ gnc_counter_end_handler(gpointer data_for_children,
if (be_data.ok == FALSE)
{
- PERR("Unknown type: %s", type ? type : "(null)");
+ PERR ("Unknown type: %s", type ? type : "(null)");
/* Do *NOT* flag this as an error. Gnucash 1.8 writes invalid
* xml by writing the 'cd:type' attribute without providing
* the namespace in the gnc:count-data tag. The parser is
@@ -458,40 +460,40 @@ gnc_counter_end_handler(gpointer data_for_children,
g_free (strval);
xmlFree (type);
- xmlFreeNode(tree);
+ xmlFreeNode (tree);
return ret;
}
static sixtp*
-gnc_counter_sixtp_parser_create(void)
+gnc_counter_sixtp_parser_create (void)
{
- return sixtp_dom_parser_new(gnc_counter_end_handler, NULL, NULL);
+ return sixtp_dom_parser_new (gnc_counter_end_handler, NULL, NULL);
}
static void
-debug_print_counter_data(load_counter *data)
+debug_print_counter_data (load_counter* data)
{
- DEBUG("Transactions: Total: %d, Loaded: %d",
- data->transactions_total, data->transactions_loaded);
- DEBUG("Accounts: Total: %d, Loaded: %d",
- data->accounts_total, data->accounts_loaded);
- DEBUG("Books: Total: %d, Loaded: %d",
- data->books_total, data->books_loaded);
- DEBUG("Commodities: Total: %d, Loaded: %d",
- data->commodities_total, data->commodities_loaded);
- DEBUG("Scheduled Transactions: Total: %d, Loaded: %d",
- data->schedXactions_total, data->schedXactions_loaded);
- DEBUG("Budgets: Total: %d, Loaded: %d",
- data->budgets_total, data->budgets_loaded);
+ DEBUG ("Transactions: Total: %d, Loaded: %d",
+ data->transactions_total, data->transactions_loaded);
+ DEBUG ("Accounts: Total: %d, Loaded: %d",
+ data->accounts_total, data->accounts_loaded);
+ DEBUG ("Books: Total: %d, Loaded: %d",
+ data->books_total, data->books_loaded);
+ DEBUG ("Commodities: Total: %d, Loaded: %d",
+ data->commodities_total, data->commodities_loaded);
+ DEBUG ("Scheduled Transactions: Total: %d, Loaded: %d",
+ data->schedXactions_total, data->schedXactions_loaded);
+ DEBUG ("Budgets: Total: %d, Loaded: %d",
+ data->budgets_total, data->budgets_loaded);
}
static void
-file_rw_feedback (sixtp_gdv2 *gd, const char *type)
+file_rw_feedback (sixtp_gdv2* gd, const char* type)
{
- load_counter *counter;
+ load_counter* counter;
int loaded, total, percentage;
- g_assert(gd != NULL);
+ g_assert (gd != NULL);
if (!gd->gui_display_fn)
return;
@@ -523,28 +525,28 @@ file_rw_feedback (sixtp_gdv2 *gd, const char *type)
// printf("Scheduled Transactions: Total: %d, Loaded: %d\n",
// counter->schedXactions_total, counter->schedXactions_loaded);
// printf("Budgets: Total: %d, Loaded: %d\n",
-// counter->budgets_total, counter->budgets_loaded);
+// counter->budgets_total, counter->budgets_loaded);
}
- gd->gui_display_fn(NULL, percentage);
+ gd->gui_display_fn (NULL, percentage);
}
-static const char *BOOK_TAG = "gnc:book";
-static const char *BOOK_ID_TAG = "book:id";
-static const char *BOOK_SLOTS_TAG = "book:slots";
-static const char *ACCOUNT_TAG = "gnc:account";
-static const char *PRICEDB_TAG = "gnc:pricedb";
-static const char *COMMODITY_TAG = "gnc:commodity";
-static const char *COUNT_DATA_TAG = "gnc:count-data";
-static const char *TRANSACTION_TAG = "gnc:transaction";
-static const char *SCHEDXACTION_TAG = "gnc:schedxaction";
-static const char *TEMPLATE_TRANSACTION_TAG = "gnc:template-transactions";
-static const char *BUDGET_TAG = "gnc:budget";
+static const char* BOOK_TAG = "gnc:book";
+static const char* BOOK_ID_TAG = "book:id";
+static const char* BOOK_SLOTS_TAG = "book:slots";
+static const char* ACCOUNT_TAG = "gnc:account";
+static const char* PRICEDB_TAG = "gnc:pricedb";
+static const char* COMMODITY_TAG = "gnc:commodity";
+static const char* COUNT_DATA_TAG = "gnc:count-data";
+static const char* TRANSACTION_TAG = "gnc:transaction";
+static const char* SCHEDXACTION_TAG = "gnc:schedxaction";
+static const char* TEMPLATE_TRANSACTION_TAG = "gnc:template-transactions";
+static const char* BUDGET_TAG = "gnc:budget";
static void
-add_item_cb (const char *type, gpointer data_p, gpointer be_data_p)
+add_item_cb (const char* type, gpointer data_p, gpointer be_data_p)
{
- GncXmlDataType_t *data = static_cast<decltype(data)>(data_p);
- struct file_backend *be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncXmlDataType_t* data = static_cast<decltype (data)> (data_p);
+ struct file_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
g_return_if_fail (type && data && be_data);
g_return_if_fail (data->version == GNC_FILE_BACKEND_VERS);
@@ -555,42 +557,42 @@ add_item_cb (const char *type, gpointer data_p, gpointer be_data_p)
if (!g_strcmp0 (be_data->tag, data->type_name))
{
if (data->add_item)
- (data->add_item)(be_data->gd, be_data->data);
+ (data->add_item) (be_data->gd, be_data->data);
be_data->ok = TRUE;
}
}
static gboolean
-book_callback(const char *tag, gpointer globaldata, gpointer data)
+book_callback (const char* tag, gpointer globaldata, gpointer data)
{
- sixtp_gdv2 *gd = (sixtp_gdv2*)globaldata;
+ sixtp_gdv2* gd = (sixtp_gdv2*)globaldata;
- if (g_strcmp0(tag, ACCOUNT_TAG) == 0)
+ if (g_strcmp0 (tag, ACCOUNT_TAG) == 0)
{
- add_account_local(gd, (Account*)data);
+ add_account_local (gd, (Account*)data);
}
- else if (g_strcmp0(tag, PRICEDB_TAG) == 0)
+ else if (g_strcmp0 (tag, PRICEDB_TAG) == 0)
{
- add_pricedb_local(gd, (GNCPriceDB*)data);
+ add_pricedb_local (gd, (GNCPriceDB*)data);
}
- else if (g_strcmp0(tag, COMMODITY_TAG) == 0)
+ else if (g_strcmp0 (tag, COMMODITY_TAG) == 0)
{
- add_commodity_local(gd, (gnc_commodity*)data);
+ add_commodity_local (gd, (gnc_commodity*)data);
}
- else if (g_strcmp0(tag, TRANSACTION_TAG) == 0)
+ else if (g_strcmp0 (tag, TRANSACTION_TAG) == 0)
{
- add_transaction_local(gd, (Transaction*)data);
+ add_transaction_local (gd, (Transaction*)data);
}
- else if (g_strcmp0(tag, SCHEDXACTION_TAG) == 0)
+ else if (g_strcmp0 (tag, SCHEDXACTION_TAG) == 0)
{
- add_schedXaction_local(gd, (SchedXaction*)data);
+ add_schedXaction_local (gd, (SchedXaction*)data);
}
- else if (g_strcmp0(tag, TEMPLATE_TRANSACTION_TAG) == 0)
+ else if (g_strcmp0 (tag, TEMPLATE_TRANSACTION_TAG) == 0)
{
- add_template_transaction_local( gd, (gnc_template_xaction_data*)data );
+ add_template_transaction_local (gd, (gnc_template_xaction_data*)data);
}
- else if (g_strcmp0(tag, BUDGET_TAG) == 0)
+ else if (g_strcmp0 (tag, BUDGET_TAG) == 0)
{
// Nothing needed here.
}
@@ -614,28 +616,28 @@ book_callback(const char *tag, gpointer globaldata, gpointer data)
}
static gboolean
-generic_callback(const char *tag, gpointer globaldata, gpointer data)
+generic_callback (const char* tag, gpointer globaldata, gpointer data)
{
- sixtp_gdv2 *gd = (sixtp_gdv2*)globaldata;
+ sixtp_gdv2* gd = (sixtp_gdv2*)globaldata;
- if (g_strcmp0(tag, BOOK_TAG) == 0)
+ if (g_strcmp0 (tag, BOOK_TAG) == 0)
{
- add_book_local(gd, (QofBook*)data);
- book_callback(tag, globaldata, data);
+ add_book_local (gd, (QofBook*)data);
+ book_callback (tag, globaldata, data);
}
else
{
// PWARN ("importing pre-book-style XML data file");
- book_callback(tag, globaldata, data);
+ book_callback (tag, globaldata, data);
}
return TRUE;
}
static void
-add_parser_cb (const char *type, gpointer data_p, gpointer be_data_p)
+add_parser_cb (const char* type, gpointer data_p, gpointer be_data_p)
{
- GncXmlDataType_t *data = static_cast<decltype(data)>(data_p);
- struct file_backend *be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncXmlDataType_t* data = static_cast<decltype (data)> (data_p);
+ struct file_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
g_return_if_fail (type && data && be_data);
g_return_if_fail (data->version == GNC_FILE_BACKEND_VERS);
@@ -644,34 +646,34 @@ add_parser_cb (const char *type, gpointer data_p, gpointer be_data_p)
return;
if (data->create_parser)
- if (!sixtp_add_some_sub_parsers(
- be_data->parser, TRUE,
- data->type_name, (data->create_parser)(),
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ be_data->parser, TRUE,
+ data->type_name, (data->create_parser) (),
+ NULL, NULL))
be_data->ok = FALSE;
}
static void
-scrub_cb (const char *type, gpointer data_p, gpointer be_data_p)
+scrub_cb (const char* type, gpointer data_p, gpointer be_data_p)
{
- GncXmlDataType_t *data = static_cast<decltype(data)>(data_p);
- struct file_backend *be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncXmlDataType_t* data = static_cast<decltype (data)> (data_p);
+ struct file_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
g_return_if_fail (type && data && be_data);
g_return_if_fail (data->version == GNC_FILE_BACKEND_VERS);
if (data->scrub)
- (data->scrub)(be_data->book);
+ (data->scrub) (be_data->book);
}
-static sixtp_gdv2 *
+static sixtp_gdv2*
gnc_sixtp_gdv2_new (
- QofBook *book,
+ QofBook* book,
gboolean exporting,
countCallbackFn countcallback,
QofBePercentageFunc gui_display_fn)
{
- sixtp_gdv2 *gd = g_new0(sixtp_gdv2, 1);
+ sixtp_gdv2* gd = g_new0 (sixtp_gdv2, 1);
if (gd == NULL) return NULL;
@@ -697,73 +699,73 @@ gnc_sixtp_gdv2_new (
}
static gboolean
-qof_session_load_from_xml_file_v2_full(
- FileBackend *fbe, QofBook *book,
+qof_session_load_from_xml_file_v2_full (
+ FileBackend* fbe, QofBook* book,
sixtp_push_handler push_handler, gpointer push_user_data,
QofBookFileType type)
{
- Account *root;
- QofBackend *be = &fbe->be;
- sixtp_gdv2 *gd;
- sixtp *top_parser;
- sixtp *main_parser;
- sixtp *book_parser;
+ Account* root;
+ QofBackend* be = &fbe->be;
+ sixtp_gdv2* gd;
+ sixtp* top_parser;
+ sixtp* main_parser;
+ sixtp* book_parser;
struct file_backend be_data;
gboolean retval;
- char *v2type = NULL;
+ char* v2type = NULL;
- gd = gnc_sixtp_gdv2_new(book, FALSE, file_rw_feedback, be->percentage);
+ gd = gnc_sixtp_gdv2_new (book, FALSE, file_rw_feedback, be->percentage);
- top_parser = sixtp_new();
- main_parser = sixtp_new();
- book_parser = sixtp_new();
+ top_parser = sixtp_new ();
+ main_parser = sixtp_new ();
+ book_parser = sixtp_new ();
if (type == GNC_BOOK_XML2_FILE)
- v2type = g_strdup(GNC_V2_STRING);
+ v2type = g_strdup (GNC_V2_STRING);
- if (!sixtp_add_some_sub_parsers(
- top_parser, TRUE,
- v2type, main_parser,
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ top_parser, TRUE,
+ v2type, main_parser,
+ NULL, NULL))
{
- g_free(v2type);
+ g_free (v2type);
goto bail;
}
- g_free(v2type);
+ g_free (v2type);
- if (!sixtp_add_some_sub_parsers(
- main_parser, TRUE,
- COUNT_DATA_TAG, gnc_counter_sixtp_parser_create(),
- BOOK_TAG, book_parser,
+ if (!sixtp_add_some_sub_parsers (
+ main_parser, TRUE,
+ COUNT_DATA_TAG, gnc_counter_sixtp_parser_create (),
+ BOOK_TAG, book_parser,
- /* the following are present here only to support
- * the older, pre-book format. Basically, the top-level
- * book is implicit. */
- PRICEDB_TAG, gnc_pricedb_sixtp_parser_create(),
- COMMODITY_TAG, gnc_commodity_sixtp_parser_create(),
- ACCOUNT_TAG, gnc_account_sixtp_parser_create(),
- TRANSACTION_TAG, gnc_transaction_sixtp_parser_create(),
- SCHEDXACTION_TAG, gnc_schedXaction_sixtp_parser_create(),
- TEMPLATE_TRANSACTION_TAG, gnc_template_transaction_sixtp_parser_create(),
- NULL, NULL))
+ /* the following are present here only to support
+ * the older, pre-book format. Basically, the top-level
+ * book is implicit. */
+ PRICEDB_TAG, gnc_pricedb_sixtp_parser_create (),
+ COMMODITY_TAG, gnc_commodity_sixtp_parser_create (),
+ ACCOUNT_TAG, gnc_account_sixtp_parser_create (),
+ TRANSACTION_TAG, gnc_transaction_sixtp_parser_create (),
+ SCHEDXACTION_TAG, gnc_schedXaction_sixtp_parser_create (),
+ TEMPLATE_TRANSACTION_TAG, gnc_template_transaction_sixtp_parser_create (),
+ NULL, NULL))
{
goto bail;
}
- if (!sixtp_add_some_sub_parsers(
- book_parser, TRUE,
- BOOK_ID_TAG, gnc_book_id_sixtp_parser_create(),
- BOOK_SLOTS_TAG, gnc_book_slots_sixtp_parser_create(),
- COUNT_DATA_TAG, gnc_counter_sixtp_parser_create(),
- PRICEDB_TAG, gnc_pricedb_sixtp_parser_create(),
- COMMODITY_TAG, gnc_commodity_sixtp_parser_create(),
- ACCOUNT_TAG, gnc_account_sixtp_parser_create(),
- BUDGET_TAG, gnc_budget_sixtp_parser_create(),
- TRANSACTION_TAG, gnc_transaction_sixtp_parser_create(),
- SCHEDXACTION_TAG, gnc_schedXaction_sixtp_parser_create(),
- TEMPLATE_TRANSACTION_TAG, gnc_template_transaction_sixtp_parser_create(),
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (
+ book_parser, TRUE,
+ BOOK_ID_TAG, gnc_book_id_sixtp_parser_create (),
+ BOOK_SLOTS_TAG, gnc_book_slots_sixtp_parser_create (),
+ COUNT_DATA_TAG, gnc_counter_sixtp_parser_create (),
+ PRICEDB_TAG, gnc_pricedb_sixtp_parser_create (),
+ COMMODITY_TAG, gnc_commodity_sixtp_parser_create (),
+ ACCOUNT_TAG, gnc_account_sixtp_parser_create (),
+ BUDGET_TAG, gnc_budget_sixtp_parser_create (),
+ TRANSACTION_TAG, gnc_transaction_sixtp_parser_create (),
+ SCHEDXACTION_TAG, gnc_schedXaction_sixtp_parser_create (),
+ TEMPLATE_TRANSACTION_TAG, gnc_template_transaction_sixtp_parser_create (),
+ NULL, NULL))
{
goto bail;
}
@@ -776,7 +778,7 @@ qof_session_load_from_xml_file_v2_full(
/* stop logging while we load */
xaccLogDisable ();
- xaccDisableDataScrubbing();
+ xaccDisableDataScrubbing ();
if (push_handler)
{
@@ -787,62 +789,62 @@ qof_session_load_from_xml_file_v2_full(
gpdata.parsedata = gd;
gpdata.bookdata = book;
- retval = sixtp_parse_push(top_parser, push_handler, push_user_data,
- NULL, &gpdata, &parse_result);
+ retval = sixtp_parse_push (top_parser, push_handler, push_user_data,
+ NULL, &gpdata, &parse_result);
}
else
{
- /* Even though libxml2 knows how to decompress zipped files, we
- * do it ourself since as of version 2.9.1 it has a bug that
- * causes it to fail to decompress certain files. See
- * https://bugzilla.gnome.org/show_bug.cgi?id=712528 for more
- * info.
- */
- gchar *filename = fbe->fullpath;
- FILE *file;
- gboolean is_compressed = is_gzipped_file(filename);
- file = try_gz_open(filename, "r", is_compressed, FALSE);
- if (file == NULL)
- {
- PWARN("Unable to open file %s", filename);
- retval = FALSE;
- }
- else
- {
- retval = gnc_xml_parse_fd(top_parser, file,
- generic_callback, gd, book);
- fclose(file);
- if (is_compressed)
- wait_for_gzip(file);
- }
+ /* Even though libxml2 knows how to decompress zipped files, we
+ * do it ourself since as of version 2.9.1 it has a bug that
+ * causes it to fail to decompress certain files. See
+ * https://bugzilla.gnome.org/show_bug.cgi?id=712528 for more
+ * info.
+ */
+ gchar* filename = fbe->fullpath;
+ FILE* file;
+ gboolean is_compressed = is_gzipped_file (filename);
+ file = try_gz_open (filename, "r", is_compressed, FALSE);
+ if (file == NULL)
+ {
+ PWARN ("Unable to open file %s", filename);
+ retval = FALSE;
+ }
+ else
+ {
+ retval = gnc_xml_parse_fd (top_parser, file,
+ generic_callback, gd, book);
+ fclose (file);
+ if (is_compressed)
+ wait_for_gzip (file);
+ }
}
if (!retval)
{
- sixtp_destroy(top_parser);
+ sixtp_destroy (top_parser);
xaccLogEnable ();
- xaccEnableDataScrubbing();
+ xaccEnableDataScrubbing ();
goto bail;
}
- debug_print_counter_data(&gd->counter);
+ debug_print_counter_data (&gd->counter);
/* destroy the parser */
sixtp_destroy (top_parser);
- g_free(gd);
+ g_free (gd);
- xaccEnableDataScrubbing();
+ xaccEnableDataScrubbing ();
/* Mark the session as saved */
qof_book_mark_session_saved (book);
/* Call individual scrub functions */
- memset(&be_data, 0, sizeof(be_data));
+ memset (&be_data, 0, sizeof (be_data));
be_data.book = book;
qof_object_foreach_backend (GNC_FILE_BACKEND, scrub_cb, &be_data);
/* fix price quote sources */
- root = gnc_book_get_root_account(book);
- xaccAccountTreeScrubQuoteSources (root, gnc_commodity_table_get_table(book));
+ root = gnc_book_get_root_account (book);
+ xaccAccountTreeScrubQuoteSources (root, gnc_commodity_table_get_table (book));
/* Fix account and transaction commodities */
xaccAccountTreeScrubCommodities (root);
@@ -853,9 +855,9 @@ qof_session_load_from_xml_file_v2_full(
/* commit all groups, this completes the BeginEdit started when the
* account_end_handler finished reading the account.
*/
- gnc_account_foreach_descendant(root,
- (AccountCb) xaccAccountCommitEdit,
- NULL);
+ gnc_account_foreach_descendant (root,
+ (AccountCb) xaccAccountCommitEdit,
+ NULL);
/* start logging again */
xaccLogEnable ();
@@ -863,63 +865,63 @@ qof_session_load_from_xml_file_v2_full(
return TRUE;
bail:
- g_free(gd);
+ g_free (gd);
return FALSE;
}
gboolean
-qof_session_load_from_xml_file_v2(FileBackend *fbe, QofBook *book,
- QofBookFileType type)
+qof_session_load_from_xml_file_v2 (FileBackend* fbe, QofBook* book,
+ QofBookFileType type)
{
- return qof_session_load_from_xml_file_v2_full(fbe, book, NULL, NULL, type);
+ return qof_session_load_from_xml_file_v2_full (fbe, book, NULL, NULL, type);
}
/***********************************************************************/
static gboolean
-write_counts(FILE* out, ...)
+write_counts (FILE* out, ...)
{
va_list ap;
- char *type;
+ char* type;
gboolean success = TRUE;
- va_start(ap, out);
- type = g_strdup (va_arg(ap, char *));
+ va_start (ap, out);
+ type = g_strdup (va_arg (ap, char*));
while (success && type)
{
- int amount = va_arg(ap, int);
+ int amount = va_arg (ap, int);
if (amount != 0)
{
#if GNUCASH_REALLY_BUILD_AN_XML_TREE_ON_OUTPUT
- char *val;
+ char* val;
xmlNodePtr node;
- val = g_strdup_printf("%d", amount);
+ val = g_strdup_printf ("%d", amount);
- node = xmlNewNode(NULL, BAD_CAST COUNT_DATA_TAG);
+ node = xmlNewNode (NULL, BAD_CAST COUNT_DATA_TAG);
/* Note: BADXML.
*
* This is invalid xml because the namespace isn't
* declared in the tag itself. This should be changed to
* 'type' at some point. */
- xmlSetProp(node, BAD_CAST "cd:type", checked_char_cast (type));
- xmlNodeAddContent(node, checked_char_cast (val));
- g_free(val);
- g_free (type);
+ xmlSetProp (node, BAD_CAST "cd:type", checked_char_cast (type));
+ xmlNodeAddContent (node, checked_char_cast (val));
+ g_free (val);
+ g_free (type);
- xmlElemDump(out, NULL, node);
- xmlFreeNode(node);
+ xmlElemDump (out, NULL, node);
+ xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
{
success = FALSE;
break;
}
#else
- if (fprintf(out, "<%s %s=\"%s\">%d</%s>\n",
- COUNT_DATA_TAG, "cd:type", type, amount, COUNT_DATA_TAG) < 0)
+ if (fprintf (out, "<%s %s=\"%s\">%d</%s>\n",
+ COUNT_DATA_TAG, "cd:type", type, amount, COUNT_DATA_TAG) < 0)
{
success = FALSE;
break;
@@ -928,41 +930,42 @@ write_counts(FILE* out, ...)
}
- type = va_arg(ap, char *);
+ type = va_arg (ap, char*);
}
- va_end(ap);
+ va_end (ap);
return success;
}
static gint
-compare_namespaces(gconstpointer a, gconstpointer b)
+compare_namespaces (gconstpointer a, gconstpointer b)
{
- const gchar *sa = (const gchar *) a;
- const gchar *sb = (const gchar *) b;
- return(g_strcmp0(sa, sb));
+ const gchar* sa = (const gchar*) a;
+ const gchar* sb = (const gchar*) b;
+ return (g_strcmp0 (sa, sb));
}
static gint
-compare_commodity_ids(gconstpointer a, gconstpointer b)
+compare_commodity_ids (gconstpointer a, gconstpointer b)
{
- const gnc_commodity *ca = (const gnc_commodity *) a;
- const gnc_commodity *cb = (const gnc_commodity *) b;
- return(g_strcmp0(gnc_commodity_get_mnemonic(ca),
- gnc_commodity_get_mnemonic(cb)));
+ const gnc_commodity* ca = (const gnc_commodity*) a;
+ const gnc_commodity* cb = (const gnc_commodity*) b;
+ return (g_strcmp0 (gnc_commodity_get_mnemonic (ca),
+ gnc_commodity_get_mnemonic (cb)));
}
-static gboolean write_pricedb (FILE *out, QofBook *book, sixtp_gdv2 *gd);
-static gboolean write_transactions (FILE *out, QofBook *book, sixtp_gdv2 *gd);
-static gboolean write_template_transaction_data (FILE *out, QofBook *book, sixtp_gdv2 *gd);
-static gboolean write_schedXactions(FILE *out, QofBook *book, sixtp_gdv2 *gd);
-static void write_budget (QofInstance *ent, gpointer data);
+static gboolean write_pricedb (FILE* out, QofBook* book, sixtp_gdv2* gd);
+static gboolean write_transactions (FILE* out, QofBook* book, sixtp_gdv2* gd);
+static gboolean write_template_transaction_data (FILE* out, QofBook* book,
+ sixtp_gdv2* gd);
+static gboolean write_schedXactions (FILE* out, QofBook* book, sixtp_gdv2* gd);
+static void write_budget (QofInstance* ent, gpointer data);
static void
-write_counts_cb (const char *type, gpointer data_p, gpointer be_data_p)
+write_counts_cb (const char* type, gpointer data_p, gpointer be_data_p)
{
- GncXmlDataType_t *data = static_cast<decltype(data)>(data_p);
- struct file_backend *be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncXmlDataType_t* data = static_cast<decltype (data)> (data_p);
+ struct file_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
g_return_if_fail (type && data && be_data);
g_return_if_fail (data->version == GNC_FILE_BACKEND_VERS);
@@ -974,20 +977,20 @@ write_counts_cb (const char *type, gpointer data_p, gpointer be_data_p)
}
static void
-write_data_cb (const char *type, gpointer data_p, gpointer be_data_p)
+write_data_cb (const char* type, gpointer data_p, gpointer be_data_p)
{
- GncXmlDataType_t *data = static_cast<decltype(data)>(data_p);
- struct file_backend *be_data = static_cast<decltype(be_data)>(be_data_p);
+ GncXmlDataType_t* data = static_cast<decltype (data)> (data_p);
+ struct file_backend* be_data = static_cast<decltype (be_data)> (be_data_p);
g_return_if_fail (type && data && be_data);
g_return_if_fail (data->version == GNC_FILE_BACKEND_VERS);
- if (data->write && !ferror(be_data->out))
- (data->write)(be_data->out, be_data->book);
+ if (data->write && !ferror (be_data->out))
+ (data->write) (be_data->out, be_data->book);
}
static gboolean
-write_book(FILE *out, QofBook *book, sixtp_gdv2 *gd)
+write_book (FILE* out, QofBook* book, sixtp_gdv2* gd)
{
struct file_backend be_data;
@@ -999,17 +1002,17 @@ write_book(FILE *out, QofBook *book, sixtp_gdv2 *gd)
*/
xmlNodePtr node;
- node = gnc_book_dom_tree_create(book);
+ node = gnc_book_dom_tree_create (book);
if (!node)
{
return FALSE;
}
- xmlElemDump(out, NULL, node);
- xmlFreeNode(node);
+ xmlElemDump (out, NULL, node);
+ xmlFreeNode (node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
{
return FALSE;
}
@@ -1019,7 +1022,8 @@ write_book(FILE *out, QofBook *book, sixtp_gdv2 *gd)
be_data.out = out;
be_data.book = book;
be_data.gd = gd;
- if (fprintf( out, "<%s version=\"%s\">\n", BOOK_TAG, gnc_v2_book_version_string) < 0)
+ if (fprintf (out, "<%s version=\"%s\">\n", BOOK_TAG,
+ gnc_v2_book_version_string) < 0)
return FALSE;
if (!write_book_parts (out, book))
return FALSE;
@@ -1027,89 +1031,91 @@ write_book(FILE *out, QofBook *book, sixtp_gdv2 *gd)
/* gd->counter.{foo}_total fields should have all these totals
already collected. I don't know why we're re-calling all these
functions. */
- if (!write_counts(out,
- "commodity",
- gnc_commodity_table_get_size(
- gnc_commodity_table_get_table(book)),
- "account",
- 1 + gnc_account_n_descendants(gnc_book_get_root_account(book)),
- "transaction",
- gnc_book_count_transactions(book),
- "schedxaction",
- g_list_length(gnc_book_get_schedxactions(book)->sx_list),
- "budget", qof_collection_count(
- qof_book_get_collection(book, GNC_ID_BUDGET)),
- "price", gnc_pricedb_get_num_prices(gnc_pricedb_get_db(book)),
- NULL))
+ if (!write_counts (out,
+ "commodity",
+ gnc_commodity_table_get_size (
+ gnc_commodity_table_get_table (book)),
+ "account",
+ 1 + gnc_account_n_descendants (gnc_book_get_root_account (book)),
+ "transaction",
+ gnc_book_count_transactions (book),
+ "schedxaction",
+ g_list_length (gnc_book_get_schedxactions (book)->sx_list),
+ "budget", qof_collection_count (
+ qof_book_get_collection (book, GNC_ID_BUDGET)),
+ "price", gnc_pricedb_get_num_prices (gnc_pricedb_get_db (book)),
+ NULL))
return FALSE;
qof_object_foreach_backend (GNC_FILE_BACKEND, write_counts_cb, &be_data);
- if (ferror(out)
- || !write_commodities(out, book, gd)
- || !write_pricedb(out, book, gd)
- || !write_accounts(out, book, gd)
- || !write_transactions(out, book, gd)
- || !write_template_transaction_data(out, book, gd)
- || !write_schedXactions(out, book, gd))
+ if (ferror (out)
+ || !write_commodities (out, book, gd)
+ || !write_pricedb (out, book, gd)
+ || !write_accounts (out, book, gd)
+ || !write_transactions (out, book, gd)
+ || !write_template_transaction_data (out, book, gd)
+ || !write_schedXactions (out, book, gd))
return FALSE;
- qof_collection_foreach(qof_book_get_collection(book, GNC_ID_BUDGET),
- write_budget, &be_data);
- if (ferror(out))
+ qof_collection_foreach (qof_book_get_collection (book, GNC_ID_BUDGET),
+ write_budget, &be_data);
+ if (ferror (out))
return FALSE;
qof_object_foreach_backend (GNC_FILE_BACKEND, write_data_cb, &be_data);
- if (ferror(out))
+ if (ferror (out))
return FALSE;
- if (fprintf( out, "</%s>\n", BOOK_TAG ) < 0)
+ if (fprintf (out, "</%s>\n", BOOK_TAG) < 0)
return FALSE;
return TRUE;
}
gboolean
-write_commodities(FILE *out, QofBook *book, sixtp_gdv2 *gd)
+write_commodities (FILE* out, QofBook* book, sixtp_gdv2* gd)
{
- gnc_commodity_table *tbl;
- GList *namespaces;
- GList *lp;
+ gnc_commodity_table* tbl;
+ GList* namespaces;
+ GList* lp;
gboolean success = TRUE;
- tbl = gnc_commodity_table_get_table(book);
+ tbl = gnc_commodity_table_get_table (book);
- namespaces = gnc_commodity_table_get_namespaces(tbl);
+ namespaces = gnc_commodity_table_get_namespaces (tbl);
if (namespaces)
{
- namespaces = g_list_sort(namespaces, compare_namespaces);
+ namespaces = g_list_sort (namespaces, compare_namespaces);
}
for (lp = namespaces; success && lp; lp = lp->next)
{
- GList *comms, *lp2;
+ GList* comms, *lp2;
xmlNodePtr comnode;
- comms = gnc_commodity_table_get_commodities(tbl, static_cast<const char*>(lp->data));
- comms = g_list_sort(comms, compare_commodity_ids);
+ comms = gnc_commodity_table_get_commodities (tbl,
+ static_cast<const char*> (lp->data));
+ comms = g_list_sort (comms, compare_commodity_ids);
for (lp2 = comms; lp2; lp2 = lp2->next)
{
- comnode = gnc_commodity_dom_tree_create(static_cast<const gnc_commodity*>(lp2->data));
+ comnode = gnc_commodity_dom_tree_create (static_cast<const gnc_commodity*>
+ (lp2->data));
if (comnode == NULL)
continue;
- xmlElemDump(out, NULL, comnode);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ xmlElemDump (out, NULL, comnode);
+ if (ferror (out) || fprintf (out, "\n") < 0)
{
success = FALSE;
break;
}
- xmlFreeNode(comnode);
+ xmlFreeNode (comnode);
gd->counter.commodities_loaded++;
- sixtp_run_callback(gd, "commodities");
+ sixtp_run_callback (gd, "commodities");
}
g_list_free (comms);
@@ -1121,13 +1127,13 @@ write_commodities(FILE *out, QofBook *book, sixtp_gdv2 *gd)
}
static gboolean
-write_pricedb(FILE *out, QofBook *book, sixtp_gdv2 *gd)
+write_pricedb (FILE* out, QofBook* book, sixtp_gdv2* gd)
{
xmlNodePtr node;
xmlNodePtr parent;
xmlOutputBufferPtr outbuf;
- parent = gnc_pricedb_dom_tree_create(gnc_pricedb_get_db(book));
+ parent = gnc_pricedb_dom_tree_create (gnc_pricedb_get_db (book));
if (!parent)
{
@@ -1138,92 +1144,92 @@ write_pricedb(FILE *out, QofBook *book, sixtp_gdv2 *gd)
We do it this way instead of just calling xmlElemDump so that we can
increment the progress bar as we go. */
- if (fprintf( out, "<%s version=\"%s\">\n", parent->name,
- xmlGetProp(parent, BAD_CAST "version")) < 0)
+ if (fprintf (out, "<%s version=\"%s\">\n", parent->name,
+ xmlGetProp (parent, BAD_CAST "version")) < 0)
return FALSE;
/* We create our own output buffer so we can call xmlNodeDumpOutput to get
the indendation correct. */
- outbuf = xmlOutputBufferCreateFile(out, NULL);
+ outbuf = xmlOutputBufferCreateFile (out, NULL);
if (outbuf == NULL)
{
- xmlFreeNode(parent);
+ xmlFreeNode (parent);
return FALSE;
}
for (node = parent->children; node; node = node->next)
{
/* Write two spaces since xmlNodeDumpOutput doesn't indent the first line */
- xmlOutputBufferWrite(outbuf, 2, " ");
- xmlNodeDumpOutput(outbuf, NULL, node, 1, 1, NULL);
+ xmlOutputBufferWrite (outbuf, 2, " ");
+ xmlNodeDumpOutput (outbuf, NULL, node, 1, 1, NULL);
/* It also doesn't terminate the last line */
- xmlOutputBufferWrite(outbuf, 1, "\n");
- if (ferror(out))
+ xmlOutputBufferWrite (outbuf, 1, "\n");
+ if (ferror (out))
break;
gd->counter.prices_loaded += 1;
- sixtp_run_callback(gd, "prices");
+ sixtp_run_callback (gd, "prices");
}
- xmlOutputBufferClose(outbuf);
+ xmlOutputBufferClose (outbuf);
- if (ferror(out) || fprintf(out, "</%s>\n", parent->name) < 0)
+ if (ferror (out) || fprintf (out, "</%s>\n", parent->name) < 0)
{
- xmlFreeNode(parent);
+ xmlFreeNode (parent);
return FALSE;
}
- xmlFreeNode(parent);
+ xmlFreeNode (parent);
return TRUE;
}
static int
-xml_add_trn_data(Transaction *t, gpointer data)
+xml_add_trn_data (Transaction* t, gpointer data)
{
- struct file_backend *be_data = static_cast<decltype(be_data)>(data);
+ struct file_backend* be_data = static_cast<decltype (be_data)> (data);
xmlNodePtr node;
- node = gnc_transaction_dom_tree_create(t);
+ node = gnc_transaction_dom_tree_create (t);
- xmlElemDump(be_data->out, NULL, node);
- xmlFreeNode(node);
+ xmlElemDump (be_data->out, NULL, node);
+ xmlFreeNode (node);
- if (ferror(be_data->out) || fprintf(be_data->out, "\n") < 0)
+ if (ferror (be_data->out) || fprintf (be_data->out, "\n") < 0)
return -1;
be_data->gd->counter.transactions_loaded++;
- sixtp_run_callback(be_data->gd, "transaction");
+ sixtp_run_callback (be_data->gd, "transaction");
return 0;
}
static gboolean
-write_transactions(FILE *out, QofBook *book, sixtp_gdv2 *gd)
+write_transactions (FILE* out, QofBook* book, sixtp_gdv2* gd)
{
struct file_backend be_data;
be_data.out = out;
be_data.gd = gd;
return 0 ==
- xaccAccountTreeForEachTransaction(gnc_book_get_root_account(book),
- xml_add_trn_data,
- (gpointer) &be_data);
+ xaccAccountTreeForEachTransaction (gnc_book_get_root_account (book),
+ xml_add_trn_data,
+ (gpointer) &be_data);
}
static gboolean
-write_template_transaction_data( FILE *out, QofBook *book, sixtp_gdv2 *gd )
+write_template_transaction_data (FILE* out, QofBook* book, sixtp_gdv2* gd)
{
- Account *ra;
+ Account* ra;
struct file_backend be_data;
be_data.out = out;
be_data.gd = gd;
- ra = gnc_book_get_template_root(book);
- if ( gnc_account_n_descendants(ra) > 0 )
+ ra = gnc_book_get_template_root (book);
+ if (gnc_account_n_descendants (ra) > 0)
{
- if (fprintf(out, "<%s>\n", TEMPLATE_TRANSACTION_TAG) < 0
- || !write_account_tree(out, ra, gd)
- || xaccAccountTreeForEachTransaction(ra, xml_add_trn_data, (gpointer)&be_data)
- || fprintf(out, "</%s>\n", TEMPLATE_TRANSACTION_TAG) < 0)
+ if (fprintf (out, "<%s>\n", TEMPLATE_TRANSACTION_TAG) < 0
+ || !write_account_tree (out, ra, gd)
+ || xaccAccountTreeForEachTransaction (ra, xml_add_trn_data, (gpointer)&be_data)
+ || fprintf (out, "</%s>\n", TEMPLATE_TRANSACTION_TAG) < 0)
return FALSE;
}
@@ -1232,139 +1238,140 @@ write_template_transaction_data( FILE *out, QofBook *book, sixtp_gdv2 *gd )
}
static gboolean
-write_schedXactions( FILE *out, QofBook *book, sixtp_gdv2 *gd)
+write_schedXactions (FILE* out, QofBook* book, sixtp_gdv2* gd)
{
- GList *schedXactions;
- SchedXaction *tmpSX;
+ GList* schedXactions;
+ SchedXaction* tmpSX;
xmlNodePtr node;
- schedXactions = gnc_book_get_schedxactions(book)->sx_list;
+ schedXactions = gnc_book_get_schedxactions (book)->sx_list;
if (schedXactions == NULL)
return TRUE;
do
{
- tmpSX = static_cast<decltype(tmpSX)>(schedXactions->data);
- node = gnc_schedXaction_dom_tree_create( tmpSX );
- xmlElemDump( out, NULL, node );
- xmlFreeNode(node);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ tmpSX = static_cast<decltype (tmpSX)> (schedXactions->data);
+ node = gnc_schedXaction_dom_tree_create (tmpSX);
+ xmlElemDump (out, NULL, node);
+ xmlFreeNode (node);
+ if (ferror (out) || fprintf (out, "\n") < 0)
return FALSE;
gd->counter.schedXactions_loaded++;
- sixtp_run_callback(gd, "schedXactions");
+ sixtp_run_callback (gd, "schedXactions");
}
- while ( (schedXactions = schedXactions->next) );
+ while ((schedXactions = schedXactions->next));
return TRUE;
}
static void
-write_budget (QofInstance *ent, gpointer data)
+write_budget (QofInstance* ent, gpointer data)
{
xmlNodePtr node;
- struct file_backend* be = static_cast<decltype(be)>(data);
+ struct file_backend* be = static_cast<decltype (be)> (data);
- GncBudget *bgt = GNC_BUDGET(ent);
+ GncBudget* bgt = GNC_BUDGET (ent);
- if (ferror(be->out))
+ if (ferror (be->out))
return;
- node = gnc_budget_dom_tree_create(bgt);
- xmlElemDump( be->out, NULL, node );
- xmlFreeNode(node);
- if (ferror(be->out) || fprintf(be->out, "\n") < 0)
+ node = gnc_budget_dom_tree_create (bgt);
+ xmlElemDump (be->out, NULL, node);
+ xmlFreeNode (node);
+ if (ferror (be->out) || fprintf (be->out, "\n") < 0)
return;
be->gd->counter.budgets_loaded++;
- sixtp_run_callback(be->gd, "budgets");
+ sixtp_run_callback (be->gd, "budgets");
}
gboolean
-gnc_xml2_write_namespace_decl (FILE *out, const char *name_space)
+gnc_xml2_write_namespace_decl (FILE* out, const char* name_space)
{
- g_return_val_if_fail(name_space, FALSE);
- return fprintf(out, "\n xmlns:%s=\"http://www.gnucash.org/XML/%s\"",
- name_space, name_space) >= 0;
+ g_return_val_if_fail (name_space, FALSE);
+ return fprintf (out, "\n xmlns:%s=\"http://www.gnucash.org/XML/%s\"",
+ name_space, name_space) >= 0;
}
static void
-do_write_namespace_cb (const char *type, gpointer data_p, gpointer file_p)
+do_write_namespace_cb (const char* type, gpointer data_p, gpointer file_p)
{
- GncXmlDataType_t *data = static_cast<decltype(data)>(data_p);
- FILE *out = static_cast<decltype(out)>(file_p);
+ GncXmlDataType_t* data = static_cast<decltype (data)> (data_p);
+ FILE* out = static_cast<decltype (out)> (file_p);
g_return_if_fail (type && data && out);
g_return_if_fail (data->version == GNC_FILE_BACKEND_VERS);
- if (data->ns && !ferror(out))
- (data->ns)(out);
+ if (data->ns && !ferror (out))
+ (data->ns) (out);
}
static gboolean
-write_v2_header (FILE *out)
+write_v2_header (FILE* out)
{
- if (fprintf(out, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n") < 0
- || fprintf(out, "<" GNC_V2_STRING) < 0
-
- || !gnc_xml2_write_namespace_decl (out, "gnc")
- || !gnc_xml2_write_namespace_decl (out, "act")
- || !gnc_xml2_write_namespace_decl (out, "book")
- || !gnc_xml2_write_namespace_decl (out, "cd")
- || !gnc_xml2_write_namespace_decl (out, "cmdty")
- || !gnc_xml2_write_namespace_decl (out, "price")
- || !gnc_xml2_write_namespace_decl (out, "slot")
- || !gnc_xml2_write_namespace_decl (out, "split")
- || !gnc_xml2_write_namespace_decl (out, "sx")
- || !gnc_xml2_write_namespace_decl (out, "trn")
- || !gnc_xml2_write_namespace_decl (out, "ts")
- || !gnc_xml2_write_namespace_decl (out, "fs")
- || !gnc_xml2_write_namespace_decl (out, "bgt")
- || !gnc_xml2_write_namespace_decl (out, "recurrence")
- || !gnc_xml2_write_namespace_decl (out, "lot"))
+ if (fprintf (out, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n") < 0
+ || fprintf (out, "<" GNC_V2_STRING) < 0
+
+ || !gnc_xml2_write_namespace_decl (out, "gnc")
+ || !gnc_xml2_write_namespace_decl (out, "act")
+ || !gnc_xml2_write_namespace_decl (out, "book")
+ || !gnc_xml2_write_namespace_decl (out, "cd")
+ || !gnc_xml2_write_namespace_decl (out, "cmdty")
+ || !gnc_xml2_write_namespace_decl (out, "price")
+ || !gnc_xml2_write_namespace_decl (out, "slot")
+ || !gnc_xml2_write_namespace_decl (out, "split")
+ || !gnc_xml2_write_namespace_decl (out, "sx")
+ || !gnc_xml2_write_namespace_decl (out, "trn")
+ || !gnc_xml2_write_namespace_decl (out, "ts")
+ || !gnc_xml2_write_namespace_decl (out, "fs")
+ || !gnc_xml2_write_namespace_decl (out, "bgt")
+ || !gnc_xml2_write_namespace_decl (out, "recurrence")
+ || !gnc_xml2_write_namespace_decl (out, "lot"))
return FALSE;
/* now cope with the plugins */
qof_object_foreach_backend (GNC_FILE_BACKEND, do_write_namespace_cb, out);
- if (ferror(out) || fprintf(out, ">\n") < 0)
+ if (ferror (out) || fprintf (out, ">\n") < 0)
return FALSE;
return TRUE;
}
gboolean
-gnc_book_write_to_xml_filehandle_v2(QofBook *book, FILE *out)
+gnc_book_write_to_xml_filehandle_v2 (QofBook* book, FILE* out)
{
- QofBackend *be;
- sixtp_gdv2 *gd;
+ QofBackend* be;
+ sixtp_gdv2* gd;
gboolean success = TRUE;
if (!out) return FALSE;
- if (!write_v2_header(out)
- || !write_counts(out, "book", 1, NULL))
+ if (!write_v2_header (out)
+ || !write_counts (out, "book", 1, NULL))
return FALSE;
- be = qof_book_get_backend(book);
- gd = gnc_sixtp_gdv2_new(book, FALSE, file_rw_feedback, be->percentage);
+ be = qof_book_get_backend (book);
+ gd = gnc_sixtp_gdv2_new (book, FALSE, file_rw_feedback, be->percentage);
gd->counter.commodities_total =
- gnc_commodity_table_get_size(gnc_commodity_table_get_table(book));
+ gnc_commodity_table_get_size (gnc_commodity_table_get_table (book));
gd->counter.accounts_total = 1 +
- gnc_account_n_descendants(gnc_book_get_root_account(book));
- gd->counter.transactions_total = gnc_book_count_transactions(book);
+ gnc_account_n_descendants (gnc_book_get_root_account (book));
+ gd->counter.transactions_total = gnc_book_count_transactions (book);
gd->counter.schedXactions_total =
- g_list_length(gnc_book_get_schedxactions(book)->sx_list);
- gd->counter.budgets_total = qof_collection_count(
- qof_book_get_collection(book, GNC_ID_BUDGET));
- gd->counter.prices_total = gnc_pricedb_get_num_prices(gnc_pricedb_get_db(book));
-
- if (!write_book(out, book, gd)
- || fprintf(out, "</" GNC_V2_STRING ">\n\n") < 0)
+ g_list_length (gnc_book_get_schedxactions (book)->sx_list);
+ gd->counter.budgets_total = qof_collection_count (
+ qof_book_get_collection (book, GNC_ID_BUDGET));
+ gd->counter.prices_total = gnc_pricedb_get_num_prices (gnc_pricedb_get_db (
+ book));
+
+ if (!write_book (out, book, gd)
+ || fprintf (out, "</" GNC_V2_STRING ">\n\n") < 0)
success = FALSE;
- g_free(gd);
+ g_free (gd);
return success;
}
@@ -1372,36 +1379,37 @@ gnc_book_write_to_xml_filehandle_v2(QofBook *book, FILE *out)
* This function is called by the "export" code.
*/
gboolean
-gnc_book_write_accounts_to_xml_filehandle_v2(QofBackend *be, QofBook *book, FILE *out)
+gnc_book_write_accounts_to_xml_filehandle_v2 (QofBackend* be, QofBook* book,
+ FILE* out)
{
- gnc_commodity_table *table;
- Account *root;
+ gnc_commodity_table* table;
+ Account* root;
int ncom, nacc;
- sixtp_gdv2 *gd;
+ sixtp_gdv2* gd;
gboolean success = TRUE;
if (!out) return FALSE;
- root = gnc_book_get_root_account(book);
- nacc = 1 + gnc_account_n_descendants(root);
+ root = gnc_book_get_root_account (book);
+ nacc = 1 + gnc_account_n_descendants (root);
- table = gnc_commodity_table_get_table(book);
- ncom = gnc_commodity_table_get_size(table);
+ table = gnc_commodity_table_get_table (book);
+ ncom = gnc_commodity_table_get_size (table);
- if (!write_v2_header(out)
- || !write_counts(out, "commodity", ncom, "account", nacc, NULL))
+ if (!write_v2_header (out)
+ || !write_counts (out, "commodity", ncom, "account", nacc, NULL))
return FALSE;
- gd = gnc_sixtp_gdv2_new(book, TRUE, file_rw_feedback, be->percentage);
+ gd = gnc_sixtp_gdv2_new (book, TRUE, file_rw_feedback, be->percentage);
gd->counter.commodities_total = ncom;
gd->counter.accounts_total = nacc;
- if (!write_commodities(out, book, gd)
- || !write_accounts(out, book, gd)
- || fprintf(out, "</" GNC_V2_STRING ">\n\n") < 0)
+ if (!write_commodities (out, book, gd)
+ || !write_accounts (out, book, gd)
+ || fprintf (out, "</" GNC_V2_STRING ">\n\n") < 0)
success = FALSE;
- g_free(gd);
+ g_free (gd);
return success;
}
@@ -1410,7 +1418,7 @@ gnc_book_write_accounts_to_xml_filehandle_v2(QofBackend *be, QofBook *book, FILE
/* Compress or decompress function that is to be run in a separate thread.
* Returns 1 on success or 0 otherwise, stuffed into a pointer type. */
static gpointer
-gz_thread_func(gz_thread_params_t *params)
+gz_thread_func (gz_thread_params_t* params)
{
gchar buffer[BUFLEN];
gssize bytes;
@@ -1420,33 +1428,33 @@ gz_thread_func(gz_thread_params_t *params)
#ifdef G_OS_WIN32
{
- gchar *conv_name = g_win32_locale_filename_from_utf8(params->filename);
- gchar *perms;
+ gchar* conv_name = g_win32_locale_filename_from_utf8 (params->filename);
+ gchar* perms;
if (!conv_name)
{
- g_warning("Could not convert '%s' to system codepage",
- params->filename);
+ g_warning ("Could not convert '%s' to system codepage",
+ params->filename);
success = 0;
goto cleanup_gz_thread_func;
}
- if (strchr(params->perms, 'b'))
- perms = g_strdup(params->perms);
+ if (strchr (params->perms, 'b'))
+ perms = g_strdup (params->perms);
else
- perms = g_strdup_printf("%cb%s", *params->perms, params->perms + 1);
+ perms = g_strdup_printf ("%cb%s", *params->perms, params->perms + 1);
- file = gzopen(conv_name, perms);
- g_free(perms);
- g_free(conv_name);
+ file = gzopen (conv_name, perms);
+ g_free (perms);
+ g_free (conv_name);
}
#else /* !G_OS_WIN32 */
- file = gzopen(params->filename, params->perms);
+ file = gzopen (params->filename, params->perms);
#endif /* G_OS_WIN32 */
if (file == NULL)
{
- g_warning("Child threads gzopen failed");
+ g_warning ("Child threads gzopen failed");
success = 0;
goto cleanup_gz_thread_func;
}
@@ -1455,15 +1463,15 @@ gz_thread_func(gz_thread_params_t *params)
{
while (success)
{
- bytes = read(params->fd, buffer, BUFLEN);
+ bytes = read (params->fd, buffer, BUFLEN);
if (bytes > 0)
{
- if (gzwrite(file, buffer, bytes) <= 0)
+ if (gzwrite (file, buffer, bytes) <= 0)
{
gint errnum;
- const gchar *error = gzerror(file, &errnum);
- g_warning("Could not write the compressed file '%s'. The error is: '%s' (%d)",
- params->filename, error, errnum);
+ const gchar* error = gzerror (file, &errnum);
+ g_warning ("Could not write the compressed file '%s'. The error is: '%s' (%d)",
+ params->filename, error, errnum);
success = 0;
}
}
@@ -1473,8 +1481,8 @@ gz_thread_func(gz_thread_params_t *params)
}
else
{
- g_warning("Could not read from pipe. The error is '%s' (errno %d)",
- g_strerror(errno) ? g_strerror(errno) : "", errno);
+ g_warning ("Could not read from pipe. The error is '%s' (errno %d)",
+ g_strerror (errno) ? g_strerror (errno) : "", errno);
success = 0;
}
}
@@ -1483,7 +1491,7 @@ gz_thread_func(gz_thread_params_t *params)
{
while (success)
{
- gzval = gzread(file, buffer, BUFLEN);
+ gzval = gzread (file, buffer, BUFLEN);
if (gzval > 0)
{
if (
@@ -1494,8 +1502,8 @@ gz_thread_func(gz_thread_params_t *params)
#endif
(params->fd, buffer, gzval) < 0)
{
- g_warning("Could not write to pipe. The error is '%s' (%d)",
- g_strerror(errno) ? g_strerror(errno) : "", errno);
+ g_warning ("Could not write to pipe. The error is '%s' (%d)",
+ g_strerror (errno) ? g_strerror (errno) : "", errno);
success = 0;
}
}
@@ -1506,145 +1514,146 @@ gz_thread_func(gz_thread_params_t *params)
else
{
gint errnum;
- const gchar *error = gzerror(file, &errnum);
- g_warning("Could not read from compressed file '%s'. The error is: '%s' (%d)",
- params->filename, error, errnum);
+ const gchar* error = gzerror (file, &errnum);
+ g_warning ("Could not read from compressed file '%s'. The error is: '%s' (%d)",
+ params->filename, error, errnum);
success = 0;
}
}
}
- if ((gzval = gzclose(file)) != Z_OK)
+ if ((gzval = gzclose (file)) != Z_OK)
{
- g_warning("Could not close the compressed file '%s' (errnum %d)",
- params->filename, gzval);
+ g_warning ("Could not close the compressed file '%s' (errnum %d)",
+ params->filename, gzval);
success = 0;
}
cleanup_gz_thread_func:
- close(params->fd);
- g_free(params->filename);
- g_free(params->perms);
- g_free(params);
+ close (params->fd);
+ g_free (params->filename);
+ g_free (params->perms);
+ g_free (params);
- return GINT_TO_POINTER(success);
+ return GINT_TO_POINTER (success);
}
-static FILE *
-try_gz_open (const char *filename, const char *perms, gboolean use_gzip,
+static FILE*
+try_gz_open (const char* filename, const char* perms, gboolean use_gzip,
gboolean compress)
{
- if (strstr(filename, ".gz.") != NULL) /* its got a temp extension */
+ if (strstr (filename, ".gz.") != NULL) /* its got a temp extension */
use_gzip = TRUE;
if (!use_gzip)
- return g_fopen(filename, perms);
+ return g_fopen (filename, perms);
{
int filedes[2];
- GThread *thread;
- GError *error = NULL;
- gz_thread_params_t *params;
- FILE *file;
+ GThread* thread;
+ GError* error = NULL;
+ gz_thread_params_t* params;
+ FILE* file;
#ifdef G_OS_WIN32
- if (_pipe(filedes, 4096, _O_BINARY) < 0)
+ if (_pipe (filedes, 4096, _O_BINARY) < 0)
{
#else
- if (pipe(filedes) < 0)
+ if (pipe (filedes) < 0)
{
#endif
- g_warning("Pipe call failed. Opening uncompressed file.");
- return g_fopen(filename, perms);
+ g_warning ("Pipe call failed. Opening uncompressed file.");
+ return g_fopen (filename, perms);
}
- params = g_new(gz_thread_params_t, 1);
+ params = g_new (gz_thread_params_t, 1);
params->fd = filedes[compress ? 0 : 1];
- params->filename = g_strdup(filename);
- params->perms = g_strdup(perms);
+ params->filename = g_strdup (filename);
+ params->perms = g_strdup (perms);
params->compress = compress;
#ifndef HAVE_GLIB_2_32
- thread = g_thread_create((GThreadFunc) gz_thread_func, params,
- TRUE, &error);
+ thread = g_thread_create ((GThreadFunc) gz_thread_func, params,
+ TRUE, &error);
#else
- thread = g_thread_new("xml_thread", (GThreadFunc) gz_thread_func,
- params);
+ thread = g_thread_new ("xml_thread", (GThreadFunc) gz_thread_func,
+ params);
#endif
if (!thread)
{
- g_warning("Could not create thread for (de)compression: %s",
- error->message);
- g_error_free(error);
- g_free(params->filename);
- g_free(params->perms);
- g_free(params);
- close(filedes[0]);
- close(filedes[1]);
-
- return g_fopen(filename, perms);
+ g_warning ("Could not create thread for (de)compression: %s",
+ error->message);
+ g_error_free (error);
+ g_free (params->filename);
+ g_free (params->perms);
+ g_free (params);
+ close (filedes[0]);
+ close (filedes[1]);
+
+ return g_fopen (filename, perms);
}
if (compress)
- file = fdopen(filedes[1], "w");
+ file = fdopen (filedes[1], "w");
else
- file = fdopen(filedes[0], "r");
+ file = fdopen (filedes[0], "r");
- G_LOCK(threads);
+ G_LOCK (threads);
if (!threads)
- threads = g_hash_table_new(g_direct_hash, g_direct_equal);
+ threads = g_hash_table_new (g_direct_hash, g_direct_equal);
- g_hash_table_insert(threads, file, thread);
- G_UNLOCK(threads);
+ g_hash_table_insert (threads, file, thread);
+ G_UNLOCK (threads);
return file;
}
}
static gboolean
-wait_for_gzip(FILE *file)
+wait_for_gzip (FILE* file)
{
gboolean retval = TRUE;
- G_LOCK(threads);
+ G_LOCK (threads);
if (threads)
{
- GThread *thread = static_cast<decltype(thread)>(g_hash_table_lookup(threads, file));
+ GThread* thread = static_cast<decltype (thread)> (g_hash_table_lookup (threads,
+ file));
if (thread)
{
- g_hash_table_remove(threads, file);
- retval = GPOINTER_TO_INT(g_thread_join(thread));
+ g_hash_table_remove (threads, file);
+ retval = GPOINTER_TO_INT (g_thread_join (thread));
}
}
- G_UNLOCK(threads);
+ G_UNLOCK (threads);
return retval;
}
gboolean
-gnc_book_write_to_xml_file_v2(
- QofBook *book,
- const char *filename,
+gnc_book_write_to_xml_file_v2 (
+ QofBook* book,
+ const char* filename,
gboolean compress)
{
- FILE *out;
+ FILE* out;
gboolean success = TRUE;
- out = try_gz_open(filename, "w", compress, TRUE);
+ out = try_gz_open (filename, "w", compress, TRUE);
/* Try to write as much as possible */
if (!out
- || !gnc_book_write_to_xml_filehandle_v2(book, out)
- || !write_emacs_trailer(out))
+ || !gnc_book_write_to_xml_filehandle_v2 (book, out)
+ || !write_emacs_trailer (out))
success = FALSE;
/* Close the output stream */
- if (out && fclose(out))
+ if (out && fclose (out))
success = FALSE;
/* Optionally wait for parallel compression threads */
if (out && compress)
- if (!wait_for_gzip(out))
+ if (!wait_for_gzip (out))
success = FALSE;
return success;
@@ -1656,31 +1665,31 @@ gnc_book_write_to_xml_file_v2(
* postgress or anything else.
*/
gboolean
-gnc_book_write_accounts_to_xml_file_v2(
- QofBackend *be,
- QofBook *book,
- const char *filename)
+gnc_book_write_accounts_to_xml_file_v2 (
+ QofBackend* be,
+ QofBook* book,
+ const char* filename)
{
- FILE *out;
+ FILE* out;
gboolean success = TRUE;
- out = g_fopen(filename, "w");
+ out = g_fopen (filename, "w");
/* Try to write as much as possible */
if (!out
- || !gnc_book_write_accounts_to_xml_filehandle_v2 (be, book, out)
- || !write_emacs_trailer(out))
+ || !gnc_book_write_accounts_to_xml_filehandle_v2 (be, book, out)
+ || !write_emacs_trailer (out))
success = FALSE;
/* Close the output stream */
- if (out && fclose(out))
+ if (out && fclose (out))
success = FALSE;
- if (!success && !qof_backend_check_error(be))
+ if (!success && !qof_backend_check_error (be))
{
/* Use a generic write error code */
- qof_backend_set_error(be, ERR_FILEIO_WRITE_ERROR);
+ qof_backend_set_error (be, ERR_FILEIO_WRITE_ERROR);
}
return success;
@@ -1688,22 +1697,22 @@ gnc_book_write_accounts_to_xml_file_v2(
/***********************************************************************/
static gboolean
-is_gzipped_file(const gchar *name)
+is_gzipped_file (const gchar* name)
{
unsigned char buf[2];
- int fd = g_open(name, O_RDONLY, 0);
+ int fd = g_open (name, O_RDONLY, 0);
if (fd == -1)
{
return FALSE;
}
- if (read(fd, buf, 2) != 2)
+ if (read (fd, buf, 2) != 2)
{
- close(fd);
+ close (fd);
return FALSE;
}
- close(fd);
+ close (fd);
if (buf[0] == 037 && buf[1] == 0213)
{
@@ -1714,9 +1723,9 @@ is_gzipped_file(const gchar *name)
}
QofBookFileType
-gnc_is_xml_data_file_v2(const gchar *name, gboolean *with_encoding)
+gnc_is_xml_data_file_v2 (const gchar* name, gboolean* with_encoding)
{
- if (is_gzipped_file(name))
+ if (is_gzipped_file (name))
{
gzFile file = NULL;
char first_chunk[256];
@@ -1724,73 +1733,73 @@ gnc_is_xml_data_file_v2(const gchar *name, gboolean *with_encoding)
#ifdef G_OS_WIN32
{
- gchar *conv_name = g_win32_locale_filename_from_utf8(name);
+ gchar* conv_name = g_win32_locale_filename_from_utf8 (name);
if (!conv_name)
- g_warning("Could not convert '%s' to system codepage", name);
+ g_warning ("Could not convert '%s' to system codepage", name);
else
{
- file = gzopen(conv_name, "rb");
- g_free(conv_name);
+ file = gzopen (conv_name, "rb");
+ g_free (conv_name);
}
}
#else
- file = gzopen(name, "r");
+ file = gzopen (name, "r");
#endif
if (file == NULL)
return GNC_BOOK_NOT_OURS;
- num_read = gzread(file, first_chunk, sizeof(first_chunk) - 1);
- gzclose(file);
+ num_read = gzread (file, first_chunk, sizeof (first_chunk) - 1);
+ gzclose (file);
if (num_read < 1)
return GNC_BOOK_NOT_OURS;
- return gnc_is_our_first_xml_chunk(first_chunk, with_encoding);
+ return gnc_is_our_first_xml_chunk (first_chunk, with_encoding);
}
- return (gnc_is_our_xml_file(name, with_encoding));
+ return (gnc_is_our_xml_file (name, with_encoding));
}
static void
-replace_character_references(gchar *string)
+replace_character_references (gchar* string)
{
- gchar *cursor, *semicolon, *tail;
+ gchar* cursor, *semicolon, *tail;
glong number;
- for (cursor = strstr(string, "&#");
- cursor && *cursor;
- cursor = strstr(cursor, "&#"))
+ for (cursor = strstr (string, "&#");
+ cursor && *cursor;
+ cursor = strstr (cursor, "&#"))
{
- semicolon = strchr(cursor, ';');
+ semicolon = strchr (cursor, ';');
if (semicolon && *semicolon)
{
/* parse number */
errno = 0;
- if (*(cursor + 2) == 'x')
+ if (* (cursor + 2) == 'x')
{
- number = strtol(cursor + 3, &tail, 16);
+ number = strtol (cursor + 3, &tail, 16);
}
else
{
- number = strtol(cursor + 2, &tail, 10);
+ number = strtol (cursor + 2, &tail, 10);
}
if (errno || tail != semicolon || number < 0 || number > 255)
{
- PWARN("Illegal character reference");
+ PWARN ("Illegal character reference");
return;
}
/* overwrite '&' with the specified character */
*cursor = (gchar) number;
cursor++;
- if (*(semicolon + 1))
+ if (* (semicolon + 1))
{
/* move text after semicolon the the left */
- tail = g_strdup(semicolon + 1);
- strcpy(cursor, tail);
- g_free(tail);
+ tail = g_strdup (semicolon + 1);
+ strcpy (cursor, tail);
+ g_free (tail);
}
else
{
@@ -1801,27 +1810,27 @@ replace_character_references(gchar *string)
}
else
{
- PWARN("Unclosed character reference");
+ PWARN ("Unclosed character reference");
return;
}
}
}
static void
-conv_free(conv_type *conv)
+conv_free (conv_type* conv)
{
if (conv)
{
- g_free(conv->utf8_string);
- g_free(conv);
+ g_free (conv->utf8_string);
+ g_free (conv);
}
}
static void
-conv_list_free(GList *conv_list)
+conv_list_free (GList* conv_list)
{
- g_list_foreach(conv_list, (GFunc) conv_free, NULL);
- g_list_free(conv_list);
+ g_list_foreach (conv_list, (GFunc) conv_free, NULL);
+ g_list_free (conv_list);
}
typedef struct
@@ -1831,82 +1840,82 @@ typedef struct
} iconv_item_type;
gint
-gnc_xml2_find_ambiguous(const gchar *filename, GList *encodings,
- GHashTable **unique, GHashTable **ambiguous,
- GList **impossible)
+gnc_xml2_find_ambiguous (const gchar* filename, GList* encodings,
+ GHashTable** unique, GHashTable** ambiguous,
+ GList** impossible)
{
- FILE *file = NULL;
- GList *iconv_list = NULL, *conv_list = NULL, *iter;
- iconv_item_type *iconv_item = NULL, *ascii = NULL;
- const gchar *enc;
- GHashTable *processed = NULL;
+ FILE* file = NULL;
+ GList* iconv_list = NULL, *conv_list = NULL, *iter;
+ iconv_item_type* iconv_item = NULL, *ascii = NULL;
+ const gchar* enc;
+ GHashTable* processed = NULL;
gint n_impossible = 0;
- GError *error = NULL;
+ GError* error = NULL;
gboolean is_compressed;
gboolean clean_return = FALSE;
- is_compressed = is_gzipped_file(filename);
- file = try_gz_open(filename, "r", is_compressed, FALSE);
+ is_compressed = is_gzipped_file (filename);
+ file = try_gz_open (filename, "r", is_compressed, FALSE);
if (file == NULL)
{
- PWARN("Unable to open file %s", filename);
+ PWARN ("Unable to open file %s", filename);
goto cleanup_find_ambs;
}
/* we need ascii */
- ascii = g_new(iconv_item_type, 1);
- ascii->encoding = g_quark_from_string("ASCII");
- ascii->iconv = g_iconv_open("UTF-8", "ASCII");
+ ascii = g_new (iconv_item_type, 1);
+ ascii->encoding = g_quark_from_string ("ASCII");
+ ascii->iconv = g_iconv_open ("UTF-8", "ASCII");
if (ascii->iconv == (GIConv) - 1)
{
- PWARN("Unable to open ASCII ICONV conversion descriptor");
+ PWARN ("Unable to open ASCII ICONV conversion descriptor");
goto cleanup_find_ambs;
}
/* call iconv_open on encodings */
for (iter = encodings; iter; iter = iter->next)
{
- iconv_item = g_new(iconv_item_type, 1);
+ iconv_item = g_new (iconv_item_type, 1);
iconv_item->encoding = GPOINTER_TO_UINT (iter->data);
if (iconv_item->encoding == ascii->encoding)
{
continue;
}
- enc = g_quark_to_string(iconv_item->encoding);
- iconv_item->iconv = g_iconv_open("UTF-8", enc);
+ enc = g_quark_to_string (iconv_item->encoding);
+ iconv_item->iconv = g_iconv_open ("UTF-8", enc);
if (iconv_item->iconv == (GIConv) - 1)
{
- PWARN("Unable to open IConv conversion descriptor for '%s'", enc);
+ PWARN ("Unable to open IConv conversion descriptor for '%s'", enc);
goto cleanup_find_ambs;
}
else
{
- iconv_list = g_list_prepend(iconv_list, iconv_item);
+ iconv_list = g_list_prepend (iconv_list, iconv_item);
}
}
/* prepare data containers */
if (unique)
- *unique = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
- (GDestroyNotify) conv_free);
+ *unique = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+ (GDestroyNotify) conv_free);
if (ambiguous)
- *ambiguous = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
- (GDestroyNotify) conv_list_free);
+ *ambiguous = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+ (GDestroyNotify) conv_list_free);
if (impossible)
*impossible = NULL;
- processed = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+ processed = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
/* loop through lines */
while (1)
{
gchar line[256], *word, *utf8;
- gchar **word_array, **word_cursor;
- conv_type *conv = NULL;
+ gchar** word_array, **word_cursor;
+ conv_type* conv = NULL;
- if (!fgets(line, sizeof(line) - 1, file))
+ if (!fgets (line, sizeof (line) - 1, file))
{
- if (feof(file))
+ if (feof (file))
{
break;
}
@@ -1916,9 +1925,9 @@ gnc_xml2_find_ambiguous(const gchar *filename, GList *encodings,
}
}
- g_strchomp(line);
- replace_character_references(line);
- word_array = g_strsplit_set(line, "> <", 0);
+ g_strchomp (line);
+ replace_character_references (line);
+ word_array = g_strsplit_set (line, "> <", 0);
/* loop through words */
for (word_cursor = word_array; *word_cursor; word_cursor++)
@@ -1927,18 +1936,18 @@ gnc_xml2_find_ambiguous(const gchar *filename, GList *encodings,
if (!word)
continue;
- utf8 = g_convert_with_iconv(word, -1, ascii->iconv,
- NULL, NULL, &error);
+ utf8 = g_convert_with_iconv (word, -1, ascii->iconv,
+ NULL, NULL, &error);
if (utf8)
{
/* pure ascii */
- g_free(utf8);
+ g_free (utf8);
continue;
}
- g_error_free(error);
+ g_error_free (error);
error = NULL;
- if (g_hash_table_lookup_extended(processed, word, NULL, NULL))
+ if (g_hash_table_lookup_extended (processed, word, NULL, NULL))
{
/* already processed */
continue;
@@ -1948,19 +1957,19 @@ gnc_xml2_find_ambiguous(const gchar *filename, GList *encodings,
conv_list = NULL;
for (iter = iconv_list; iter; iter = iter->next)
{
- iconv_item = static_cast<decltype(iconv_item)>(iter->data);
- utf8 = g_convert_with_iconv(word, -1, iconv_item->iconv,
- NULL, NULL, &error);
+ iconv_item = static_cast<decltype (iconv_item)> (iter->data);
+ utf8 = g_convert_with_iconv (word, -1, iconv_item->iconv,
+ NULL, NULL, &error);
if (utf8)
{
- conv = g_new(conv_type, 1);
+ conv = g_new (conv_type, 1);
conv->encoding = iconv_item->encoding;
conv->utf8_string = utf8;
- conv_list = g_list_prepend(conv_list, conv);
+ conv_list = g_list_prepend (conv_list, conv);
}
else
{
- g_error_free(error);
+ g_error_free (error);
error = NULL;
}
}
@@ -1969,7 +1978,7 @@ gnc_xml2_find_ambiguous(const gchar *filename, GList *encodings,
if (!conv_list)
{
if (impossible)
- *impossible = g_list_append(*impossible, g_strdup(word));
+ *impossible = g_list_append (*impossible, g_strdup (word));
n_impossible++;
}
@@ -1978,11 +1987,11 @@ gnc_xml2_find_ambiguous(const gchar *filename, GList *encodings,
{
if (ambiguous)
{
- g_hash_table_insert(*ambiguous, g_strdup(word), conv_list);
+ g_hash_table_insert (*ambiguous, g_strdup (word), conv_list);
}
else
{
- conv_list_free(conv_list);
+ conv_list_free (conv_list);
}
}
@@ -1991,18 +2000,18 @@ gnc_xml2_find_ambiguous(const gchar *filename, GList *encodings,
{
if (unique)
{
- g_hash_table_insert(*unique, g_strdup(word), conv);
+ g_hash_table_insert (*unique, g_strdup (word), conv);
}
else
{
- conv_free(conv);
+ conv_free (conv);
}
- g_list_free(conv_list);
+ g_list_free (conv_list);
}
- g_hash_table_insert(processed, g_strdup(word), NULL);
+ g_hash_table_insert (processed, g_strdup (word), NULL);
}
- g_strfreev(word_array);
+ g_strfreev (word_array);
}
clean_return = TRUE;
@@ -2015,21 +2024,21 @@ cleanup_find_ambs:
{
if (iter->data)
{
- g_iconv_close(((iconv_item_type*) iter->data)->iconv);
- g_free(iter->data);
+ g_iconv_close (((iconv_item_type*) iter->data)->iconv);
+ g_free (iter->data);
}
}
- g_list_free(iconv_list);
+ g_list_free (iconv_list);
}
if (processed)
- g_hash_table_destroy(processed);
+ g_hash_table_destroy (processed);
if (ascii)
- g_free(ascii);
+ g_free (ascii);
if (file)
{
- fclose(file);
+ fclose (file);
if (is_compressed)
- wait_for_gzip(file);
+ wait_for_gzip (file);
}
return (clean_return) ? n_impossible : -1;
@@ -2037,34 +2046,34 @@ cleanup_find_ambs:
typedef struct
{
- gchar *filename;
- GHashTable *subst;
+ gchar* filename;
+ GHashTable* subst;
} push_data_type;
static void
parse_with_subst_push_handler (xmlParserCtxtPtr xml_context,
- push_data_type *push_data)
+ push_data_type* push_data)
{
- const gchar *filename;
- FILE *file = NULL;
+ const gchar* filename;
+ FILE* file = NULL;
GIConv ascii = (GIConv) - 1;
- GString *output = NULL;
- GError *error = NULL;
+ GString* output = NULL;
+ GError* error = NULL;
gboolean is_compressed;
filename = push_data->filename;
- is_compressed = is_gzipped_file(filename);
- file = try_gz_open(filename, "r", is_compressed, FALSE);
+ is_compressed = is_gzipped_file (filename);
+ file = try_gz_open (filename, "r", is_compressed, FALSE);
if (file == NULL)
{
- PWARN("Unable to open file %s", filename);
+ PWARN ("Unable to open file %s", filename);
goto cleanup_push_handler;
}
- ascii = g_iconv_open("UTF-8", "ASCII");
+ ascii = g_iconv_open ("UTF-8", "ASCII");
if (ascii == (GIConv) - 1)
{
- PWARN("Unable to open ASCII ICONV conversion descriptor");
+ PWARN ("Unable to open ASCII ICONV conversion descriptor");
goto cleanup_push_handler;
}
@@ -2073,11 +2082,11 @@ parse_with_subst_push_handler (xmlParserCtxtPtr xml_context,
{
gchar line[256], *word, *repl, *utf8;
gint pos, len;
- gchar *start, *cursor;
+ gchar* start, *cursor;
- if (!fgets(line, sizeof(line) - 1, file))
+ if (!fgets (line, sizeof (line) - 1, file))
{
- if (feof(file))
+ if (feof (file))
{
break;
}
@@ -2087,8 +2096,8 @@ parse_with_subst_push_handler (xmlParserCtxtPtr xml_context,
}
}
- replace_character_references(line);
- output = g_string_new(line);
+ replace_character_references (line);
+ output = g_string_new (line);
/* loop through words */
cursor = output->str;
@@ -2097,7 +2106,7 @@ parse_with_subst_push_handler (xmlParserCtxtPtr xml_context,
{
/* ignore delimiters */
while (*cursor == '>' || *cursor == ' ' || *cursor == '<' ||
- *cursor == '\n')
+ *cursor == '\n')
{
cursor++;
pos += 1;
@@ -2111,34 +2120,35 @@ parse_with_subst_push_handler (xmlParserCtxtPtr xml_context,
start = cursor;
len = 0;
while (*cursor && *cursor != '>' && *cursor != ' ' && *cursor != '<' &&
- *cursor != '\n')
+ *cursor != '\n')
{
cursor++;
len++;
}
- utf8 = g_convert_with_iconv(start, len, ascii, NULL, NULL, &error);
+ utf8 = g_convert_with_iconv (start, len, ascii, NULL, NULL, &error);
if (utf8)
{
/* pure ascii */
- g_free(utf8);
+ g_free (utf8);
pos += len;
}
else
{
- g_error_free(error);
+ g_error_free (error);
error = NULL;
- word = g_strndup(start, len);
- repl = static_cast<decltype(repl)>(g_hash_table_lookup(push_data->subst, word));
- g_free(word);
+ word = g_strndup (start, len);
+ repl = static_cast<decltype (repl)> (g_hash_table_lookup (push_data->subst,
+ word));
+ g_free (word);
if (repl)
{
/* there is a replacement */
- output = g_string_insert(g_string_erase(output, pos, len),
- pos, repl);
- pos += strlen(repl);
+ output = g_string_insert (g_string_erase (output, pos, len),
+ pos, repl);
+ pos += strlen (repl);
cursor = output->str + pos;
}
else
@@ -2149,45 +2159,45 @@ parse_with_subst_push_handler (xmlParserCtxtPtr xml_context,
}
}
- if (xmlParseChunk(xml_context, output->str, output->len, 0) != 0)
+ if (xmlParseChunk (xml_context, output->str, output->len, 0) != 0)
{
goto cleanup_push_handler;
}
}
/* last chunk */
- xmlParseChunk(xml_context, "", 0, 1);
+ xmlParseChunk (xml_context, "", 0, 1);
cleanup_push_handler:
if (output)
- g_string_free(output, TRUE);
+ g_string_free (output, TRUE);
if (ascii != (GIConv) - 1)
- g_iconv_close(ascii);
+ g_iconv_close (ascii);
if (file)
{
- fclose(file);
+ fclose (file);
if (is_compressed)
- wait_for_gzip(file);
+ wait_for_gzip (file);
}
}
gboolean
-gnc_xml2_parse_with_subst (FileBackend *fbe, QofBook *book, GHashTable *subst)
+gnc_xml2_parse_with_subst (FileBackend* fbe, QofBook* book, GHashTable* subst)
{
- push_data_type *push_data;
+ push_data_type* push_data;
gboolean success;
- push_data = g_new(push_data_type, 1);
+ push_data = g_new (push_data_type, 1);
push_data->filename = fbe->fullpath;
push_data->subst = subst;
- success = qof_session_load_from_xml_file_v2_full(
+ success = qof_session_load_from_xml_file_v2_full (
fbe, book, (sixtp_push_handler) parse_with_subst_push_handler,
push_data, GNC_BOOK_XML2_FILE);
if (success)
- qof_instance_set_dirty (QOF_INSTANCE (book));
+ qof_instance_set_dirty (QOF_INSTANCE (book));
return success;
}
diff --git a/src/backend/xml/io-gncxml-v2.h b/src/backend/xml/io-gncxml-v2.h
index 37510af..363e4c5 100644
--- a/src/backend/xml/io-gncxml-v2.h
+++ b/src/backend/xml/io-gncxml-v2.h
@@ -64,8 +64,8 @@ extern "C"
* The ns() method will output XML namespace information for the selected
* plug-in object.
*/
-#define GNC_FILE_BACKEND "gnc:file:2"
-#define GNC_FILE_BACKEND_VERS 2
+#define GNC_FILE_BACKEND "gnc:file:2"
+#define GNC_FILE_BACKEND_VERS 2
/**
* Struct used to pass the account group/accounts and trasnactions in
@@ -75,38 +75,42 @@ extern "C"
**/
typedef struct
{
- AccountList *accts;
- TransList *transactions;
- QofBook *book;
+ AccountList* accts;
+ TransList* transactions;
+ QofBook* book;
} gnc_template_xaction_data;
/** read in an account group from a file */
-gboolean qof_session_load_from_xml_file_v2(FileBackend *, QofBook *, QofBookFileType);
+gboolean qof_session_load_from_xml_file_v2 (FileBackend*, QofBook*,
+ QofBookFileType);
/* write all book info to a file */
-gboolean gnc_book_write_to_xml_filehandle_v2(QofBook *book, FILE *fh);
-gboolean gnc_book_write_to_xml_file_v2(QofBook *book, const char *filename, gboolean compress);
+gboolean gnc_book_write_to_xml_filehandle_v2 (QofBook* book, FILE* fh);
+gboolean gnc_book_write_to_xml_file_v2 (QofBook* book, const char* filename,
+ gboolean compress);
/** write just the commodities and accounts to a file */
-gboolean gnc_book_write_accounts_to_xml_filehandle_v2(QofBackend *be, QofBook *book, FILE *fh);
-gboolean gnc_book_write_accounts_to_xml_file_v2(QofBackend * be, QofBook *book,
- const char *filename);
+gboolean gnc_book_write_accounts_to_xml_filehandle_v2 (QofBackend* be,
+ QofBook* book, FILE* fh);
+gboolean gnc_book_write_accounts_to_xml_file_v2 (QofBackend* be, QofBook* book,
+ const char* filename);
/** The is_gncxml_file() routine checks to see if the first few
* chars of the file look like gnc-xml data.
*/
-QofBookFileType gnc_is_xml_data_file_v2(const gchar *name, gboolean *with_encoding);
+QofBookFileType gnc_is_xml_data_file_v2 (const gchar* name,
+ gboolean* with_encoding);
/** Write a name-space declaration for the provided namespace data type
* within the GNC XML namespace at http://www.gnucash.org/XML.
*/
-gboolean gnc_xml2_write_namespace_decl (FILE *out, const char *name_space);
+gboolean gnc_xml2_write_namespace_decl (FILE* out, const char* name_space);
typedef struct
{
GQuark encoding;
- gchar *utf8_string;
+ gchar* utf8_string;
} conv_type;
/** Read a file as plain byte stream to find words that are not completely ASCII.
@@ -130,9 +134,9 @@ typedef struct
*
* @return Size of impossible, -1 on error.
*/
-gint gnc_xml2_find_ambiguous(
- const gchar *filename, GList *encodings, GHashTable **unique,
- GHashTable **ambiguous, GList **impossible);
+gint gnc_xml2_find_ambiguous (
+ const gchar* filename, GList* encodings, GHashTable** unique,
+ GHashTable** ambiguous, GList** impossible);
/** Parse a file in push mode, but replace byte sequences in the file given a
* hash table of substitutions
@@ -140,7 +144,7 @@ gint gnc_xml2_find_ambiguous(
* @param subst hash table with keys and values of type gchar*
*/
gboolean gnc_xml2_parse_with_subst (
- FileBackend *fbe, QofBook *book, GHashTable *subst);
+ FileBackend* fbe, QofBook* book, GHashTable* subst);
#ifdef __cplusplus
}
#endif
diff --git a/src/backend/xml/io-gncxml.h b/src/backend/xml/io-gncxml.h
index 2fc1457..94b4015 100644
--- a/src/backend/xml/io-gncxml.h
+++ b/src/backend/xml/io-gncxml.h
@@ -44,12 +44,12 @@ extern "C"
accessable via gnc_book_get_xml_io_error() a la binfile. */
/** Read in an account group from a file */
-gboolean qof_session_load_from_xml_file(QofBook *, const char * filename);
+gboolean qof_session_load_from_xml_file (QofBook*, const char* filename);
/** The is_gncxml_file() routine checks to see if the first few
* chars of the file look like gnc-xml data.
*/
-gboolean gnc_is_xml_data_file(const gchar *name);
+gboolean gnc_is_xml_data_file (const gchar* name);
#ifdef __cplusplus
}
diff --git a/src/backend/xml/io-utils.cpp b/src/backend/xml/io-utils.cpp
index d2b959c..72c3563 100644
--- a/src/backend/xml/io-utils.cpp
+++ b/src/backend/xml/io-utils.cpp
@@ -39,68 +39,68 @@ extern "C"
<!-- End: -->
*/
-static const gchar *emacs_trailer =
+static const gchar* emacs_trailer =
"<!-- Local variables: -->\n"
"<!-- mode: xml -->\n"
"<!-- End: -->\n";
gboolean
-write_emacs_trailer(FILE *out)
+write_emacs_trailer (FILE* out)
{
- return fprintf(out, "%s", emacs_trailer) >= 0;
+ return fprintf (out, "%s", emacs_trailer) >= 0;
}
static gboolean
-write_one_account(FILE *out,
- Account *account,
- sixtp_gdv2 *gd,
- gboolean allow_incompat)
+write_one_account (FILE* out,
+ Account* account,
+ sixtp_gdv2* gd,
+ gboolean allow_incompat)
{
xmlNodePtr accnode;
accnode =
- gnc_account_dom_tree_create(account, gd && gd->exporting, allow_incompat);
+ gnc_account_dom_tree_create (account, gd && gd->exporting, allow_incompat);
- xmlElemDump(out, NULL, accnode);
- xmlFreeNode(accnode);
+ xmlElemDump (out, NULL, accnode);
+ xmlFreeNode (accnode);
- if (ferror(out) || fprintf(out, "\n") < 0)
+ if (ferror (out) || fprintf (out, "\n") < 0)
return FALSE;
gd->counter.accounts_loaded++;
- sixtp_run_callback(gd, "account");
+ sixtp_run_callback (gd, "account");
return TRUE;
}
gboolean
-write_account_tree(FILE *out, Account *root, sixtp_gdv2 *gd)
+write_account_tree (FILE* out, Account* root, sixtp_gdv2* gd)
{
- GList *descendants, *node;
+ GList* descendants, *node;
gboolean allow_incompat = TRUE;
gboolean success = TRUE;
if (allow_incompat)
- if (!write_one_account(out, root, gd, allow_incompat))
+ if (!write_one_account (out, root, gd, allow_incompat))
return FALSE;
- descendants = gnc_account_get_descendants(root);
- for (node = descendants; node; node = g_list_next(node))
+ descendants = gnc_account_get_descendants (root);
+ for (node = descendants; node; node = g_list_next (node))
{
- if (!write_one_account(out, static_cast<Account*>(node->data),
- gd, allow_incompat))
+ if (!write_one_account (out, static_cast<Account*> (node->data),
+ gd, allow_incompat))
{
success = FALSE;
break;
}
}
- g_list_free(descendants);
+ g_list_free (descendants);
return success;
}
gboolean
-write_accounts(FILE *out, QofBook *book, sixtp_gdv2 *gd)
+write_accounts (FILE* out, QofBook* book, sixtp_gdv2* gd)
{
- return write_account_tree(out, gnc_book_get_root_account(book), gd);
+ return write_account_tree (out, gnc_book_get_root_account (book), gd);
}
diff --git a/src/backend/xml/io-utils.h b/src/backend/xml/io-utils.h
index 9832385..9c78470 100644
--- a/src/backend/xml/io-utils.h
+++ b/src/backend/xml/io-utils.h
@@ -32,12 +32,12 @@ extern "C"
#include "io-gncxml-v2.h"
-gboolean write_account_tree(FILE *out, Account *root, sixtp_gdv2 *gd);
-gboolean write_accounts(FILE *out, QofBook *book, sixtp_gdv2 *gd);
-gboolean write_book_parts(FILE *out, QofBook *book);
-gboolean write_commodities(FILE *out, QofBook *book, sixtp_gdv2 *gd);
+gboolean write_account_tree (FILE* out, Account* root, sixtp_gdv2* gd);
+gboolean write_accounts (FILE* out, QofBook* book, sixtp_gdv2* gd);
+gboolean write_book_parts (FILE* out, QofBook* book);
+gboolean write_commodities (FILE* out, QofBook* book, sixtp_gdv2* gd);
-gboolean write_emacs_trailer(FILE *out);
+gboolean write_emacs_trailer (FILE* out);
#endif /* IO_UTILS_H */
diff --git a/src/backend/xml/sixtp-dom-generators.cpp b/src/backend/xml/sixtp-dom-generators.cpp
index f01d9f2..1db5895 100644
--- a/src/backend/xml/sixtp-dom-generators.cpp
+++ b/src/backend/xml/sixtp-dom-generators.cpp
@@ -39,194 +39,194 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
xmlNodePtr
-boolean_to_dom_tree(const char* tag, gboolean val)
+boolean_to_dom_tree (const char* tag, gboolean val)
{
- return text_to_dom_tree(tag, val ? "TRUE" : "FALSE");
+ return text_to_dom_tree (tag, val ? "TRUE" : "FALSE");
}
xmlNodePtr
-text_to_dom_tree(const char *tag, const char *str)
+text_to_dom_tree (const char* tag, const char* str)
{
xmlNodePtr result;
- gchar *newstr = g_strdup (str);
- g_return_val_if_fail(tag, NULL);
- g_return_val_if_fail(str, NULL);
- result = xmlNewNode(NULL, BAD_CAST tag);
- g_return_val_if_fail(result, NULL);
- xmlNodeAddContent(result, checked_char_cast (newstr));
+ gchar* newstr = g_strdup (str);
+ g_return_val_if_fail (tag, NULL);
+ g_return_val_if_fail (str, NULL);
+ result = xmlNewNode (NULL, BAD_CAST tag);
+ g_return_val_if_fail (result, NULL);
+ xmlNodeAddContent (result, checked_char_cast (newstr));
g_free (newstr);
return result;
}
xmlNodePtr
-int_to_dom_tree(const char *tag, gint64 val)
+int_to_dom_tree (const char* tag, gint64 val)
{
- gchar *text;
+ gchar* text;
xmlNodePtr result;
- text = g_strdup_printf("%" G_GINT64_FORMAT, val);
- g_return_val_if_fail(text, NULL);
- result = text_to_dom_tree(tag, text);
- g_free(text);
+ text = g_strdup_printf ("%" G_GINT64_FORMAT, val);
+ g_return_val_if_fail (text, NULL);
+ result = text_to_dom_tree (tag, text);
+ g_free (text);
return result;
}
xmlNodePtr
-guint_to_dom_tree(const char *tag, guint an_int)
+guint_to_dom_tree (const char* tag, guint an_int)
{
- gchar *text;
+ gchar* text;
xmlNodePtr result;
- text = g_strdup_printf("%u", an_int );
- g_return_val_if_fail(text, NULL);
- result = text_to_dom_tree(tag, text);
- g_free(text);
+ text = g_strdup_printf ("%u", an_int);
+ g_return_val_if_fail (text, NULL);
+ result = text_to_dom_tree (tag, text);
+ g_free (text);
return result;
}
xmlNodePtr
-guid_to_dom_tree(const char *tag, const GncGUID* gid)
+guid_to_dom_tree (const char* tag, const GncGUID* gid)
{
char guid_str[GUID_ENCODING_LENGTH + 1];
xmlNodePtr ret;
- ret = xmlNewNode(NULL, BAD_CAST tag);
+ ret = xmlNewNode (NULL, BAD_CAST tag);
- xmlSetProp(ret, BAD_CAST "type", BAD_CAST "guid");
+ xmlSetProp (ret, BAD_CAST "type", BAD_CAST "guid");
- if (!guid_to_string_buff(gid, guid_str))
+ if (!guid_to_string_buff (gid, guid_str))
{
- PERR("guid_to_string_buff failed\n");
+ PERR ("guid_to_string_buff failed\n");
return NULL;
}
- xmlNodeAddContent(ret, BAD_CAST guid_str);
+ xmlNodeAddContent (ret, BAD_CAST guid_str);
return ret;
}
xmlNodePtr
-commodity_ref_to_dom_tree(const char *tag, const gnc_commodity *c)
+commodity_ref_to_dom_tree (const char* tag, const gnc_commodity* c)
{
xmlNodePtr ret;
- gchar *name_space, *mnemonic;
+ gchar* name_space, *mnemonic;
- g_return_val_if_fail(c, NULL);
+ g_return_val_if_fail (c, NULL);
- ret = xmlNewNode(NULL, BAD_CAST tag);
+ ret = xmlNewNode (NULL, BAD_CAST tag);
- if (!gnc_commodity_get_namespace(c) || !gnc_commodity_get_mnemonic(c))
+ if (!gnc_commodity_get_namespace (c) || !gnc_commodity_get_mnemonic (c))
{
return NULL;
}
- name_space = g_strdup (gnc_commodity_get_namespace_compat(c));
- mnemonic = g_strdup (gnc_commodity_get_mnemonic(c));
- xmlNewTextChild(ret, NULL, BAD_CAST "cmdty:space",
- checked_char_cast (name_space));
- xmlNewTextChild(ret, NULL, BAD_CAST "cmdty:id",
- checked_char_cast (mnemonic));
+ name_space = g_strdup (gnc_commodity_get_namespace_compat (c));
+ mnemonic = g_strdup (gnc_commodity_get_mnemonic (c));
+ xmlNewTextChild (ret, NULL, BAD_CAST "cmdty:space",
+ checked_char_cast (name_space));
+ xmlNewTextChild (ret, NULL, BAD_CAST "cmdty:id",
+ checked_char_cast (mnemonic));
g_free (name_space);
g_free (mnemonic);
return ret;
}
-char *
-timespec_sec_to_string(const Timespec *ts)
+char*
+timespec_sec_to_string (const Timespec* ts)
{
- return gnc_print_time64(ts->tv_sec, "%Y-%m-%d %H:%M:%S %q");
+ return gnc_print_time64 (ts->tv_sec, "%Y-%m-%d %H:%M:%S %q");
}
-gchar *
-timespec_nsec_to_string(const Timespec *ts)
+gchar*
+timespec_nsec_to_string (const Timespec* ts)
{
- return g_strdup_printf("%ld", ts->tv_nsec);
+ return g_strdup_printf ("%ld", ts->tv_nsec);
}
xmlNodePtr
-timespec_to_dom_tree(const char *tag, const Timespec *spec)
+timespec_to_dom_tree (const char* tag, const Timespec* spec)
{
xmlNodePtr ret;
- gchar *date_str = NULL;
- gchar *ns_str = NULL;
+ gchar* date_str = NULL;
+ gchar* ns_str = NULL;
- g_return_val_if_fail(spec, NULL);
+ g_return_val_if_fail (spec, NULL);
- date_str = timespec_sec_to_string(spec);
+ date_str = timespec_sec_to_string (spec);
if (!date_str)
{
return NULL;
}
- ret = xmlNewNode(NULL, BAD_CAST tag);
+ ret = xmlNewNode (NULL, BAD_CAST tag);
- xmlNewTextChild(ret, NULL, BAD_CAST "ts:date",
- checked_char_cast (date_str));
+ xmlNewTextChild (ret, NULL, BAD_CAST "ts:date",
+ checked_char_cast (date_str));
if (spec->tv_nsec > 0)
{
- ns_str = timespec_nsec_to_string(spec);
+ ns_str = timespec_nsec_to_string (spec);
if (ns_str)
{
- xmlNewTextChild(ret, NULL, BAD_CAST "ts:ns",
- checked_char_cast (ns_str));
+ xmlNewTextChild (ret, NULL, BAD_CAST "ts:ns",
+ checked_char_cast (ns_str));
}
}
- g_free(date_str);
+ g_free (date_str);
if (ns_str)
{
- g_free(ns_str);
+ g_free (ns_str);
}
return ret;
}
xmlNodePtr
-gdate_to_dom_tree(const char *tag, const GDate *date)
+gdate_to_dom_tree (const char* tag, const GDate* date)
{
xmlNodePtr ret;
- gchar *date_str = NULL;
+ gchar* date_str = NULL;
- g_return_val_if_fail(date, NULL);
- date_str = g_new( gchar, 512 );
+ g_return_val_if_fail (date, NULL);
+ date_str = g_new (gchar, 512);
- g_date_strftime( date_str, 512, "%Y-%m-%d", date );
+ g_date_strftime (date_str, 512, "%Y-%m-%d", date);
- ret = xmlNewNode(NULL, BAD_CAST tag);
+ ret = xmlNewNode (NULL, BAD_CAST tag);
- xmlNewTextChild(ret, NULL, BAD_CAST "gdate", checked_char_cast (date_str));
+ xmlNewTextChild (ret, NULL, BAD_CAST "gdate", checked_char_cast (date_str));
- g_free(date_str);
+ g_free (date_str);
return ret;
}
xmlNodePtr
-gnc_numeric_to_dom_tree(const char *tag, const gnc_numeric *num)
+gnc_numeric_to_dom_tree (const char* tag, const gnc_numeric* num)
{
xmlNodePtr ret;
- gchar *numstr;
+ gchar* numstr;
- g_return_val_if_fail(num, NULL);
+ g_return_val_if_fail (num, NULL);
- numstr = gnc_numeric_to_string(*num);
- g_return_val_if_fail(numstr, NULL);
+ numstr = gnc_numeric_to_string (*num);
+ g_return_val_if_fail (numstr, NULL);
- ret = xmlNewNode(NULL, BAD_CAST tag);
+ ret = xmlNewNode (NULL, BAD_CAST tag);
- xmlNodeAddContent(ret, checked_char_cast (numstr));
+ xmlNodeAddContent (ret, checked_char_cast (numstr));
- g_free(numstr);
+ g_free (numstr);
return ret;
}
gchar*
-double_to_string(double value)
+double_to_string (double value)
{
- gchar *numstr;
+ gchar* numstr;
numstr = g_strdup_printf ("%24.18g", value);
if (!numstr)
@@ -236,36 +236,36 @@ double_to_string(double value)
}
else
{
- return g_strstrip(numstr);
+ return g_strstrip (numstr);
}
}
static void
-add_text_to_node(xmlNodePtr node, const gchar *type, gchar *val)
+add_text_to_node (xmlNodePtr node, const gchar* type, gchar* val)
{
- gchar *newtype = g_strdup (type);
- gchar *newval = g_strdup (val);
- xmlSetProp(node, BAD_CAST "type", BAD_CAST type);
- xmlNodeSetContent(node, checked_char_cast (val));
+ gchar* newtype = g_strdup (type);
+ gchar* newval = g_strdup (val);
+ xmlSetProp (node, BAD_CAST "type", BAD_CAST type);
+ xmlNodeSetContent (node, checked_char_cast (val));
g_free (newtype);
- g_free(newval);
+ g_free (newval);
}
-static void add_kvp_slot(const char * key, KvpValue* value, void* data);
+static void add_kvp_slot (const char* key, KvpValue* value, void* data);
static void
-add_kvp_value_node(xmlNodePtr node, const gchar *tag, KvpValue* val)
+add_kvp_value_node (xmlNodePtr node, const gchar* tag, KvpValue* val)
{
xmlNodePtr val_node;
- switch (val->get_type())
+ switch (val->get_type ())
{
case KvpValue::Type::STRING:
{
- auto newstr = g_strdup(val->get<const char*>());
- val_node = xmlNewTextChild(node, NULL, BAD_CAST tag,
- checked_char_cast (newstr));
- g_free (newstr);
+ auto newstr = g_strdup (val->get<const char*> ());
+ val_node = xmlNewTextChild (node, NULL, BAD_CAST tag,
+ checked_char_cast (newstr));
+ g_free (newstr);
break;
}
case KvpValue::Type::TIMESPEC:
@@ -273,99 +273,99 @@ add_kvp_value_node(xmlNodePtr node, const gchar *tag, KvpValue* val)
break;
case KvpValue::Type::GDATE:
{
- auto d = val->get<GDate>();
- val_node = gdate_to_dom_tree(tag, &d);
+ auto d = val->get<GDate> ();
+ val_node = gdate_to_dom_tree (tag, &d);
xmlAddChild (node, val_node);
break;
}
default:
- val_node = xmlNewTextChild(node, NULL, BAD_CAST tag, NULL);
+ val_node = xmlNewTextChild (node, NULL, BAD_CAST tag, NULL);
break;
}
- switch (val->get_type())
+ switch (val->get_type ())
{
case KvpValue::Type::INT64:
- add_text_to_node(val_node, "integer",
- g_strdup_printf("%" G_GINT64_FORMAT,
- val->get<int64_t>()));
+ add_text_to_node (val_node, "integer",
+ g_strdup_printf ("%" G_GINT64_FORMAT,
+ val->get<int64_t> ()));
break;
case KvpValue::Type::DOUBLE:
- add_text_to_node(val_node, "double",
- double_to_string(val->get<double>()));
+ add_text_to_node (val_node, "double",
+ double_to_string (val->get<double> ()));
break;
case KvpValue::Type::NUMERIC:
- add_text_to_node(val_node, "numeric",
- gnc_numeric_to_string(val->get<gnc_numeric>()));
+ add_text_to_node (val_node, "numeric",
+ gnc_numeric_to_string (val->get<gnc_numeric> ()));
break;
case KvpValue::Type::STRING:
- xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "string");
+ xmlSetProp (val_node, BAD_CAST "type", BAD_CAST "string");
break;
case KvpValue::Type::GUID:
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(val->get<GncGUID*>(), guidstr);
- add_text_to_node(val_node, "guid", guidstr);
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (val->get<GncGUID*> (), guidstr);
+ add_text_to_node (val_node, "guid", guidstr);
break;
}
case KvpValue::Type::TIMESPEC:
{
- auto ts = val->get<Timespec>();
+ auto ts = val->get<Timespec> ();
val_node = timespec_to_dom_tree (tag, &ts);
xmlSetProp (val_node, BAD_CAST "type", BAD_CAST "timespec");
xmlAddChild (node, val_node);
break;
}
case KvpValue::Type::GDATE:
- xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "gdate");
+ xmlSetProp (val_node, BAD_CAST "type", BAD_CAST "gdate");
break;
case KvpValue::Type::GLIST:
- xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "list");
- for (auto cursor = val->get<GList*>(); cursor; cursor = cursor->next)
+ xmlSetProp (val_node, BAD_CAST "type", BAD_CAST "list");
+ for (auto cursor = val->get<GList*> (); cursor; cursor = cursor->next)
{
- auto val = static_cast<KvpValue*>(cursor->data);
- add_kvp_value_node(val_node, "slot:value", val);
+ auto val = static_cast<KvpValue*> (cursor->data);
+ add_kvp_value_node (val_node, "slot:value", val);
}
break;
case KvpValue::Type::FRAME:
{
- xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "frame");
+ xmlSetProp (val_node, BAD_CAST "type", BAD_CAST "frame");
- auto frame = val->get<KvpFrame*>();
+ auto frame = val->get<KvpFrame*> ();
if (!frame)
break;
- frame->for_each_slot(add_kvp_slot, static_cast<void*>(val_node));
+ frame->for_each_slot (add_kvp_slot, static_cast<void*> (val_node));
break;
}
default:
- break;
+ break;
}
}
static void
-add_kvp_slot(const char * key, KvpValue* value, void* data)
+add_kvp_slot (const char* key, KvpValue* value, void* data)
{
auto newkey = g_strdup ((gchar*)key);
- auto node = static_cast<xmlNodePtr>(data);
- auto slot_node = xmlNewChild(node, NULL, BAD_CAST "slot", NULL);
+ auto node = static_cast<xmlNodePtr> (data);
+ auto slot_node = xmlNewChild (node, NULL, BAD_CAST "slot", NULL);
- xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:key",
- checked_char_cast (newkey));
+ xmlNewTextChild (slot_node, NULL, BAD_CAST "slot:key",
+ checked_char_cast (newkey));
g_free (newkey);
- add_kvp_value_node(slot_node, "slot:value", value);
+ add_kvp_value_node (slot_node, "slot:value", value);
}
xmlNodePtr
-qof_instance_slots_to_dom_tree(const char *tag, const QofInstance* inst)
+qof_instance_slots_to_dom_tree (const char* tag, const QofInstance* inst)
{
xmlNodePtr ret;
- const char ** keys;
+ const char** keys;
unsigned int i;
- KvpFrame *frame = qof_instance_get_slots(inst);
+ KvpFrame* frame = qof_instance_get_slots (inst);
if (!frame)
return nullptr;
- ret = xmlNewNode(nullptr, BAD_CAST tag);
- frame->for_each_slot(add_kvp_slot, static_cast<void*>(ret));
+ ret = xmlNewNode (nullptr, BAD_CAST tag);
+ frame->for_each_slot (add_kvp_slot, static_cast<void*> (ret));
return ret;
}
diff --git a/src/backend/xml/sixtp-dom-generators.h b/src/backend/xml/sixtp-dom-generators.h
index 83bca84..b1b0797 100644
--- a/src/backend/xml/sixtp-dom-generators.h
+++ b/src/backend/xml/sixtp-dom-generators.h
@@ -35,21 +35,21 @@ extern "C"
#include "gnc-xml-helper.h"
-xmlNodePtr text_to_dom_tree(const char *tag, const char *str);
-xmlNodePtr int_to_dom_tree(const char *tag, gint64 val);
-xmlNodePtr boolean_to_dom_tree(const char* tag, gboolean val);
-xmlNodePtr guid_to_dom_tree(const char *tag, const GncGUID* gid);
-xmlNodePtr commodity_ref_to_dom_tree(const char *tag, const gnc_commodity *c);
-xmlNodePtr timespec_to_dom_tree(const char *tag, const Timespec *spec);
-gchar * timespec_nsec_to_string(const Timespec *ts);
-gchar * timespec_sec_to_string(const Timespec *ts);
-xmlNodePtr gdate_to_dom_tree(const char *tag, const GDate *spec);
-xmlNodePtr gnc_numeric_to_dom_tree(const char *tag, const gnc_numeric *num);
-xmlNodePtr qof_instance_slots_to_dom_tree(const char *tag,
- const QofInstance *inst);
-xmlNodePtr guint_to_dom_tree(const char *tag, guint an_int);
-xmlNodePtr recurrence_to_dom_tree(const gchar *tag, const Recurrence *r);
+xmlNodePtr text_to_dom_tree (const char* tag, const char* str);
+xmlNodePtr int_to_dom_tree (const char* tag, gint64 val);
+xmlNodePtr boolean_to_dom_tree (const char* tag, gboolean val);
+xmlNodePtr guid_to_dom_tree (const char* tag, const GncGUID* gid);
+xmlNodePtr commodity_ref_to_dom_tree (const char* tag, const gnc_commodity* c);
+xmlNodePtr timespec_to_dom_tree (const char* tag, const Timespec* spec);
+gchar* timespec_nsec_to_string (const Timespec* ts);
+gchar* timespec_sec_to_string (const Timespec* ts);
+xmlNodePtr gdate_to_dom_tree (const char* tag, const GDate* spec);
+xmlNodePtr gnc_numeric_to_dom_tree (const char* tag, const gnc_numeric* num);
+xmlNodePtr qof_instance_slots_to_dom_tree (const char* tag,
+ const QofInstance* inst);
+xmlNodePtr guint_to_dom_tree (const char* tag, guint an_int);
+xmlNodePtr recurrence_to_dom_tree (const gchar* tag, const Recurrence* r);
-gchar* double_to_string(double value);
+gchar* double_to_string (double value);
#endif /* _SIXTP_DOM_GENERATORS_H_ */
diff --git a/src/backend/xml/sixtp-dom-parsers.cpp b/src/backend/xml/sixtp-dom-parsers.cpp
index 14a15fd..7f1b93c 100644
--- a/src/backend/xml/sixtp-dom-parsers.cpp
+++ b/src/backend/xml/sixtp-dom-parsers.cpp
@@ -38,44 +38,44 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
GncGUID*
-dom_tree_to_guid(xmlNodePtr node)
+dom_tree_to_guid (xmlNodePtr node)
{
if (!node->properties)
{
return NULL;
}
- if (strcmp((char*) node->properties->name, "type") != 0)
+ if (strcmp ((char*) node->properties->name, "type") != 0)
{
- PERR("Unknown attribute for id tag: %s",
- node->properties->name ?
- (char *) node->properties->name : "(null)");
+ PERR ("Unknown attribute for id tag: %s",
+ node->properties->name ?
+ (char*) node->properties->name : "(null)");
return NULL;
}
{
- char *type;
+ char* type;
type = (char*)xmlNodeGetContent (node->properties->xmlAttrPropertyValue);
/* handle new and guid the same for the moment */
- if ((g_strcmp0("guid", type) == 0) || (g_strcmp0("new", type) == 0))
+ if ((g_strcmp0 ("guid", type) == 0) || (g_strcmp0 ("new", type) == 0))
{
- auto gid = guid_new();
- char *guid_str;
+ auto gid = guid_new ();
+ char* guid_str;
guid_str = (char*)xmlNodeGetContent (node->xmlChildrenNode);
- string_to_guid(guid_str, gid);
+ string_to_guid (guid_str, gid);
xmlFree (guid_str);
xmlFree (type);
return gid;
}
else
{
- PERR("Unknown type %s for attribute type for tag %s",
- type ? type : "(null)",
- node->properties->name ?
- (char *) node->properties->name : "(null)");
+ PERR ("Unknown type %s for attribute type for tag %s",
+ type ? type : "(null)",
+ node->properties->name ?
+ (char*) node->properties->name : "(null)");
xmlFree (type);
return NULL;
}
@@ -83,32 +83,32 @@ dom_tree_to_guid(xmlNodePtr node)
}
static KvpValue*
-dom_tree_to_integer_kvp_value(xmlNodePtr node)
+dom_tree_to_integer_kvp_value (xmlNodePtr node)
{
- gchar *text;
+ gchar* text;
gint64 daint;
KvpValue* ret = NULL;
- text = dom_tree_to_text(node);
+ text = dom_tree_to_text (node);
- if (string_to_gint64(text, &daint))
+ if (string_to_gint64 (text, &daint))
{
- ret = new KvpValue{daint};
+ ret = new KvpValue {daint};
}
- g_free(text);
+ g_free (text);
return ret;
}
gboolean
-dom_tree_to_integer(xmlNodePtr node, gint64 *daint)
+dom_tree_to_integer (xmlNodePtr node, gint64* daint)
{
- gchar *text;
+ gchar* text;
gboolean ret;
- text = dom_tree_to_text(node);
+ text = dom_tree_to_text (node);
- ret = string_to_gint64(text, daint);
+ ret = string_to_gint64 (text, daint);
g_free (text);
@@ -116,44 +116,44 @@ dom_tree_to_integer(xmlNodePtr node, gint64 *daint)
}
gboolean
-dom_tree_to_guint16(xmlNodePtr node, guint16 *i)
+dom_tree_to_guint16 (xmlNodePtr node, guint16* i)
{
gboolean ret;
guint j = 0;
- ret = dom_tree_to_guint(node, &j);
+ ret = dom_tree_to_guint (node, &j);
*i = (guint16) j;
return ret;
}
gboolean
-dom_tree_to_guint(xmlNodePtr node, guint *i)
+dom_tree_to_guint (xmlNodePtr node, guint* i)
{
- gchar *text, *endptr;
+ gchar* text, *endptr;
gboolean ret;
- text = dom_tree_to_text(node);
+ text = dom_tree_to_text (node);
/* In spite of the strange string_to_gint64 function, I'm just
going to use strtoul here until someone shows me the error of
my ways. -CAS */
- *i = (guint) strtoul(text, &endptr, 0);
+ *i = (guint) strtoul (text, &endptr, 0);
ret = (endptr != text);
- g_free(text);
+ g_free (text);
return ret;
}
gboolean
-dom_tree_to_boolean(xmlNodePtr node, gboolean* b)
+dom_tree_to_boolean (xmlNodePtr node, gboolean* b)
{
gchar* text;
- text = dom_tree_to_text(node);
- if (g_ascii_strncasecmp(text, "true", 4) == 0)
+ text = dom_tree_to_text (node);
+ if (g_ascii_strncasecmp (text, "true", 4) == 0)
{
*b = TRUE;
return TRUE;
}
- else if (g_ascii_strncasecmp(text, "false", 5) == 0)
+ else if (g_ascii_strncasecmp (text, "false", 5) == 0)
{
*b = FALSE;
return TRUE;
@@ -166,67 +166,67 @@ dom_tree_to_boolean(xmlNodePtr node, gboolean* b)
}
static KvpValue*
-dom_tree_to_double_kvp_value(xmlNodePtr node)
+dom_tree_to_double_kvp_value (xmlNodePtr node)
{
- gchar *text;
+ gchar* text;
double dadoub;
- KvpValue *ret = NULL;
+ KvpValue* ret = NULL;
- text = dom_tree_to_text(node);
+ text = dom_tree_to_text (node);
- if (string_to_double(text, &dadoub))
+ if (string_to_double (text, &dadoub))
{
- ret = new KvpValue{dadoub};
+ ret = new KvpValue {dadoub};
}
- g_free(text);
+ g_free (text);
return ret;
}
static KvpValue*
-dom_tree_to_numeric_kvp_value(xmlNodePtr node)
+dom_tree_to_numeric_kvp_value (xmlNodePtr node)
{
- gnc_numeric *danum;
- KvpValue *ret = NULL;
+ gnc_numeric* danum;
+ KvpValue* ret = NULL;
- danum = dom_tree_to_gnc_numeric(node);
+ danum = dom_tree_to_gnc_numeric (node);
if (danum)
{
- ret = new KvpValue{*danum};
+ ret = new KvpValue {*danum};
}
- g_free(danum);
+ g_free (danum);
return ret;
}
static KvpValue*
-dom_tree_to_string_kvp_value(xmlNodePtr node)
+dom_tree_to_string_kvp_value (xmlNodePtr node)
{
- gchar *datext;
- KvpValue *ret = NULL;
+ gchar* datext;
+ KvpValue* ret = NULL;
- datext = dom_tree_to_text(node);
+ datext = dom_tree_to_text (node);
if (datext)
{
- ret = new KvpValue{datext};
+ ret = new KvpValue {datext};
}
return ret;
}
static KvpValue*
-dom_tree_to_guid_kvp_value(xmlNodePtr node)
+dom_tree_to_guid_kvp_value (xmlNodePtr node)
{
- GncGUID *daguid;
- KvpValue *ret = NULL;
+ GncGUID* daguid;
+ KvpValue* ret = NULL;
- daguid = dom_tree_to_guid(node);
+ daguid = dom_tree_to_guid (node);
if (daguid)
{
- ret = new KvpValue{daguid};
+ ret = new KvpValue {daguid};
}
return ret;
@@ -236,50 +236,50 @@ static KvpValue*
dom_tree_to_timespec_kvp_value (xmlNodePtr node)
{
Timespec ts;
- KvpValue * ret = nullptr;
+ KvpValue* ret = nullptr;
ts = dom_tree_to_timespec (node);
- ret = new KvpValue{ts};
+ ret = new KvpValue {ts};
return ret;
}
static KvpValue*
dom_tree_to_gdate_kvp_value (xmlNodePtr node)
{
- GDate *date;
- KvpValue *ret = NULL;
+ GDate* date;
+ KvpValue* ret = NULL;
- date = dom_tree_to_gdate(node);
+ date = dom_tree_to_gdate (node);
if (date)
{
- ret = new KvpValue{*date};
+ ret = new KvpValue {*date};
}
- g_free(date);
+ g_free (date);
return ret;
}
gboolean
-string_to_binary(const gchar *str, void **v, guint64 *data_len)
+string_to_binary (const gchar* str, void** v, guint64* data_len)
{
guint64 str_len;
- guchar *data;
+ guchar* data;
unsigned int i, j;
- g_return_val_if_fail(v != NULL, FALSE);
- g_return_val_if_fail(data_len != NULL, FALSE);
+ g_return_val_if_fail (v != NULL, FALSE);
+ g_return_val_if_fail (data_len != NULL, FALSE);
- str_len = strlen(str);
+ str_len = strlen (str);
/* Since no whitespace is allowed and hex encoding is 2 text chars
per binary char, the result must be half the input size and the
input size must be even. */
if ((str_len % 2) != 0)
- return(FALSE);
+ return (FALSE);
*data_len = str_len / 2;
- data = g_new0(guchar, *data_len);
+ data = g_new0 (guchar, *data_len);
for (j = 0, i = 0; i < str_len; i += 2, j++)
{
@@ -290,57 +290,57 @@ string_to_binary(const gchar *str, void **v, guint64 *data_len)
tmpstr[1] = str[i + 1];
tmpstr[2] = '\0';
- converted = strtol(tmpstr, NULL, 16);
+ converted = strtol (tmpstr, NULL, 16);
data[j] = (unsigned char)converted;
}
*v = data;
- return(TRUE);
+ return (TRUE);
}
-static KvpValue* dom_tree_to_kvp_value(xmlNodePtr node);
+static KvpValue* dom_tree_to_kvp_value (xmlNodePtr node);
//needed for test access as well as internal use.
-KvpFrame* dom_tree_to_kvp_frame(xmlNodePtr node);
+KvpFrame* dom_tree_to_kvp_frame (xmlNodePtr node);
static KvpValue*
-dom_tree_to_list_kvp_value(xmlNodePtr node)
+dom_tree_to_list_kvp_value (xmlNodePtr node)
{
- GList *list = NULL;
+ GList* list = NULL;
xmlNodePtr mark;
- KvpValue *ret = NULL;
+ KvpValue* ret = NULL;
for (mark = node->xmlChildrenNode; mark; mark = mark->next)
{
- KvpValue *new_val;
+ KvpValue* new_val;
if (g_strcmp0 ((char*)mark->name, "text") == 0)
continue;
- new_val = dom_tree_to_kvp_value(mark);
+ new_val = dom_tree_to_kvp_value (mark);
if (new_val)
{
- list = g_list_append(list, (gpointer)new_val);
+ list = g_list_append (list, (gpointer)new_val);
}
}
- ret = new KvpValue{list};
+ ret = new KvpValue {list};
return ret;
}
static KvpValue*
-dom_tree_to_frame_kvp_value(xmlNodePtr node)
+dom_tree_to_frame_kvp_value (xmlNodePtr node)
{
- KvpFrame *frame;
- KvpValue *ret = NULL;
+ KvpFrame* frame;
+ KvpValue* ret = NULL;
- frame = dom_tree_to_kvp_frame(node);
+ frame = dom_tree_to_kvp_frame (node);
if (frame)
{
- ret = new KvpValue{frame};
+ ret = new KvpValue {frame};
}
return ret;
@@ -349,8 +349,8 @@ dom_tree_to_frame_kvp_value(xmlNodePtr node)
struct kvp_val_converter
{
- const gchar *tag;
- KvpValue* (*converter)(xmlNodePtr node);
+ const gchar* tag;
+ KvpValue* (*converter) (xmlNodePtr node);
};
struct kvp_val_converter val_converters[] =
@@ -368,14 +368,14 @@ struct kvp_val_converter val_converters[] =
};
static KvpValue*
-dom_tree_to_kvp_value(xmlNodePtr node)
+dom_tree_to_kvp_value (xmlNodePtr node)
{
- xmlChar *xml_type;
- gchar *type;
- struct kvp_val_converter *mark;
- KvpValue *ret = NULL;
+ xmlChar* xml_type;
+ gchar* type;
+ struct kvp_val_converter* mark;
+ KvpValue* ret = NULL;
- xml_type = xmlGetProp(node, BAD_CAST "type");
+ xml_type = xmlGetProp (node, BAD_CAST "type");
if (xml_type)
{
type = g_strdup ((char*) xml_type);
@@ -386,9 +386,9 @@ dom_tree_to_kvp_value(xmlNodePtr node)
for (mark = val_converters; mark->tag; mark++)
{
- if (g_strcmp0(type, mark->tag) == 0)
+ if (g_strcmp0 (type, mark->tag) == 0)
{
- ret = (mark->converter)(node);
+ ret = (mark->converter) (node);
}
}
@@ -397,36 +397,36 @@ dom_tree_to_kvp_value(xmlNodePtr node)
/* FIXME: deal with unknown type tag here */
}
- g_free(type);
+ g_free (type);
return ret;
}
static gboolean
-dom_tree_to_kvp_frame_given(xmlNodePtr node, KvpFrame *frame)
+dom_tree_to_kvp_frame_given (xmlNodePtr node, KvpFrame* frame)
{
xmlNodePtr mark;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(frame, FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (frame, FALSE);
for (mark = node->xmlChildrenNode; mark; mark = mark->next)
{
- if (g_strcmp0((char*)mark->name, "slot") == 0)
+ if (g_strcmp0 ((char*)mark->name, "slot") == 0)
{
xmlNodePtr mark2;
- gchar *key = NULL;
- KvpValue *val = NULL;
+ gchar* key = NULL;
+ KvpValue* val = NULL;
for (mark2 = mark->xmlChildrenNode; mark2; mark2 = mark2->next)
{
- if (g_strcmp0((char*)mark2->name, "slot:key") == 0)
+ if (g_strcmp0 ((char*)mark2->name, "slot:key") == 0)
{
- key = dom_tree_to_text(mark2);
+ key = dom_tree_to_text (mark2);
}
- else if (g_strcmp0((char*)mark2->name, "slot:value") == 0)
+ else if (g_strcmp0 ((char*)mark2->name, "slot:value") == 0)
{
- val = dom_tree_to_kvp_value(mark2);
+ val = dom_tree_to_kvp_value (mark2);
}
else
{
@@ -440,13 +440,13 @@ dom_tree_to_kvp_frame_given(xmlNodePtr node, KvpFrame *frame)
if (val)
{
//We're deleting the old KvpValue returned by replace_nc().
- delete frame->set(key, val);
+ delete frame->set (key, val);
}
else
{
/* FIXME: should put some error here */
}
- g_free(key);
+ g_free (key);
}
}
}
@@ -456,13 +456,13 @@ dom_tree_to_kvp_frame_given(xmlNodePtr node, KvpFrame *frame)
KvpFrame*
-dom_tree_to_kvp_frame(xmlNodePtr node)
+dom_tree_to_kvp_frame (xmlNodePtr node)
{
- g_return_val_if_fail(node, NULL);
+ g_return_val_if_fail (node, NULL);
auto ret = new KvpFrame;
- if (dom_tree_to_kvp_frame_given(node, ret))
+ if (dom_tree_to_kvp_frame_given (node, ret))
return ret;
delete ret;
@@ -470,14 +470,14 @@ dom_tree_to_kvp_frame(xmlNodePtr node)
}
gboolean
-dom_tree_create_instance_slots(xmlNodePtr node, QofInstance *inst)
+dom_tree_create_instance_slots (xmlNodePtr node, QofInstance* inst)
{
- KvpFrame *frame = qof_instance_get_slots(inst);
- return dom_tree_to_kvp_frame_given(node, frame);
+ KvpFrame* frame = qof_instance_get_slots (inst);
+ return dom_tree_to_kvp_frame_given (node, frame);
}
-gchar *
-dom_tree_to_text(xmlNodePtr tree)
+gchar*
+dom_tree_to_text (xmlNodePtr tree)
{
/* Expect *only* text and comment sibling nodes in the given tree --
which actually may only be a "list". i.e. if you're trying to
@@ -488,56 +488,56 @@ dom_tree_to_text(xmlNodePtr tree)
Ignores comment nodes and collapse text nodes into one string.
Returns NULL if expectations are unsatisfied.
*/
- gchar *result;
- gchar *temp;
+ gchar* result;
+ gchar* temp;
- g_return_val_if_fail(tree, NULL);
+ g_return_val_if_fail (tree, NULL);
/* no nodes means it's an empty string text */
if (!tree->xmlChildrenNode)
{
- DEBUG("No children");
- return g_strdup("");
+ DEBUG ("No children");
+ return g_strdup ("");
}
temp = (char*)xmlNodeListGetString (NULL, tree->xmlChildrenNode, TRUE);
if (!temp)
{
- DEBUG("Null string");
+ DEBUG ("Null string");
return NULL;
}
- DEBUG("node string [%s]", (temp == NULL ? "(null)" : temp));
+ DEBUG ("node string [%s]", (temp == NULL ? "(null)" : temp));
result = g_strdup (temp);
xmlFree (temp);
return result;
}
gnc_numeric*
-dom_tree_to_gnc_numeric(xmlNodePtr node)
+dom_tree_to_gnc_numeric (xmlNodePtr node)
{
- gchar *content = dom_tree_to_text(node);
- gnc_numeric *ret;
+ gchar* content = dom_tree_to_text (node);
+ gnc_numeric* ret;
if (!content)
return NULL;
- ret = g_new(gnc_numeric, 1);
+ ret = g_new (gnc_numeric, 1);
- if (string_to_gnc_numeric(content, ret))
+ if (string_to_gnc_numeric (content, ret))
{
- g_free(content);
+ g_free (content);
return ret;
}
else
{
- g_free(content);
- g_free(ret);
+ g_free (content);
+ g_free (ret);
return NULL;
}
}
static inline Timespec
-timespec_failure(Timespec ts)
+timespec_failure (Timespec ts)
{
ts.tv_sec = 0;
ts.tv_nsec = 0;
@@ -546,7 +546,7 @@ timespec_failure(Timespec ts)
Timespec
-dom_tree_to_timespec(xmlNodePtr node)
+dom_tree_to_timespec (xmlNodePtr node)
{
/* Turn something like this
@@ -575,71 +575,71 @@ dom_tree_to_timespec(xmlNodePtr node)
case XML_TEXT_NODE:
break;
case XML_ELEMENT_NODE:
- if (g_strcmp0("ts:date", (char*)n->name) == 0)
+ if (g_strcmp0 ("ts:date", (char*)n->name) == 0)
{
if (seen_s)
{
- return timespec_failure(ret);
+ return timespec_failure (ret);
}
else
{
- gchar *content = dom_tree_to_text(n);
+ gchar* content = dom_tree_to_text (n);
if (!content)
{
- return timespec_failure(ret);
+ return timespec_failure (ret);
}
- if (!string_to_timespec_secs(content, &ret))
+ if (!string_to_timespec_secs (content, &ret))
{
- g_free(content);
- return timespec_failure(ret);
+ g_free (content);
+ return timespec_failure (ret);
}
- g_free(content);
+ g_free (content);
seen_s = TRUE;
}
}
- else if (g_strcmp0("ts:ns", (char*)n->name) == 0)
+ else if (g_strcmp0 ("ts:ns", (char*)n->name) == 0)
{
if (seen_ns)
{
- return timespec_failure(ret);
+ return timespec_failure (ret);
}
else
{
- gchar *content = dom_tree_to_text(n);
+ gchar* content = dom_tree_to_text (n);
if (!content)
{
- return timespec_failure(ret);
+ return timespec_failure (ret);
}
- if (!string_to_timespec_nsecs(content, &ret))
+ if (!string_to_timespec_nsecs (content, &ret))
{
- g_free(content);
- return timespec_failure(ret);
+ g_free (content);
+ return timespec_failure (ret);
}
- g_free(content);
+ g_free (content);
seen_ns = TRUE;
}
}
break;
default:
- PERR("unexpected sub-node.");
- return timespec_failure(ret);
+ PERR ("unexpected sub-node.");
+ return timespec_failure (ret);
break;
}
}
if (!seen_s)
{
- PERR("no ts:date node found.");
- return timespec_failure(ret);
+ PERR ("no ts:date node found.");
+ return timespec_failure (ret);
}
return ret;
}
GDate*
-dom_tree_to_gdate(xmlNodePtr node)
+dom_tree_to_gdate (xmlNodePtr node)
{
/* Turn something like this
@@ -649,12 +649,12 @@ dom_tree_to_gdate(xmlNodePtr node)
into a GDate. If the xml is invalid, returns NULL. */
- GDate *ret;
+ GDate* ret;
gboolean seen_date = FALSE;
xmlNodePtr n;
/* creates an invalid date */
- ret = g_date_new();
+ ret = g_date_new ();
for (n = node->xmlChildrenNode; n; n = n->next)
{
@@ -664,7 +664,7 @@ dom_tree_to_gdate(xmlNodePtr node)
case XML_TEXT_NODE:
break;
case XML_ELEMENT_NODE:
- if (g_strcmp0("gdate", (char*)n->name) == 0)
+ if (g_strcmp0 ("gdate", (char*)n->name) == 0)
{
if (seen_date)
{
@@ -672,51 +672,51 @@ dom_tree_to_gdate(xmlNodePtr node)
}
else
{
- gchar *content = dom_tree_to_text(n);
+ gchar* content = dom_tree_to_text (n);
gint year, month, day;
if (!content)
{
goto failure;
}
- if (sscanf(content, "%d-%d-%d", &year, &month, &day ) != 3)
+ if (sscanf (content, "%d-%d-%d", &year, &month, &day) != 3)
{
- g_free(content);
+ g_free (content);
goto failure;
}
- g_free(content);
+ g_free (content);
seen_date = TRUE;
- g_date_set_dmy( ret, day, static_cast<GDateMonth>(month),
- year );
- if ( !g_date_valid( ret ) )
+ g_date_set_dmy (ret, day, static_cast<GDateMonth> (month),
+ year);
+ if (!g_date_valid (ret))
{
- PWARN("invalid date");
+ PWARN ("invalid date");
goto failure;
}
}
}
break;
default:
- PERR("unexpected sub-node.");
+ PERR ("unexpected sub-node.");
goto failure;
}
}
if (!seen_date)
{
- PWARN("no gdate node found.");
+ PWARN ("no gdate node found.");
goto failure;
}
return ret;
failure:
- g_date_free( ret );
+ g_date_free (ret);
return NULL;
}
-gnc_commodity *
-dom_tree_to_commodity_ref_no_engine(xmlNodePtr node, QofBook *book)
+gnc_commodity*
+dom_tree_to_commodity_ref_no_engine (xmlNodePtr node, QofBook* book)
{
/* Turn something like this
@@ -728,9 +728,9 @@ dom_tree_to_commodity_ref_no_engine(xmlNodePtr node, QofBook *book)
into a gnc_commodity*, returning NULL on failure. Both sub-nodes
are required, though for now, order is irrelevant. */
- gnc_commodity *c = NULL;
- gchar *space_str = NULL;
- gchar *id_str = NULL;
+ gnc_commodity* c = NULL;
+ gchar* space_str = NULL;
+ gchar* id_str = NULL;
xmlNodePtr n;
if (!node) return NULL;
@@ -744,7 +744,7 @@ dom_tree_to_commodity_ref_no_engine(xmlNodePtr node, QofBook *book)
case XML_TEXT_NODE:
break;
case XML_ELEMENT_NODE:
- if (g_strcmp0("cmdty:space", (char*)n->name) == 0)
+ if (g_strcmp0 ("cmdty:space", (char*)n->name) == 0)
{
if (space_str)
{
@@ -752,12 +752,12 @@ dom_tree_to_commodity_ref_no_engine(xmlNodePtr node, QofBook *book)
}
else
{
- gchar *content = dom_tree_to_text(n);
+ gchar* content = dom_tree_to_text (n);
if (!content) return NULL;
space_str = content;
}
}
- else if (g_strcmp0("cmdty:id", (char*)n->name) == 0)
+ else if (g_strcmp0 ("cmdty:id", (char*)n->name) == 0)
{
if (id_str)
{
@@ -765,53 +765,53 @@ dom_tree_to_commodity_ref_no_engine(xmlNodePtr node, QofBook *book)
}
else
{
- gchar *content = dom_tree_to_text(n);
+ gchar* content = dom_tree_to_text (n);
if (!content) return NULL;
id_str = content;
}
}
break;
default:
- PERR("unexpected sub-node.");
+ PERR ("unexpected sub-node.");
return NULL;
break;
}
}
- if (!(space_str && id_str))
+ if (! (space_str && id_str))
{
c = NULL;
}
else
{
- g_strstrip(space_str);
- g_strstrip(id_str);
- c = gnc_commodity_new(book, NULL, space_str, id_str, NULL, 0);
+ g_strstrip (space_str);
+ g_strstrip (id_str);
+ c = gnc_commodity_new (book, NULL, space_str, id_str, NULL, 0);
}
- g_free(space_str);
- g_free(id_str);
+ g_free (space_str);
+ g_free (id_str);
return c;
}
gnc_commodity*
-dom_tree_to_commodity_ref(xmlNodePtr node, QofBook *book)
+dom_tree_to_commodity_ref (xmlNodePtr node, QofBook* book)
{
- gnc_commodity *daref;
- gnc_commodity *ret;
- gnc_commodity_table *table;
+ gnc_commodity* daref;
+ gnc_commodity* ret;
+ gnc_commodity_table* table;
- daref = dom_tree_to_commodity_ref_no_engine(node, book);
+ daref = dom_tree_to_commodity_ref_no_engine (node, book);
table = gnc_commodity_table_get_table (book);
g_return_val_if_fail (table != NULL, NULL);
ret = gnc_commodity_table_lookup (table,
- gnc_commodity_get_namespace(daref),
- gnc_commodity_get_mnemonic(daref));
+ gnc_commodity_get_namespace (daref),
+ gnc_commodity_get_mnemonic (daref));
- gnc_commodity_destroy(daref);
+ gnc_commodity_destroy (daref);
g_return_val_if_fail (ret != NULL, NULL);
@@ -822,7 +822,7 @@ dom_tree_to_commodity_ref(xmlNodePtr node, QofBook *book)
/* generic parser */
static inline void
-dom_tree_handlers_reset(struct dom_tree_handler *handlers)
+dom_tree_handlers_reset (struct dom_tree_handler* handlers)
{
for (; handlers->tag != NULL; handlers++)
{
@@ -831,15 +831,15 @@ dom_tree_handlers_reset(struct dom_tree_handler *handlers)
}
static inline gboolean
-dom_tree_handlers_all_gotten_p(struct dom_tree_handler *handlers)
+dom_tree_handlers_all_gotten_p (struct dom_tree_handler* handlers)
{
gboolean ret = TRUE;
for (; handlers->tag != NULL; handlers++)
{
if (handlers->required && ! handlers->gotten)
{
- PERR("Not defined and it should be: %s",
- handlers->tag ? handlers->tag : "(null)");
+ PERR ("Not defined and it should be: %s",
+ handlers->tag ? handlers->tag : "(null)");
ret = FALSE;
}
}
@@ -848,14 +848,14 @@ dom_tree_handlers_all_gotten_p(struct dom_tree_handler *handlers)
static inline gboolean
-gnc_xml_set_data(const gchar* tag, xmlNodePtr node, gpointer item,
- struct dom_tree_handler *handlers)
+gnc_xml_set_data (const gchar* tag, xmlNodePtr node, gpointer item,
+ struct dom_tree_handler* handlers)
{
for (; handlers->tag != NULL; handlers++)
{
- if (g_strcmp0(tag, handlers->tag) == 0)
+ if (g_strcmp0 (tag, handlers->tag) == 0)
{
- (handlers->handler)(node, item);
+ (handlers->handler) (node, item);
handlers->gotten = TRUE;
break;
}
@@ -863,8 +863,8 @@ gnc_xml_set_data(const gchar* tag, xmlNodePtr node, gpointer item,
if (!handlers->tag)
{
- PERR("Unhandled tag: %s",
- tag ? tag : "(null)");
+ PERR ("Unhandled tag: %s",
+ tag ? tag : "(null)");
return FALSE;
}
@@ -872,13 +872,13 @@ gnc_xml_set_data(const gchar* tag, xmlNodePtr node, gpointer item,
}
gboolean
-dom_tree_generic_parse(xmlNodePtr node, struct dom_tree_handler *handlers,
- gpointer data)
+dom_tree_generic_parse (xmlNodePtr node, struct dom_tree_handler* handlers,
+ gpointer data)
{
xmlNodePtr achild;
gboolean successful = TRUE;
- dom_tree_handlers_reset(handlers);
+ dom_tree_handlers_reset (handlers);
for (achild = node->xmlChildrenNode; achild; achild = achild->next)
{
@@ -886,17 +886,17 @@ dom_tree_generic_parse(xmlNodePtr node, struct dom_tree_handler *handlers,
if (g_strcmp0 ((char*)achild->name, "text") == 0)
continue;
- if (!gnc_xml_set_data((char*)achild->name, achild, data, handlers))
+ if (!gnc_xml_set_data ((char*)achild->name, achild, data, handlers))
{
- PERR("gnc_xml_set_data failed");
+ PERR ("gnc_xml_set_data failed");
successful = FALSE;
continue;
}
}
- if (!dom_tree_handlers_all_gotten_p(handlers))
+ if (!dom_tree_handlers_all_gotten_p (handlers))
{
- PERR("didn't find all of the expected tags in the input");
+ PERR ("didn't find all of the expected tags in the input");
successful = FALSE;
}
@@ -904,13 +904,13 @@ dom_tree_generic_parse(xmlNodePtr node, struct dom_tree_handler *handlers,
}
gboolean
-dom_tree_valid_timespec (Timespec *ts, const xmlChar *name)
+dom_tree_valid_timespec (Timespec* ts, const xmlChar* name)
{
if (ts->tv_sec || ts->tv_nsec)
return TRUE;
- g_warning("Invalid timestamp in data file. Look for a '%s' entry "
- "with a date of 1969-12-31 or 1970-01-01.", name);
+ g_warning ("Invalid timestamp in data file. Look for a '%s' entry "
+ "with a date of 1969-12-31 or 1970-01-01.", name);
return FALSE;
}
diff --git a/src/backend/xml/sixtp-dom-parsers.h b/src/backend/xml/sixtp-dom-parsers.h
index ca4a142..7890bd9 100644
--- a/src/backend/xml/sixtp-dom-parsers.h
+++ b/src/backend/xml/sixtp-dom-parsers.h
@@ -34,37 +34,37 @@ extern "C"
#include "gnc-xml-helper.h"
-GncGUID* dom_tree_to_guid(xmlNodePtr node);
+GncGUID* dom_tree_to_guid (xmlNodePtr node);
-gnc_commodity* dom_tree_to_commodity_ref(xmlNodePtr node, QofBook *book);
-gnc_commodity *dom_tree_to_commodity_ref_no_engine(xmlNodePtr node, QofBook *);
+gnc_commodity* dom_tree_to_commodity_ref (xmlNodePtr node, QofBook* book);
+gnc_commodity* dom_tree_to_commodity_ref_no_engine (xmlNodePtr node, QofBook*);
-GList* dom_tree_freqSpec_to_recurrences(xmlNodePtr node, QofBook *book);
-Recurrence* dom_tree_to_recurrence(xmlNodePtr node);
+GList* dom_tree_freqSpec_to_recurrences (xmlNodePtr node, QofBook* book);
+Recurrence* dom_tree_to_recurrence (xmlNodePtr node);
-Timespec dom_tree_to_timespec(xmlNodePtr node);
-gboolean dom_tree_valid_timespec(Timespec *ts, const xmlChar *name);
-GDate* dom_tree_to_gdate(xmlNodePtr node);
-gnc_numeric* dom_tree_to_gnc_numeric(xmlNodePtr node);
-gchar * dom_tree_to_text(xmlNodePtr tree);
-gboolean string_to_binary(const gchar *str, void **v, guint64 *data_len);
-gboolean dom_tree_create_instance_slots(xmlNodePtr node, QofInstance *inst);
+Timespec dom_tree_to_timespec (xmlNodePtr node);
+gboolean dom_tree_valid_timespec (Timespec* ts, const xmlChar* name);
+GDate* dom_tree_to_gdate (xmlNodePtr node);
+gnc_numeric* dom_tree_to_gnc_numeric (xmlNodePtr node);
+gchar* dom_tree_to_text (xmlNodePtr tree);
+gboolean string_to_binary (const gchar* str, void** v, guint64* data_len);
+gboolean dom_tree_create_instance_slots (xmlNodePtr node, QofInstance* inst);
-gboolean dom_tree_to_integer(xmlNodePtr node, gint64 *daint);
-gboolean dom_tree_to_guint16(xmlNodePtr node, guint16 *i);
-gboolean dom_tree_to_guint(xmlNodePtr node, guint *i);
-gboolean dom_tree_to_boolean(xmlNodePtr node, gboolean* b);
+gboolean dom_tree_to_integer (xmlNodePtr node, gint64* daint);
+gboolean dom_tree_to_guint16 (xmlNodePtr node, guint16* i);
+gboolean dom_tree_to_guint (xmlNodePtr node, guint* i);
+gboolean dom_tree_to_boolean (xmlNodePtr node, gboolean* b);
/* higher level structures */
-Account* dom_tree_to_account(xmlNodePtr node, QofBook *book);
-QofBook* dom_tree_to_book (xmlNodePtr node, QofBook *book);
-GNCLot* dom_tree_to_lot (xmlNodePtr node, QofBook *book);
-Transaction* dom_tree_to_transaction(xmlNodePtr node, QofBook *book);
-GncBudget* dom_tree_to_budget(xmlNodePtr node, QofBook *book);
+Account* dom_tree_to_account (xmlNodePtr node, QofBook* book);
+QofBook* dom_tree_to_book (xmlNodePtr node, QofBook* book);
+GNCLot* dom_tree_to_lot (xmlNodePtr node, QofBook* book);
+Transaction* dom_tree_to_transaction (xmlNodePtr node, QofBook* book);
+GncBudget* dom_tree_to_budget (xmlNodePtr node, QofBook* book);
struct dom_tree_handler
{
- const char *tag;
+ const char* tag;
gboolean (*handler) (xmlNodePtr, gpointer data);
@@ -72,8 +72,8 @@ struct dom_tree_handler
int gotten;
};
-gboolean dom_tree_generic_parse(xmlNodePtr node,
- struct dom_tree_handler *handlers,
- gpointer data);
+gboolean dom_tree_generic_parse (xmlNodePtr node,
+ struct dom_tree_handler* handlers,
+ gpointer data);
#endif /* _SIXTP_DOM_PARSERS_H_ */
diff --git a/src/backend/xml/sixtp-parsers.h b/src/backend/xml/sixtp-parsers.h
index 717d422..47b8075 100644
--- a/src/backend/xml/sixtp-parsers.h
+++ b/src/backend/xml/sixtp-parsers.h
@@ -31,8 +31,8 @@
an pass it in as (don't put anything into parent_data)
you must deal with the xml tree in *result.
*/
-sixtp* sixtp_dom_parser_new(sixtp_end_handler ender,
- sixtp_result_handler cleanup_result_by_default_func,
- sixtp_result_handler cleanup_result_on_fail_func);
+sixtp* sixtp_dom_parser_new (sixtp_end_handler ender,
+ sixtp_result_handler cleanup_result_by_default_func,
+ sixtp_result_handler cleanup_result_on_fail_func);
#endif /* _SIXTP_PARSERS_H_ */
diff --git a/src/backend/xml/sixtp-stack.cpp b/src/backend/xml/sixtp-stack.cpp
index 86ab4f0..4aea535 100644
--- a/src/backend/xml/sixtp-stack.cpp
+++ b/src/backend/xml/sixtp-stack.cpp
@@ -28,27 +28,27 @@ extern "C"
#include "sixtp-stack.h"
void
-sixtp_stack_frame_destroy(sixtp_stack_frame *sf)
+sixtp_stack_frame_destroy (sixtp_stack_frame* sf)
{
- GSList *lp;
+ GSList* lp;
/* cleanup all the child data */
for (lp = sf->data_from_children; lp; lp = lp->next)
{
- sixtp_child_result_destroy((sixtp_child_result *) lp->data);
+ sixtp_child_result_destroy ((sixtp_child_result*) lp->data);
}
- g_slist_free(sf->data_from_children);
+ g_slist_free (sf->data_from_children);
sf->data_from_children = NULL;
- g_free(sf);
+ g_free (sf);
}
sixtp_stack_frame*
-sixtp_stack_frame_new(sixtp* next_parser, char *tag)
+sixtp_stack_frame_new (sixtp* next_parser, char* tag)
{
sixtp_stack_frame* new_frame;
- new_frame = g_new0(sixtp_stack_frame, 1);
+ new_frame = g_new0 (sixtp_stack_frame, 1);
new_frame->parser = next_parser;
new_frame->tag = tag;
new_frame->data_for_children = NULL;
@@ -60,57 +60,57 @@ sixtp_stack_frame_new(sixtp* next_parser, char *tag)
}
void
-sixtp_stack_frame_print(sixtp_stack_frame *sf, gint indent, FILE *f)
+sixtp_stack_frame_print (sixtp_stack_frame* sf, gint indent, FILE* f)
{
- gchar *is = g_strnfill(indent, ' ');
+ gchar* is = g_strnfill (indent, ' ');
- fprintf(f, "%s(stack-frame %p\n", is, sf);
- fprintf(f, "%s (line %d) (col %d)\n", is, sf->line, sf->col );
- fprintf(f, "%s (parser %p)\n", is, sf->parser);
- fprintf(f, "%s (tag %s)\n", is, sf->tag ? sf->tag : "(null)");
- fprintf(f, "%s (data-for-children %p)\n", is,
- sf->data_for_children);
+ fprintf (f, "%s(stack-frame %p\n", is, sf);
+ fprintf (f, "%s (line %d) (col %d)\n", is, sf->line, sf->col);
+ fprintf (f, "%s (parser %p)\n", is, sf->parser);
+ fprintf (f, "%s (tag %s)\n", is, sf->tag ? sf->tag : "(null)");
+ fprintf (f, "%s (data-for-children %p)\n", is,
+ sf->data_for_children);
{
- GSList *lp;
- fprintf(f, "%s (data-from-children", is);
+ GSList* lp;
+ fprintf (f, "%s (data-from-children", is);
for (lp = sf->data_from_children; lp; lp = lp->next)
{
- fputc(' ', f);
- sixtp_child_result_print((sixtp_child_result *) lp->data, f);
+ fputc (' ', f);
+ sixtp_child_result_print ((sixtp_child_result*) lp->data, f);
}
- fprintf(f, ")\n");
+ fprintf (f, ")\n");
}
- fprintf(f, "%s (frame-data %p))\n", is, sf->frame_data);
- fflush(f);
- g_free(is);
+ fprintf (f, "%s (frame-data %p))\n", is, sf->frame_data);
+ fflush (f);
+ g_free (is);
}
GSList*
-sixtp_pop_and_destroy_frame(GSList *frame_stack)
+sixtp_pop_and_destroy_frame (GSList* frame_stack)
{
- sixtp_stack_frame *dead_frame = (sixtp_stack_frame *) frame_stack->data;
+ sixtp_stack_frame* dead_frame = (sixtp_stack_frame*) frame_stack->data;
GSList* result;
- result = g_slist_next(frame_stack);
- sixtp_stack_frame_destroy(dead_frame);
- g_slist_free_1(frame_stack);
- return(result);
+ result = g_slist_next (frame_stack);
+ sixtp_stack_frame_destroy (dead_frame);
+ g_slist_free_1 (frame_stack);
+ return (result);
}
void
-sixtp_print_frame_stack(GSList *stack, FILE *f)
+sixtp_print_frame_stack (GSList* stack, FILE* f)
{
/* first, some debugging output */
- GSList *printcopy = g_slist_reverse(g_slist_copy(stack));
- GSList *lp;
+ GSList* printcopy = g_slist_reverse (g_slist_copy (stack));
+ GSList* lp;
int indent = 0;
for (lp = printcopy; lp; lp = lp->next)
{
- sixtp_stack_frame *frame = (sixtp_stack_frame *) lp->data;
- sixtp_stack_frame_print(frame, indent, f);
+ sixtp_stack_frame* frame = (sixtp_stack_frame*) lp->data;
+ sixtp_stack_frame_print (frame, indent, f);
indent += 2;
}
@@ -119,12 +119,12 @@ sixtp_print_frame_stack(GSList *stack, FILE *f)
/* Parser context */
sixtp_parser_context*
-sixtp_context_new(sixtp *initial_parser, gpointer global_data,
- gpointer top_level_data)
+sixtp_context_new (sixtp* initial_parser, gpointer global_data,
+ gpointer top_level_data)
{
sixtp_parser_context* ret;
- ret = g_new0(sixtp_parser_context, 1);
+ ret = g_new0 (sixtp_parser_context, 1);
ret->handler.startElement = sixtp_sax_start_handler;
ret->handler.endElement = sixtp_sax_end_handler;
@@ -135,24 +135,24 @@ sixtp_context_new(sixtp *initial_parser, gpointer global_data,
ret->data.stack = NULL;
ret->data.global_data = global_data;
- ret->top_frame = sixtp_stack_frame_new(initial_parser, NULL);
+ ret->top_frame = sixtp_stack_frame_new (initial_parser, NULL);
ret->top_frame_data = top_level_data;
- ret->data.stack = g_slist_prepend(ret->data.stack,
- (gpointer) ret->top_frame);
+ ret->data.stack = g_slist_prepend (ret->data.stack,
+ (gpointer) ret->top_frame);
if (initial_parser->start_handler)
{
- if (!initial_parser->start_handler(NULL,
- &ret->top_frame_data,
- &ret->data.global_data,
- &ret->top_frame->data_for_children,
- &ret->top_frame->frame_data,
- NULL, NULL))
+ if (!initial_parser->start_handler (NULL,
+ &ret->top_frame_data,
+ &ret->data.global_data,
+ &ret->top_frame->data_for_children,
+ &ret->top_frame->frame_data,
+ NULL, NULL))
{
- sixtp_handle_catastrophe(&ret->data);
- sixtp_context_destroy(ret);
+ sixtp_handle_catastrophe (&ret->data);
+ sixtp_context_destroy (ret);
return NULL;
}
}
@@ -161,12 +161,12 @@ sixtp_context_new(sixtp *initial_parser, gpointer global_data,
}
void
-sixtp_context_run_end_handler(sixtp_parser_context* ctxt)
+sixtp_context_run_end_handler (sixtp_parser_context* ctxt)
{
if (ctxt->top_frame->parser->end_handler)
{
ctxt->data.parsing_ok &=
- ctxt->top_frame->parser->end_handler(
+ ctxt->top_frame->parser->end_handler (
ctxt->top_frame->data_for_children,
ctxt->top_frame->data_from_children,
NULL,
@@ -178,13 +178,13 @@ sixtp_context_run_end_handler(sixtp_parser_context* ctxt)
}
void
-sixtp_context_destroy(sixtp_parser_context* context)
+sixtp_context_destroy (sixtp_parser_context* context)
{
- sixtp_stack_frame_destroy(context->top_frame);
- g_slist_free(context->data.stack);
+ sixtp_stack_frame_destroy (context->top_frame);
+ g_slist_free (context->data.stack);
context->data.saxParserCtxt->userData = NULL;
context->data.saxParserCtxt->sax = NULL;
- xmlFreeParserCtxt(context->data.saxParserCtxt);
+ xmlFreeParserCtxt (context->data.saxParserCtxt);
context->data.saxParserCtxt = NULL;
- g_free(context);
+ g_free (context);
}
diff --git a/src/backend/xml/sixtp-stack.h b/src/backend/xml/sixtp-stack.h
index bf5e06a..3803afd 100644
--- a/src/backend/xml/sixtp-stack.h
+++ b/src/backend/xml/sixtp-stack.h
@@ -32,10 +32,10 @@ extern "C"
typedef struct sixtp_stack_frame
{
- sixtp *parser;
- gchar *tag;
+ sixtp* parser;
+ gchar* tag;
gpointer data_for_children;
- GSList *data_from_children; /* in reverse chronological order */
+ GSList* data_from_children; /* in reverse chronological order */
gpointer frame_data;
/* Line and column [of the start tag]; set during parsing. */
@@ -47,25 +47,25 @@ struct _sixtp_parser_context_struct
{
xmlSAXHandler handler;
sixtp_sax_data data;
- sixtp_stack_frame *top_frame;
+ sixtp_stack_frame* top_frame;
gpointer top_frame_data;
};
typedef struct _sixtp_parser_context_struct sixtp_parser_context;
-void sixtp_stack_frame_destroy(sixtp_stack_frame *sf);
+void sixtp_stack_frame_destroy (sixtp_stack_frame* sf);
-void sixtp_stack_frame_print(sixtp_stack_frame *sf, gint indent, FILE *f);
+void sixtp_stack_frame_print (sixtp_stack_frame* sf, gint indent, FILE* f);
-GSList* sixtp_pop_and_destroy_frame(GSList *frame_stack);
+GSList* sixtp_pop_and_destroy_frame (GSList* frame_stack);
-void sixtp_print_frame_stack(GSList *stack, FILE *f);
+void sixtp_print_frame_stack (GSList* stack, FILE* f);
-sixtp_stack_frame* sixtp_stack_frame_new(sixtp* next_parser, char *tag);
+sixtp_stack_frame* sixtp_stack_frame_new (sixtp* next_parser, char* tag);
-sixtp_parser_context* sixtp_context_new(sixtp *initial_parser,
- gpointer global_data,
- gpointer top_level_data);
-void sixtp_context_destroy(sixtp_parser_context* context);
-void sixtp_context_run_end_handler(sixtp_parser_context* ctxt);
+sixtp_parser_context* sixtp_context_new (sixtp* initial_parser,
+ gpointer global_data,
+ gpointer top_level_data);
+void sixtp_context_destroy (sixtp_parser_context* context);
+void sixtp_context_run_end_handler (sixtp_parser_context* ctxt);
#endif /* _SIXTP_STACK_H_ */
diff --git a/src/backend/xml/sixtp-to-dom-parser.cpp b/src/backend/xml/sixtp-to-dom-parser.cpp
index 03be767..5404952 100644
--- a/src/backend/xml/sixtp-to-dom-parser.cpp
+++ b/src/backend/xml/sixtp-to-dom-parser.cpp
@@ -37,26 +37,26 @@ static xmlNsPtr global_namespace = NULL;
/* Don't pass anything in the data_for_children value to this
function. It'll cause a segfault */
-static gboolean dom_start_handler(
+static gboolean dom_start_handler (
GSList* sibling_data, gpointer parent_data, gpointer global_data,
- gpointer *data_for_children, gpointer *result, const gchar *tag,
- gchar **attrs)
+ gpointer* data_for_children, gpointer* result, const gchar* tag,
+ gchar** attrs)
{
xmlNodePtr thing;
gchar** atptr = attrs;
if (parent_data == NULL)
{
- thing = xmlNewNode(global_namespace, BAD_CAST tag);
+ thing = xmlNewNode (global_namespace, BAD_CAST tag);
/* only publish the result if we're the parent */
*result = thing;
}
else
{
- thing = xmlNewChild((xmlNodePtr) parent_data,
- global_namespace,
- BAD_CAST tag,
- NULL);
+ thing = xmlNewChild ((xmlNodePtr) parent_data,
+ global_namespace,
+ BAD_CAST tag,
+ NULL);
*result = NULL;
}
*data_for_children = thing;
@@ -65,12 +65,12 @@ static gboolean dom_start_handler(
{
while (*atptr != 0)
{
- gchar *attr0 = g_strdup (atptr[0]);
- gchar *attr1 = g_strdup (atptr[1]);
- xmlSetProp(thing, checked_char_cast (attr0),
- checked_char_cast (attr1));
- g_free (attr0);
- g_free (attr1);
+ gchar* attr0 = g_strdup (atptr[0]);
+ gchar* attr1 = g_strdup (atptr[1]);
+ xmlSetProp (thing, checked_char_cast (attr0),
+ checked_char_cast (attr1));
+ g_free (attr0);
+ g_free (attr1);
atptr += 2;
}
}
@@ -78,42 +78,42 @@ static gboolean dom_start_handler(
}
static void
-dom_fail_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+dom_fail_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
- if (*result) xmlFreeNode(static_cast<xmlNodePtr>(*result));
+ if (*result) xmlFreeNode (static_cast<xmlNodePtr> (*result));
}
-static gboolean dom_chars_handler(
- GSList *sibling_data, gpointer parent_data, gpointer global_data,
- gpointer *result, const char *text, int length)
+static gboolean dom_chars_handler (
+ GSList* sibling_data, gpointer parent_data, gpointer global_data,
+ gpointer* result, const char* text, int length)
{
if (length > 0)
{
- gchar *newtext = g_strdup (text);
- xmlNodeAddContentLen((xmlNodePtr)parent_data,
- checked_char_cast (newtext), length);
- g_free (newtext);
+ gchar* newtext = g_strdup (text);
+ xmlNodeAddContentLen ((xmlNodePtr)parent_data,
+ checked_char_cast (newtext), length);
+ g_free (newtext);
}
return TRUE;
}
-sixtp *
-sixtp_dom_parser_new(sixtp_end_handler ender,
- sixtp_result_handler cleanup_result_by_default_func,
- sixtp_result_handler cleanup_result_on_fail_func)
+sixtp*
+sixtp_dom_parser_new (sixtp_end_handler ender,
+ sixtp_result_handler cleanup_result_by_default_func,
+ sixtp_result_handler cleanup_result_on_fail_func)
{
- sixtp *top_level;
+ sixtp* top_level;
- g_return_val_if_fail(ender, NULL);
+ g_return_val_if_fail (ender, NULL);
- if (!(top_level =
- sixtp_set_any(sixtp_new(), FALSE,
+ if (! (top_level =
+ sixtp_set_any (sixtp_new (), FALSE,
SIXTP_START_HANDLER_ID, dom_start_handler,
SIXTP_CHARACTERS_HANDLER_ID, dom_chars_handler,
SIXTP_END_HANDLER_ID, ender,
@@ -125,17 +125,17 @@ sixtp_dom_parser_new(sixtp_end_handler ender,
if (cleanup_result_by_default_func)
{
- sixtp_set_cleanup_result(top_level, cleanup_result_by_default_func);
+ sixtp_set_cleanup_result (top_level, cleanup_result_by_default_func);
}
if (cleanup_result_by_default_func)
{
- sixtp_set_result_fail(top_level, cleanup_result_on_fail_func);
+ sixtp_set_result_fail (top_level, cleanup_result_on_fail_func);
}
- if (!sixtp_add_sub_parser(top_level, SIXTP_MAGIC_CATCHER, top_level))
+ if (!sixtp_add_sub_parser (top_level, SIXTP_MAGIC_CATCHER, top_level))
{
- sixtp_destroy(top_level);
+ sixtp_destroy (top_level);
return NULL;
}
diff --git a/src/backend/xml/sixtp-utils.cpp b/src/backend/xml/sixtp-utils.cpp
index 63849c8..1b99b6d 100644
--- a/src/backend/xml/sixtp-utils.cpp
+++ b/src/backend/xml/sixtp-utils.cpp
@@ -49,92 +49,92 @@ extern "C"
static QofLogModule log_module = GNC_MOD_IO;
gboolean
-isspace_str(const gchar *str, int nomorethan)
+isspace_str (const gchar* str, int nomorethan)
{
- const gchar *cursor = str;
+ const gchar* cursor = str;
while (*cursor && (nomorethan != 0))
{
- if (!isspace(*cursor))
+ if (!isspace (*cursor))
{
- return(FALSE);
+ return (FALSE);
}
cursor++;
nomorethan--;
}
- return(TRUE);
+ return (TRUE);
}
gboolean
-allow_and_ignore_only_whitespace(GSList *sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const char *text,
- int length)
+allow_and_ignore_only_whitespace (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const char* text,
+ int length)
{
- return(isspace_str(text, length));
+ return (isspace_str (text, length));
}
gboolean
-generic_accumulate_chars(GSList *sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
+generic_accumulate_chars (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
- const char *text,
- int length)
+ const char* text,
+ int length)
{
- gchar *copytxt = g_strndup(text, length);
- g_return_val_if_fail(result, FALSE);
+ gchar* copytxt = g_strndup (text, length);
+ g_return_val_if_fail (result, FALSE);
*result = copytxt;
- return(TRUE);
+ return (TRUE);
}
void
-generic_free_data_for_children(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+generic_free_data_for_children (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
- if (data_for_children) g_free(data_for_children);
+ if (data_for_children) g_free (data_for_children);
}
-gchar *
-concatenate_child_result_chars(GSList *data_from_children)
+gchar*
+concatenate_child_result_chars (GSList* data_from_children)
{
- GSList *lp;
- gchar *name = g_strdup("");
+ GSList* lp;
+ gchar* name = g_strdup ("");
- g_return_val_if_fail(name, NULL);
+ g_return_val_if_fail (name, NULL);
/* child data lists are in reverse chron order */
- data_from_children = g_slist_reverse(g_slist_copy(data_from_children));
+ data_from_children = g_slist_reverse (g_slist_copy (data_from_children));
for (lp = data_from_children; lp; lp = lp->next)
{
- sixtp_child_result *cr = (sixtp_child_result *) lp->data;
+ sixtp_child_result* cr = (sixtp_child_result*) lp->data;
if (cr->type != SIXTP_CHILD_RESULT_CHARS)
{
PERR ("result type is not chars");
g_slist_free (data_from_children);
- g_free(name);
- return(NULL);
+ g_free (name);
+ return (NULL);
}
else
{
- char *temp;
- temp = g_strconcat(name, (gchar *) cr->data, NULL);
+ char* temp;
+ temp = g_strconcat (name, (gchar*) cr->data, NULL);
g_free (name);
name = temp;
}
}
g_slist_free (data_from_children);
- return(name);
+ return (name);
}
/****************************************************************************/
@@ -147,17 +147,17 @@ concatenate_child_result_chars(GSList *data_from_children)
*/
gboolean
-string_to_double(const char *str, double *result)
+string_to_double (const char* str, double* result)
{
- char *endptr = 0x0;
+ char* endptr = 0x0;
- g_return_val_if_fail(str, FALSE);
- g_return_val_if_fail(result, FALSE);
+ g_return_val_if_fail (str, FALSE);
+ g_return_val_if_fail (result, FALSE);
*result = strtod (str, &endptr);
if (endptr == str) return (FALSE);
- return(TRUE);
+ return (TRUE);
}
/*********/
@@ -166,18 +166,18 @@ string_to_double(const char *str, double *result)
/* Maybe there should be a comment here explaining why this function
doesn't call g_ascii_strtoull, because it's not so obvious. -CAS */
gboolean
-string_to_gint64(const gchar *str, gint64 *v)
+string_to_gint64 (const gchar* str, gint64* v)
{
/* convert a string to a gint64. only whitespace allowed before and after. */
long long int v_in;
int num_read;
- g_return_val_if_fail(str, FALSE);
+ g_return_val_if_fail (str, FALSE);
/* must use "<" here because %n's effects aren't well defined */
- if (sscanf(str, " " QOF_SCANF_LLD "%n", &v_in, &num_read) < 1)
+ if (sscanf (str, " " QOF_SCANF_LLD "%n", &v_in, &num_read) < 1)
{
- return(FALSE);
+ return (FALSE);
}
/*
@@ -185,15 +185,15 @@ string_to_gint64(const gchar *str, gint64 *v)
* returns bad values in num_read if there is a space before %n. It
* is fixed in the next release 10.2 afaik
*/
- while ( (*((gchar*)str + num_read) != '\0') &&
- isspace(*((unsigned char*)str + num_read)))
+ while ((* ((gchar*)str + num_read) != '\0') &&
+ isspace (* ((unsigned char*)str + num_read)))
num_read++;
if (v)
*v = v_in;
- if (!isspace_str(str + num_read, -1)) return(FALSE);
- return(TRUE);
+ if (!isspace_str (str + num_read, -1)) return (FALSE);
+ return (TRUE);
}
/*********/
@@ -201,26 +201,26 @@ string_to_gint64(const gchar *str, gint64 *v)
*/
gboolean
-string_to_gint32(const gchar *str, gint32 *v)
+string_to_gint32 (const gchar* str, gint32* v)
{
/* convert a string to a gint32. only whitespace allowed before and after. */
int num_read;
int v_in;
/* must use "<" here because %n's effects aren't well defined */
- if (sscanf(str, " %d%n", &v_in, &num_read) < 1)
+ if (sscanf (str, " %d%n", &v_in, &num_read) < 1)
{
- return(FALSE);
+ return (FALSE);
}
- while ( (*((gchar*)str + num_read) != '\0') &&
- isspace(*((unsigned char*)str + num_read)))
+ while ((* ((gchar*)str + num_read) != '\0') &&
+ isspace (* ((unsigned char*)str + num_read)))
num_read++;
if (v)
*v = v_in;
- if (!isspace_str(str + num_read, -1)) return(FALSE);
- return(TRUE);
+ if (!isspace_str (str + num_read, -1)) return (FALSE);
+ return (TRUE);
}
/************/
@@ -228,33 +228,33 @@ string_to_gint32(const gchar *str, gint32 *v)
*/
gboolean
-hex_string_to_binary(const gchar *str, void **v, guint64 *data_len)
+hex_string_to_binary (const gchar* str, void** v, guint64* data_len)
{
/* Convert a hex string to binary. No whitespace allowed. */
- const gchar *cursor = str;
+ const gchar* cursor = str;
guint64 str_len;
gboolean error = FALSE;
- g_return_val_if_fail(str, FALSE);
- g_return_val_if_fail(v, FALSE);
- g_return_val_if_fail(data_len, FALSE);
+ g_return_val_if_fail (str, FALSE);
+ g_return_val_if_fail (v, FALSE);
+ g_return_val_if_fail (data_len, FALSE);
- str_len = strlen(str);
+ str_len = strlen (str);
/* Since no whitespace is allowed and hex encoding is 2 text chars
per binary char, the result must be half the input size and the
input size must be even. */
- if ((str_len % 2) != 0) return(FALSE);
+ if ((str_len % 2) != 0) return (FALSE);
*data_len = 0;
- *v = g_new0(char, str_len / 2);
+ *v = g_new0 (char, str_len / 2);
- g_return_val_if_fail(*v, FALSE);
+ g_return_val_if_fail (*v, FALSE);
- while (*cursor && *(cursor + 1))
+ while (*cursor && * (cursor + 1))
{
gchar tmpstr[2];
int tmpint;
- if (isspace(*cursor) || isspace(*(cursor + 1)))
+ if (isspace (*cursor) || isspace (* (cursor + 1)))
{
error = TRUE;
}
@@ -262,16 +262,16 @@ hex_string_to_binary(const gchar *str, void **v, guint64 *data_len)
{
int num_read;
tmpstr[0] = *cursor;
- tmpstr[0] = *(cursor + 1);
+ tmpstr[0] = * (cursor + 1);
- if ((sscanf(tmpstr, "%x%n", &tmpint, &num_read) < 1)
- || (num_read != 2))
+ if ((sscanf (tmpstr, "%x%n", &tmpint, &num_read) < 1)
+ || (num_read != 2))
{
error = TRUE;
}
else
{
- *((gchar *) (v + *data_len)) = tmpint;
+ * ((gchar*) (v + *data_len)) = tmpint;
*data_len += 1;
cursor += 2;
}
@@ -280,13 +280,13 @@ hex_string_to_binary(const gchar *str, void **v, guint64 *data_len)
if (error || (*data_len != (str_len / 2)))
{
- g_free(*v);
+ g_free (*v);
*v = NULL;
*data_len = 0;
- return(FALSE);
+ return (FALSE);
}
- return(TRUE);
+ return (TRUE);
}
/***************************************************************************/
@@ -311,28 +311,28 @@ hex_string_to_binary(const gchar *str, void **v, guint64 *data_len)
*/
gboolean
-generic_return_chars_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag)
+generic_return_chars_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag)
{
- gchar *txt = NULL;
+ gchar* txt = NULL;
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
*result = txt;
- return(TRUE);
+ return (TRUE);
}
sixtp*
-simple_chars_only_parser_new(sixtp_end_handler end_handler)
+simple_chars_only_parser_new (sixtp_end_handler end_handler)
{
- return sixtp_set_any(
- sixtp_new(), FALSE,
+ return sixtp_set_any (
+ sixtp_new (), FALSE,
SIXTP_END_HANDLER_ID, (end_handler
? end_handler
: generic_return_chars_end_handler),
@@ -362,17 +362,17 @@ simple_chars_only_parser_new(sixtp_end_handler end_handler)
*/
gboolean
-string_to_timespec_secs(const gchar *str, Timespec *ts)
+string_to_timespec_secs (const gchar* str, Timespec* ts)
{
- *ts = gnc_iso8601_to_timespec_gmt(str);
- return(TRUE);
+ *ts = gnc_iso8601_to_timespec_gmt (str);
+ return (TRUE);
}
gboolean
-string_to_timespec_nsecs(const gchar *str, Timespec *ts)
+string_to_timespec_nsecs (const gchar* str, Timespec* ts)
{
/* We don't do nanoseconds anymore. */
- return(TRUE);
+ return (TRUE);
}
/* Top level timespec node:
@@ -393,15 +393,15 @@ string_to_timespec_nsecs(const gchar *str, Timespec *ts)
*/
gboolean
-generic_timespec_start_handler(GSList* sibling_data, gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children, gpointer *result,
- const gchar *tag, gchar **attrs)
+generic_timespec_start_handler (GSList* sibling_data, gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children, gpointer* result,
+ const gchar* tag, gchar** attrs)
{
- TimespecParseInfo *tsp = g_new0(TimespecParseInfo, 1);
- g_return_val_if_fail(tsp, FALSE);
+ TimespecParseInfo* tsp = g_new0 (TimespecParseInfo, 1);
+ g_return_val_if_fail (tsp, FALSE);
*data_for_children = tsp;
- return(TRUE);
+ return (TRUE);
}
/* You can't use this function directly. You have to call it from
@@ -409,17 +409,17 @@ generic_timespec_start_handler(GSList* sibling_data, gpointer parent_data,
new timespec. Otherwise, you can presume that everything's been
cleaned up properly and return FALSE. */
gboolean
-timespec_parse_ok(TimespecParseInfo *info)
+timespec_parse_ok (TimespecParseInfo* info)
{
if ((info->s_block_count > 1) || (info->ns_block_count > 1) ||
- ((info->s_block_count == 0) && (info->ns_block_count == 0)))
+ ((info->s_block_count == 0) && (info->ns_block_count == 0)))
{
- return(FALSE);
+ return (FALSE);
}
else
{
- return(TRUE);
+ return (TRUE);
}
}
@@ -444,27 +444,27 @@ timespec_parse_ok(TimespecParseInfo *info)
*/
gboolean
-generic_timespec_secs_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+generic_timespec_secs_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- gchar *txt = NULL;
- TimespecParseInfo *info = (TimespecParseInfo *) parent_data;
+ gchar* txt = NULL;
+ TimespecParseInfo* info = (TimespecParseInfo*) parent_data;
gboolean ok;
- g_return_val_if_fail(parent_data, FALSE);
+ g_return_val_if_fail (parent_data, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = string_to_timespec_secs(txt, &(info->ts));
- g_free(txt);
+ ok = string_to_timespec_secs (txt, & (info->ts));
+ g_free (txt);
- g_return_val_if_fail(ok, FALSE);
+ g_return_val_if_fail (ok, FALSE);
info->s_block_count++;
- return(TRUE);
+ return (TRUE);
}
/* <s> (parent timespec-node)
@@ -485,34 +485,34 @@ generic_timespec_secs_end_handler(gpointer data_for_children,
*/
gboolean
-generic_timespec_nsecs_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+generic_timespec_nsecs_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- gchar *txt = NULL;
- TimespecParseInfo *info = (TimespecParseInfo *) parent_data;
+ gchar* txt = NULL;
+ TimespecParseInfo* info = (TimespecParseInfo*) parent_data;
gboolean ok;
- g_return_val_if_fail(parent_data, FALSE);
+ g_return_val_if_fail (parent_data, FALSE);
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- ok = string_to_timespec_nsecs(txt, &(info->ts));
- g_free(txt);
+ ok = string_to_timespec_nsecs (txt, & (info->ts));
+ g_free (txt);
- g_return_val_if_fail(ok, FALSE);
+ g_return_val_if_fail (ok, FALSE);
info->ns_block_count++;
- return(TRUE);
+ return (TRUE);
}
static sixtp*
-timespec_sixtp_new(sixtp_end_handler ender)
+timespec_sixtp_new (sixtp_end_handler ender)
{
- return sixtp_set_any(
- sixtp_new(), FALSE,
+ return sixtp_set_any (
+ sixtp_new (), FALSE,
SIXTP_CHARACTERS_HANDLER_ID, generic_accumulate_chars,
SIXTP_END_HANDLER_ID, ender,
SIXTP_CLEANUP_CHARS_ID, sixtp_child_free_data,
@@ -520,30 +520,30 @@ timespec_sixtp_new(sixtp_end_handler ender)
SIXTP_NO_MORE_HANDLERS);
}
-sixtp *
-generic_timespec_parser_new(sixtp_end_handler end_handler)
+sixtp*
+generic_timespec_parser_new (sixtp_end_handler end_handler)
{
- sixtp *top_level =
- sixtp_set_any(sixtp_new(), FALSE,
- SIXTP_START_HANDLER_ID, generic_timespec_start_handler,
- SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
- SIXTP_END_HANDLER_ID, end_handler,
- SIXTP_CLEANUP_RESULT_ID, sixtp_child_free_data,
- SIXTP_FAIL_HANDLER_ID, generic_free_data_for_children,
- SIXTP_RESULT_FAIL_ID, sixtp_child_free_data,
- SIXTP_NO_MORE_HANDLERS);
- g_return_val_if_fail(top_level, NULL);
-
- if (!sixtp_add_some_sub_parsers(
- top_level, TRUE,
- "s", timespec_sixtp_new(generic_timespec_secs_end_handler),
- "ns", timespec_sixtp_new(generic_timespec_nsecs_end_handler),
- NULL, NULL))
+ sixtp* top_level =
+ sixtp_set_any (sixtp_new (), FALSE,
+ SIXTP_START_HANDLER_ID, generic_timespec_start_handler,
+ SIXTP_CHARACTERS_HANDLER_ID, allow_and_ignore_only_whitespace,
+ SIXTP_END_HANDLER_ID, end_handler,
+ SIXTP_CLEANUP_RESULT_ID, sixtp_child_free_data,
+ SIXTP_FAIL_HANDLER_ID, generic_free_data_for_children,
+ SIXTP_RESULT_FAIL_ID, sixtp_child_free_data,
+ SIXTP_NO_MORE_HANDLERS);
+ g_return_val_if_fail (top_level, NULL);
+
+ if (!sixtp_add_some_sub_parsers (
+ top_level, TRUE,
+ "s", timespec_sixtp_new (generic_timespec_secs_end_handler),
+ "ns", timespec_sixtp_new (generic_timespec_nsecs_end_handler),
+ NULL, NULL))
{
return NULL;
}
- return(top_level);
+ return (top_level);
}
/****************************************************************************/
@@ -568,44 +568,44 @@ generic_timespec_parser_new(sixtp_end_handler end_handler)
*/
gboolean
-generic_guid_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+generic_guid_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- gchar *txt = NULL;
- GncGUID *gid;
+ gchar* txt = NULL;
+ GncGUID* gid;
gboolean ok;
- txt = concatenate_child_result_chars(data_from_children);
- g_return_val_if_fail(txt, FALSE);
+ txt = concatenate_child_result_chars (data_from_children);
+ g_return_val_if_fail (txt, FALSE);
- gid = g_new(GncGUID, 1);
+ gid = g_new (GncGUID, 1);
if (!gid)
{
- g_free(txt);
- return(FALSE);
+ g_free (txt);
+ return (FALSE);
}
- ok = string_to_guid(txt, gid);
- g_free(txt);
+ ok = string_to_guid (txt, gid);
+ g_free (txt);
if (!ok)
{
PERR ("couldn't parse GncGUID");
- g_free(gid);
- return(FALSE);
+ g_free (gid);
+ return (FALSE);
}
*result = gid;
- return(TRUE);
+ return (TRUE);
}
sixtp*
-generic_guid_parser_new(void)
+generic_guid_parser_new (void)
{
- return sixtp_set_any(
- sixtp_new(), FALSE,
+ return sixtp_set_any (
+ sixtp_new (), FALSE,
SIXTP_CHARACTERS_HANDLER_ID, generic_accumulate_chars,
SIXTP_CLEANUP_CHARS_ID, sixtp_child_free_data,
SIXTP_CHARS_FAIL_ID, sixtp_child_free_data,
@@ -637,23 +637,23 @@ generic_guid_parser_new(void)
*/
gboolean
-generic_gnc_numeric_end_handler(gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+generic_gnc_numeric_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
- gnc_numeric *num = NULL;
- gchar *txt = NULL;
+ gnc_numeric* num = NULL;
+ gchar* txt = NULL;
gboolean ok = FALSE;
- txt = concatenate_child_result_chars(data_from_children);
+ txt = concatenate_child_result_chars (data_from_children);
if (txt)
{
- num = g_new(gnc_numeric, 1);
+ num = g_new (gnc_numeric, 1);
if (num)
{
- if (string_to_gnc_numeric(txt, num))
+ if (string_to_gnc_numeric (txt, num))
{
ok = TRUE;
*result = num;
@@ -661,21 +661,21 @@ generic_gnc_numeric_end_handler(gpointer data_for_children,
}
}
- g_free(txt);
+ g_free (txt);
if (!ok)
{
PERR ("couldn't parse numeric quantity");
- g_free(num);
+ g_free (num);
}
- return(ok);
+ return (ok);
}
sixtp*
-generic_gnc_numeric_parser_new(void)
+generic_gnc_numeric_parser_new (void)
{
- return sixtp_set_any(
- sixtp_new(), FALSE,
+ return sixtp_set_any (
+ sixtp_new (), FALSE,
SIXTP_CHARACTERS_HANDLER_ID, generic_accumulate_chars,
SIXTP_CLEANUP_CHARS_ID, sixtp_child_free_data,
SIXTP_CHARS_FAIL_ID, sixtp_child_free_data,
@@ -688,10 +688,10 @@ generic_gnc_numeric_parser_new(void)
/***************************************************************************/
sixtp*
-restore_char_generator(sixtp_end_handler ender)
+restore_char_generator (sixtp_end_handler ender)
{
- return sixtp_set_any(
- sixtp_new(), FALSE,
+ return sixtp_set_any (
+ sixtp_new (), FALSE,
SIXTP_CHARACTERS_HANDLER_ID, generic_accumulate_chars,
SIXTP_END_HANDLER_ID, ender,
SIXTP_CLEANUP_CHARS_ID, sixtp_child_free_data,
diff --git a/src/backend/xml/sixtp-utils.h b/src/backend/xml/sixtp-utils.h
index 88ccfbf..cf3f3c9 100644
--- a/src/backend/xml/sixtp-utils.h
+++ b/src/backend/xml/sixtp-utils.h
@@ -40,95 +40,95 @@ typedef struct
#define TIMESPEC_PARSE_TIME_FORMAT "%Y-%m-%d %H:%M:%S"
#define TIMESPEC_SEC_FORMAT_MAX 256
-gboolean isspace_str(const gchar *str, int nomorethan);
+gboolean isspace_str (const gchar* str, int nomorethan);
-gboolean allow_and_ignore_only_whitespace(GSList *sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const char *text,
- int length);
+gboolean allow_and_ignore_only_whitespace (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const char* text,
+ int length);
-gboolean generic_accumulate_chars(GSList *sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const char *text,
- int length);
+gboolean generic_accumulate_chars (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const char* text,
+ int length);
-void generic_free_data_for_children(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag);
+void generic_free_data_for_children (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag);
-gchar * concatenate_child_result_chars(GSList *data_from_children);
+gchar* concatenate_child_result_chars (GSList* data_from_children);
-gboolean string_to_double(const char *str, double *result);
+gboolean string_to_double (const char* str, double* result);
-gboolean string_to_gint64(const gchar *str, gint64 *v);
+gboolean string_to_gint64 (const gchar* str, gint64* v);
-gboolean string_to_gint32(const gchar *str, gint32 *v);
+gboolean string_to_gint32 (const gchar* str, gint32* v);
-gboolean hex_string_to_binary(const gchar *str, void **v, guint64 *data_len);
+gboolean hex_string_to_binary (const gchar* str, void** v, guint64* data_len);
-gboolean generic_return_chars_end_handler(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag);
+gboolean generic_return_chars_end_handler (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag);
-sixtp* simple_chars_only_parser_new(sixtp_end_handler end_handler);
+sixtp* simple_chars_only_parser_new (sixtp_end_handler end_handler);
-gboolean string_to_timespec_secs(const gchar *str, Timespec *ts);
-gboolean string_to_timespec_nsecs(const gchar *str, Timespec *ts);
+gboolean string_to_timespec_secs (const gchar* str, Timespec* ts);
+gboolean string_to_timespec_nsecs (const gchar* str, Timespec* ts);
-gboolean generic_timespec_start_handler(GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children,
- gpointer *result,
- const gchar *tag, gchar **attrs);
+gboolean generic_timespec_start_handler (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children,
+ gpointer* result,
+ const gchar* tag, gchar** attrs);
-gboolean timespec_parse_ok(TimespecParseInfo *info);
+gboolean timespec_parse_ok (TimespecParseInfo* info);
-gboolean generic_timespec_secs_end_handler(
+gboolean generic_timespec_secs_end_handler (
gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
+ GSList* data_from_children, GSList* sibling_data,
gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag);
+ gpointer* result, const gchar* tag);
-gboolean generic_timespec_nsecs_end_handler(
+gboolean generic_timespec_nsecs_end_handler (
gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
+ GSList* data_from_children, GSList* sibling_data,
gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag);
+ gpointer* result, const gchar* tag);
-sixtp* generic_timespec_parser_new(sixtp_end_handler end_handler);
+sixtp* generic_timespec_parser_new (sixtp_end_handler end_handler);
-gboolean generic_guid_end_handler(
+gboolean generic_guid_end_handler (
gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
+ GSList* data_from_children, GSList* sibling_data,
gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag);
+ gpointer* result, const gchar* tag);
-sixtp* generic_guid_parser_new(void);
+sixtp* generic_guid_parser_new (void);
-gboolean generic_gnc_numeric_end_handler(
+gboolean generic_gnc_numeric_end_handler (
gpointer data_for_children,
- GSList *data_from_children, GSList *sibling_data,
+ GSList* data_from_children, GSList* sibling_data,
gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag);
+ gpointer* result, const gchar* tag);
-sixtp* generic_gnc_numeric_parser_new(void);
+sixtp* generic_gnc_numeric_parser_new (void);
-sixtp* restore_char_generator(sixtp_end_handler ender);
+sixtp* restore_char_generator (sixtp_end_handler ender);
diff --git a/src/backend/xml/sixtp.cpp b/src/backend/xml/sixtp.cpp
index 8886d10..10b4be8 100644
--- a/src/backend/xml/sixtp.cpp
+++ b/src/backend/xml/sixtp.cpp
@@ -32,7 +32,7 @@ extern "C"
#include <stdio.h>
#include <sys/types.h>
#ifdef _MSC_VER
-typedef int ssize_t;
+ typedef int ssize_t;
# define g_fopen fopen
#endif
}
@@ -44,276 +44,276 @@ typedef int ssize_t;
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "gnc.backend.file.sixtp"
-extern const gchar *gnc_v2_xml_version_string; /* see io-gncxml-v2.c */
+extern const gchar* gnc_v2_xml_version_string; /* see io-gncxml-v2.c */
/************************************************************************/
gboolean
-is_child_result_from_node_named(sixtp_child_result *cr, const char *tag)
+is_child_result_from_node_named (sixtp_child_result* cr, const char* tag)
{
- return((cr->type == SIXTP_CHILD_RESULT_NODE)
- &&
- (g_strcmp0(cr->tag, tag) == 0));
+ return ((cr->type == SIXTP_CHILD_RESULT_NODE)
+ &&
+ (g_strcmp0 (cr->tag, tag) == 0));
}
void
-sixtp_child_free_data(sixtp_child_result *result)
+sixtp_child_free_data (sixtp_child_result* result)
{
- if (result->data) g_free(result->data);
+ if (result->data) g_free (result->data);
}
void
-sixtp_child_result_destroy(sixtp_child_result *r)
+sixtp_child_result_destroy (sixtp_child_result* r)
{
if (r->should_cleanup && r->cleanup_handler)
{
- r->cleanup_handler(r);
+ r->cleanup_handler (r);
}
- if (r->type == SIXTP_CHILD_RESULT_NODE) g_free(r->tag);
- g_free(r);
+ if (r->type == SIXTP_CHILD_RESULT_NODE) g_free (r->tag);
+ g_free (r);
}
void
-sixtp_child_result_print(sixtp_child_result *cr, FILE *f)
+sixtp_child_result_print (sixtp_child_result* cr, FILE* f)
{
- fprintf(f, "((tag %s) (data %p))",
- cr->tag ? cr->tag : "(null)",
- cr->data);
+ fprintf (f, "((tag %s) (data %p))",
+ cr->tag ? cr->tag : "(null)",
+ cr->data);
}
/************************************************************************/
void
-sixtp_set_start(sixtp *parser, sixtp_start_handler start_handler)
+sixtp_set_start (sixtp* parser, sixtp_start_handler start_handler)
{
parser->start_handler = start_handler;
}
void
-sixtp_set_before_child(sixtp *parser, sixtp_before_child_handler handler)
+sixtp_set_before_child (sixtp* parser, sixtp_before_child_handler handler)
{
parser->before_child = handler;
}
void
-sixtp_set_after_child(sixtp *parser, sixtp_after_child_handler handler)
+sixtp_set_after_child (sixtp* parser, sixtp_after_child_handler handler)
{
parser->after_child = handler;
}
void
-sixtp_set_end(sixtp *parser, sixtp_end_handler end_handler)
+sixtp_set_end (sixtp* parser, sixtp_end_handler end_handler)
{
parser->end_handler = end_handler;
}
void
-sixtp_set_chars(sixtp *parser, sixtp_characters_handler char_handler)
+sixtp_set_chars (sixtp* parser, sixtp_characters_handler char_handler)
{
parser->characters_handler = char_handler;
}
void
-sixtp_set_cleanup_result(sixtp *parser, sixtp_result_handler handler)
+sixtp_set_cleanup_result (sixtp* parser, sixtp_result_handler handler)
{
parser->cleanup_result = handler;
}
void
-sixtp_set_cleanup_chars(sixtp *parser, sixtp_result_handler handler)
+sixtp_set_cleanup_chars (sixtp* parser, sixtp_result_handler handler)
{
parser->cleanup_chars = handler;
}
void
-sixtp_set_fail(sixtp *parser,
- sixtp_fail_handler handler)
+sixtp_set_fail (sixtp* parser,
+ sixtp_fail_handler handler)
{
parser->fail_handler = handler;
}
void
-sixtp_set_result_fail(sixtp *parser, sixtp_result_handler handler)
+sixtp_set_result_fail (sixtp* parser, sixtp_result_handler handler)
{
parser->result_fail_handler = handler;
}
void
-sixtp_set_chars_fail(sixtp *parser, sixtp_result_handler handler)
+sixtp_set_chars_fail (sixtp* parser, sixtp_result_handler handler)
{
parser->chars_fail_handler = handler;
}
-sixtp *
-sixtp_new(void)
+sixtp*
+sixtp_new (void)
{
- sixtp *s = g_new0(sixtp, 1);
+ sixtp* s = g_new0 (sixtp, 1);
if (s)
{
- s->child_parsers = g_hash_table_new(g_str_hash, g_str_equal);
+ s->child_parsers = g_hash_table_new (g_str_hash, g_str_equal);
if (!s->child_parsers)
{
- g_free(s);
+ g_free (s);
s = NULL;
}
}
- return(s);
+ return (s);
}
sixtp*
-sixtp_set_any(sixtp *tochange, int cleanup, ...)
+sixtp_set_any (sixtp* tochange, int cleanup, ...)
{
va_list ap;
sixtp_handler_type type;
- va_start(ap, cleanup);
+ va_start (ap, cleanup);
if (!tochange)
{
- g_warning("Null tochange passed");
+ g_warning ("Null tochange passed");
return NULL;
}
do
{
- type = static_cast<decltype(type)>(va_arg(ap, int));
+ type = static_cast<decltype (type)> (va_arg (ap, int));
switch (type)
{
case SIXTP_NO_MORE_HANDLERS:
- va_end(ap);
+ va_end (ap);
return tochange;
case SIXTP_START_HANDLER_ID:
- sixtp_set_start(tochange, va_arg(ap, sixtp_start_handler));
+ sixtp_set_start (tochange, va_arg (ap, sixtp_start_handler));
break;
case SIXTP_BEFORE_CHILD_HANDLER_ID:
- sixtp_set_before_child(tochange,
- va_arg(ap, sixtp_before_child_handler));
+ sixtp_set_before_child (tochange,
+ va_arg (ap, sixtp_before_child_handler));
break;
case SIXTP_AFTER_CHILD_HANDLER_ID:
- sixtp_set_after_child(tochange,
- va_arg(ap, sixtp_after_child_handler));
+ sixtp_set_after_child (tochange,
+ va_arg (ap, sixtp_after_child_handler));
break;
case SIXTP_END_HANDLER_ID:
- sixtp_set_end(tochange, va_arg(ap, sixtp_end_handler));
+ sixtp_set_end (tochange, va_arg (ap, sixtp_end_handler));
break;
case SIXTP_CHARACTERS_HANDLER_ID:
- sixtp_set_chars(tochange, va_arg(ap, sixtp_characters_handler));
+ sixtp_set_chars (tochange, va_arg (ap, sixtp_characters_handler));
break;
case SIXTP_FAIL_HANDLER_ID:
- sixtp_set_fail(tochange, va_arg(ap, sixtp_fail_handler));
+ sixtp_set_fail (tochange, va_arg (ap, sixtp_fail_handler));
break;
case SIXTP_CLEANUP_RESULT_ID:
- sixtp_set_cleanup_result(tochange,
- va_arg(ap, sixtp_result_handler));
+ sixtp_set_cleanup_result (tochange,
+ va_arg (ap, sixtp_result_handler));
break;
case SIXTP_CLEANUP_CHARS_ID:
- sixtp_set_cleanup_chars(tochange,
- va_arg(ap, sixtp_result_handler));
+ sixtp_set_cleanup_chars (tochange,
+ va_arg (ap, sixtp_result_handler));
break;
case SIXTP_RESULT_FAIL_ID:
- sixtp_set_result_fail(tochange, va_arg(ap, sixtp_result_handler));
+ sixtp_set_result_fail (tochange, va_arg (ap, sixtp_result_handler));
break;
case SIXTP_CHARS_FAIL_ID:
- sixtp_set_chars_fail(tochange, va_arg(ap, sixtp_result_handler));
+ sixtp_set_chars_fail (tochange, va_arg (ap, sixtp_result_handler));
break;
default:
- va_end(ap);
- g_critical("Bogus sixtp type %d", type);
+ va_end (ap);
+ g_critical ("Bogus sixtp type %d", type);
if (cleanup)
{
- sixtp_destroy(tochange);
+ sixtp_destroy (tochange);
}
return NULL;
}
}
while (1);
- va_end(ap);
+ va_end (ap);
return tochange;
}
-static void sixtp_destroy_child(gpointer key, gpointer value,
- gpointer user_data);
+static void sixtp_destroy_child (gpointer key, gpointer value,
+ gpointer user_data);
static void
-sixtp_destroy_node(sixtp *sp, GHashTable *corpses)
+sixtp_destroy_node (sixtp* sp, GHashTable* corpses)
{
- g_return_if_fail(sp);
- g_return_if_fail(corpses);
- g_hash_table_foreach(sp->child_parsers, sixtp_destroy_child, corpses);
- g_hash_table_destroy(sp->child_parsers);
- g_free(sp);
+ g_return_if_fail (sp);
+ g_return_if_fail (corpses);
+ g_hash_table_foreach (sp->child_parsers, sixtp_destroy_child, corpses);
+ g_hash_table_destroy (sp->child_parsers);
+ g_free (sp);
}
static void
-sixtp_destroy_child(gpointer key, gpointer value, gpointer user_data)
+sixtp_destroy_child (gpointer key, gpointer value, gpointer user_data)
{
- GHashTable *corpses = (GHashTable *) user_data;
- sixtp *child = (sixtp *) value;
+ GHashTable* corpses = (GHashTable*) user_data;
+ sixtp* child = (sixtp*) value;
gpointer lookup_key;
gpointer lookup_value;
- g_debug("Killing sixtp child under key <%s>", key ? (char *) key : "(null)");
- g_free(key);
+ g_debug ("Killing sixtp child under key <%s>", key ? (char*) key : "(null)");
+ g_free (key);
if (!corpses)
{
- g_critical("no corpses in sixtp_destroy_child <%s>",
- key ? (char *) key : "(null)");
+ g_critical ("no corpses in sixtp_destroy_child <%s>",
+ key ? (char*) key : "(null)");
return;
}
if (!child)
{
- g_critical("no child in sixtp_destroy_child <%s>",
- key ? (char *) key : "");
+ g_critical ("no child in sixtp_destroy_child <%s>",
+ key ? (char*) key : "");
return;
}
- if (!g_hash_table_lookup_extended(corpses, (gconstpointer) child,
- &lookup_key, &lookup_value))
+ if (!g_hash_table_lookup_extended (corpses, (gconstpointer) child,
+ &lookup_key, &lookup_value))
{
/* haven't killed this one yet. */
- g_hash_table_insert(corpses, child, (gpointer) 1);
- sixtp_destroy_node(child, corpses);
+ g_hash_table_insert (corpses, child, (gpointer) 1);
+ sixtp_destroy_node (child, corpses);
}
}
void
-sixtp_destroy(sixtp *sp)
+sixtp_destroy (sixtp* sp)
{
- GHashTable *corpses;
- g_return_if_fail(sp);
- corpses = g_hash_table_new(g_direct_hash, g_direct_equal);
- sixtp_destroy_node(sp, corpses);
- g_hash_table_destroy(corpses);
+ GHashTable* corpses;
+ g_return_if_fail (sp);
+ corpses = g_hash_table_new (g_direct_hash, g_direct_equal);
+ sixtp_destroy_node (sp, corpses);
+ g_hash_table_destroy (corpses);
}
/***********************************************************************/
gboolean
-sixtp_add_sub_parser(sixtp *parser, const gchar* tag, sixtp *sub_parser)
+sixtp_add_sub_parser (sixtp* parser, const gchar* tag, sixtp* sub_parser)
{
- g_return_val_if_fail(parser, FALSE);
- g_return_val_if_fail(tag, FALSE);
- g_return_val_if_fail(sub_parser, FALSE);
+ g_return_val_if_fail (parser, FALSE);
+ g_return_val_if_fail (tag, FALSE);
+ g_return_val_if_fail (sub_parser, FALSE);
- g_hash_table_insert(parser->child_parsers,
- g_strdup(tag), (gpointer) sub_parser);
- return(TRUE);
+ g_hash_table_insert (parser->child_parsers,
+ g_strdup (tag), (gpointer) sub_parser);
+ return (TRUE);
}
/*
@@ -321,14 +321,14 @@ sixtp_add_sub_parser(sixtp *parser, const gchar* tag, sixtp *sub_parser)
* cleanup things we haven't looked at on an error condition
*/
sixtp*
-sixtp_add_some_sub_parsers(sixtp *tochange, int cleanup, ...)
+sixtp_add_some_sub_parsers (sixtp* tochange, int cleanup, ...)
{
int have_error;
va_list ap;
- char *tag;
- sixtp *handler;
+ char* tag;
+ sixtp* handler;
- va_start(ap, cleanup);
+ va_start (ap, cleanup);
have_error = 0;
@@ -339,84 +339,84 @@ sixtp_add_some_sub_parsers(sixtp *tochange, int cleanup, ...)
do
{
- tag = va_arg(ap, char*);
+ tag = va_arg (ap, char*);
if (!tag)
{
break;
}
- handler = va_arg(ap, sixtp*);
+ handler = va_arg (ap, sixtp*);
if (!handler)
{
- g_warning("Handler for tag %s is null",
- tag ? tag : "(null)");
+ g_warning ("Handler for tag %s is null",
+ tag ? tag : "(null)");
if (cleanup)
{
- sixtp_destroy(tochange);
+ sixtp_destroy (tochange);
tochange = NULL;
have_error = 1;
}
else
{
- va_end(ap);
+ va_end (ap);
return NULL;
}
}
if (have_error)
{
- sixtp_destroy(handler);
+ sixtp_destroy (handler);
}
else
{
- sixtp_add_sub_parser(tochange, tag, handler);
+ sixtp_add_sub_parser (tochange, tag, handler);
}
}
while (1);
- va_end(ap);
+ va_end (ap);
return tochange;
}
/************************************************************************/
void
-sixtp_sax_start_handler(void *user_data,
- const xmlChar *name,
- const xmlChar **attrs)
-{
- sixtp_sax_data *pdata = (sixtp_sax_data *) user_data;
- sixtp_stack_frame *current_frame = NULL;
- sixtp *current_parser = NULL;
- sixtp *next_parser = NULL;
- gchar *next_parser_tag = NULL;
+sixtp_sax_start_handler (void* user_data,
+ const xmlChar* name,
+ const xmlChar** attrs)
+{
+ sixtp_sax_data* pdata = (sixtp_sax_data*) user_data;
+ sixtp_stack_frame* current_frame = NULL;
+ sixtp* current_parser = NULL;
+ sixtp* next_parser = NULL;
+ gchar* next_parser_tag = NULL;
gboolean lookup_success = FALSE;
- sixtp_stack_frame *new_frame = NULL;
+ sixtp_stack_frame* new_frame = NULL;
- current_frame = (sixtp_stack_frame *) pdata->stack->data;
+ current_frame = (sixtp_stack_frame*) pdata->stack->data;
current_parser = current_frame->parser;
/* Use an extended lookup so we can get *our* copy of the key.
Since we've strduped it, we know its lifetime... */
lookup_success =
- g_hash_table_lookup_extended(current_parser->child_parsers,
- name,
- reinterpret_cast<void**>(&next_parser_tag),
- reinterpret_cast<void**>(&next_parser));
+ g_hash_table_lookup_extended (current_parser->child_parsers,
+ name,
+ reinterpret_cast<void**> (&next_parser_tag),
+ reinterpret_cast<void**> (&next_parser));
if (!lookup_success)
{
/* magic catch all value */
- lookup_success = g_hash_table_lookup_extended(
+ lookup_success = g_hash_table_lookup_extended (
current_parser->child_parsers, SIXTP_MAGIC_CATCHER,
- reinterpret_cast<void**>(&next_parser_tag),
- reinterpret_cast<void**>(&next_parser));
+ reinterpret_cast<void**> (&next_parser_tag),
+ reinterpret_cast<void**> (&next_parser));
if (!lookup_success)
{
- g_critical("Tag <%s> not allowed in current context.",
- name ? (char *) name : "(null)");
+ g_critical ("Tag <%s> not allowed in current context.",
+ name ? (char*) name : "(null)");
pdata->parsing_ok = FALSE;
next_parser = pdata->bad_xml_parser;
}
@@ -424,71 +424,72 @@ sixtp_sax_start_handler(void *user_data,
if (current_frame->parser->before_child)
{
- GSList *parent_data_from_children = NULL;
+ GSList* parent_data_from_children = NULL;
gpointer parent_data_for_children = NULL;
- if (g_slist_length(pdata->stack) > 1)
+ if (g_slist_length (pdata->stack) > 1)
{
/* we're not in the top level node */
- sixtp_stack_frame *parent_frame =
- (sixtp_stack_frame *) pdata->stack->next->data;
- parent_data_from_children = static_cast<decltype(parent_data_from_children)>(parent_frame->data_from_children);
+ sixtp_stack_frame* parent_frame =
+ (sixtp_stack_frame*) pdata->stack->next->data;
+ parent_data_from_children = static_cast<decltype (parent_data_from_children)>
+ (parent_frame->data_from_children);
}
pdata->parsing_ok &=
- current_frame->parser->before_child(current_frame->data_for_children,
- current_frame->data_from_children,
- parent_data_from_children,
- parent_data_for_children,
- pdata->global_data,
- &(current_frame->frame_data),
- current_frame->tag,
- (gchar*) name);
+ current_frame->parser->before_child (current_frame->data_for_children,
+ current_frame->data_from_children,
+ parent_data_from_children,
+ parent_data_for_children,
+ pdata->global_data,
+ & (current_frame->frame_data),
+ current_frame->tag,
+ (gchar*) name);
}
/* now allocate the new stack frame and shift to it */
- new_frame = sixtp_stack_frame_new( next_parser, g_strdup((char*) name));
+ new_frame = sixtp_stack_frame_new (next_parser, g_strdup ((char*) name));
- new_frame->line = xmlSAX2GetLineNumber( pdata->saxParserCtxt );
- new_frame->col = xmlSAX2GetColumnNumber( pdata->saxParserCtxt );
+ new_frame->line = xmlSAX2GetLineNumber (pdata->saxParserCtxt);
+ new_frame->col = xmlSAX2GetColumnNumber (pdata->saxParserCtxt);
- pdata->stack = g_slist_prepend(pdata->stack, (gpointer) new_frame);
+ pdata->stack = g_slist_prepend (pdata->stack, (gpointer) new_frame);
if (next_parser->start_handler)
{
pdata->parsing_ok &=
- next_parser->start_handler(current_frame->data_from_children,
- current_frame->data_for_children,
- pdata->global_data,
- &new_frame->data_for_children,
- &new_frame->frame_data,
- (gchar*) name,
- (gchar**)attrs);
+ next_parser->start_handler (current_frame->data_from_children,
+ current_frame->data_for_children,
+ pdata->global_data,
+ &new_frame->data_for_children,
+ &new_frame->frame_data,
+ (gchar*) name,
+ (gchar**)attrs);
}
}
void
-sixtp_sax_characters_handler(void *user_data, const xmlChar *text, int len)
+sixtp_sax_characters_handler (void* user_data, const xmlChar* text, int len)
{
- sixtp_sax_data *pdata = (sixtp_sax_data *) user_data;
- sixtp_stack_frame *frame;
+ sixtp_sax_data* pdata = (sixtp_sax_data*) user_data;
+ sixtp_stack_frame* frame;
- frame = (sixtp_stack_frame *) pdata->stack->data;
+ frame = (sixtp_stack_frame*) pdata->stack->data;
if (frame->parser->characters_handler)
{
gpointer result = NULL;
pdata->parsing_ok &=
- frame->parser->characters_handler(frame->data_from_children,
- frame->data_for_children,
- pdata->global_data,
- &result,
- (gchar*) text,
- len);
+ frame->parser->characters_handler (frame->data_from_children,
+ frame->data_for_children,
+ pdata->global_data,
+ &result,
+ (gchar*) text,
+ len);
if (pdata->parsing_ok && result)
{
/* push the result onto the current "child" list. */
- sixtp_child_result *child_data = g_new0(sixtp_child_result, 1);
+ sixtp_child_result* child_data = g_new0 (sixtp_child_result, 1);
child_data->type = SIXTP_CHILD_RESULT_CHARS;
child_data->tag = NULL;
@@ -496,38 +497,38 @@ sixtp_sax_characters_handler(void *user_data, const xmlChar *text, int len)
child_data->should_cleanup = TRUE;
child_data->cleanup_handler = frame->parser->cleanup_chars;
child_data->fail_handler = frame->parser->chars_fail_handler;
- frame->data_from_children = g_slist_prepend(frame->data_from_children,
- child_data);
+ frame->data_from_children = g_slist_prepend (frame->data_from_children,
+ child_data);
}
}
}
void
-sixtp_sax_end_handler(void *user_data, const xmlChar *name)
+sixtp_sax_end_handler (void* user_data, const xmlChar* name)
{
- sixtp_sax_data *pdata = (sixtp_sax_data *) user_data;
- sixtp_stack_frame *current_frame;
- sixtp_stack_frame *parent_frame;
- sixtp_child_result *child_result_data = NULL;
- gchar *end_tag = NULL;
+ sixtp_sax_data* pdata = (sixtp_sax_data*) user_data;
+ sixtp_stack_frame* current_frame;
+ sixtp_stack_frame* parent_frame;
+ sixtp_child_result* child_result_data = NULL;
+ gchar* end_tag = NULL;
- current_frame = (sixtp_stack_frame *) pdata->stack->data;
- parent_frame = (sixtp_stack_frame *) pdata->stack->next->data;
+ current_frame = (sixtp_stack_frame*) pdata->stack->data;
+ parent_frame = (sixtp_stack_frame*) pdata->stack->next->data;
/* time to make sure we got the right closing tag. Is this really
necessary? */
- if (g_strcmp0(current_frame->tag, (gchar*) name) != 0)
+ if (g_strcmp0 (current_frame->tag, (gchar*) name) != 0)
{
- g_warning("bad closing tag (start <%s>, end <%s>)", current_frame->tag, name);
+ g_warning ("bad closing tag (start <%s>, end <%s>)", current_frame->tag, name);
pdata->parsing_ok = FALSE;
/* See if we're just off by one and try to recover */
- if (g_strcmp0(parent_frame->tag, (gchar*) name) == 0)
+ if (g_strcmp0 (parent_frame->tag, (gchar*) name) == 0)
{
- pdata->stack = sixtp_pop_and_destroy_frame(pdata->stack);
- current_frame = (sixtp_stack_frame *) pdata->stack->data;
- parent_frame = (sixtp_stack_frame *) pdata->stack->next->data;
- g_warning("found matching start <%s> tag up one level", name);
+ pdata->stack = sixtp_pop_and_destroy_frame (pdata->stack);
+ current_frame = (sixtp_stack_frame*) pdata->stack->data;
+ parent_frame = (sixtp_stack_frame*) pdata->stack->next->data;
+ g_warning ("found matching start <%s> tag up one level", name);
}
}
@@ -535,84 +536,85 @@ sixtp_sax_end_handler(void *user_data, const xmlChar *name)
if (current_frame->parser->end_handler)
{
pdata->parsing_ok &=
- current_frame->parser->end_handler(current_frame->data_for_children,
- current_frame->data_from_children,
- parent_frame->data_from_children,
- parent_frame->data_for_children,
- pdata->global_data,
- ¤t_frame->frame_data,
- current_frame->tag);
+ current_frame->parser->end_handler (current_frame->data_for_children,
+ current_frame->data_from_children,
+ parent_frame->data_from_children,
+ parent_frame->data_for_children,
+ pdata->global_data,
+ ¤t_frame->frame_data,
+ current_frame->tag);
}
if (current_frame->frame_data)
{
/* push the result onto the parent's child result list. */
- child_result_data = g_new(sixtp_child_result, 1);
+ child_result_data = g_new (sixtp_child_result, 1);
child_result_data->type = SIXTP_CHILD_RESULT_NODE;
- child_result_data->tag = g_strdup(current_frame->tag);
+ child_result_data->tag = g_strdup (current_frame->tag);
child_result_data->data = current_frame->frame_data;
child_result_data->should_cleanup = TRUE;
child_result_data->cleanup_handler = current_frame->parser->cleanup_result;
child_result_data->fail_handler =
current_frame->parser->result_fail_handler;
parent_frame->data_from_children =
- g_slist_prepend(parent_frame->data_from_children, child_result_data);
+ g_slist_prepend (parent_frame->data_from_children, child_result_data);
}
/* grab it before it goes away - we own the reference */
end_tag = current_frame->tag;
- g_debug("Finished with end of <%s>", end_tag ? end_tag : "(null)");
+ g_debug ("Finished with end of <%s>", end_tag ? end_tag : "(null)");
/*sixtp_print_frame_stack(pdata->stack, stderr);*/
- pdata->stack = sixtp_pop_and_destroy_frame(pdata->stack);
+ pdata->stack = sixtp_pop_and_destroy_frame (pdata->stack);
/* reset pointer after stack pop */
- current_frame = (sixtp_stack_frame *) pdata->stack->data;
+ current_frame = (sixtp_stack_frame*) pdata->stack->data;
/* reset the parent, checking to see if we're at the top level node */
- parent_frame = (sixtp_stack_frame *)
- ((g_slist_length(pdata->stack) > 1) ? (pdata->stack->next->data) : NULL);
+ parent_frame = (sixtp_stack_frame*)
+ ((g_slist_length (pdata->stack) > 1) ? (pdata->stack->next->data) : NULL);
if (current_frame->parser->after_child)
{
/* reset pointer after stack pop */
- GSList *parent_data_from_children = NULL;
+ GSList* parent_data_from_children = NULL;
gpointer parent_data_for_children = NULL;
if (parent_frame)
{
/* we're not in the top level node */
- sixtp_stack_frame *parent_frame =
- (sixtp_stack_frame *) pdata->stack->next->data;
- parent_data_from_children = static_cast<decltype(parent_data_from_children)>(parent_frame->data_for_children);
+ sixtp_stack_frame* parent_frame =
+ (sixtp_stack_frame*) pdata->stack->next->data;
+ parent_data_from_children = static_cast<decltype (parent_data_from_children)>
+ (parent_frame->data_for_children);
}
pdata->parsing_ok &=
- current_frame->parser->after_child(current_frame->data_for_children,
- current_frame->data_from_children,
- parent_data_from_children,
- parent_data_for_children,
- pdata->global_data,
- &(current_frame->frame_data),
- current_frame->tag,
- end_tag,
- child_result_data);
+ current_frame->parser->after_child (current_frame->data_for_children,
+ current_frame->data_from_children,
+ parent_data_from_children,
+ parent_data_for_children,
+ pdata->global_data,
+ & (current_frame->frame_data),
+ current_frame->tag,
+ end_tag,
+ child_result_data);
}
g_free (end_tag);
}
xmlEntityPtr
-sixtp_sax_get_entity_handler(void *user_data, const xmlChar *name)
+sixtp_sax_get_entity_handler (void* user_data, const xmlChar* name)
{
- return xmlGetPredefinedEntity(name);
+ return xmlGetPredefinedEntity (name);
}
void
-sixtp_handle_catastrophe(sixtp_sax_data *sax_data)
+sixtp_handle_catastrophe (sixtp_sax_data* sax_data)
{
/* Something has gone wrong. To handle it, we have to traverse the
stack, calling, at each level, the frame failure handler (the
@@ -622,20 +624,20 @@ sixtp_handle_catastrophe(sixtp_sax_data *sax_data)
frames are cleaned up in their order on the stack which will be
youngest to oldest. */
- GSList *lp;
- GSList **stack = &(sax_data->stack);
+ GSList* lp;
+ GSList** stack = & (sax_data->stack);
- g_critical("parse failed at:");
- sixtp_print_frame_stack(sax_data->stack, stderr);
+ g_critical ("parse failed at:");
+ sixtp_print_frame_stack (sax_data->stack, stderr);
while (*stack)
{
- sixtp_stack_frame *current_frame = (sixtp_stack_frame *) (*stack)->data;
+ sixtp_stack_frame* current_frame = (sixtp_stack_frame*) (*stack)->data;
/* cleanup the current frame */
if (current_frame->parser->fail_handler)
{
- GSList *sibling_data;
+ GSList* sibling_data;
gpointer parent_data;
if ((*stack)->next == NULL)
@@ -646,28 +648,28 @@ sixtp_handle_catastrophe(sixtp_sax_data *sax_data)
}
else
{
- sixtp_stack_frame *parent_frame =
- (sixtp_stack_frame *) (*stack)->next->data;
+ sixtp_stack_frame* parent_frame =
+ (sixtp_stack_frame*) (*stack)->next->data;
parent_data = parent_frame->data_for_children;
sibling_data = parent_frame->data_from_children;
}
- current_frame->parser->fail_handler(current_frame->data_for_children,
- current_frame->data_from_children,
- sibling_data,
- parent_data,
- sax_data->global_data,
- ¤t_frame->frame_data,
- current_frame->tag);
+ current_frame->parser->fail_handler (current_frame->data_for_children,
+ current_frame->data_from_children,
+ sibling_data,
+ parent_data,
+ sax_data->global_data,
+ ¤t_frame->frame_data,
+ current_frame->tag);
}
/* now cleanup any children's results */
for (lp = current_frame->data_from_children; lp; lp = lp->next)
{
- sixtp_child_result *cresult = (sixtp_child_result *) lp->data;
+ sixtp_child_result* cresult = (sixtp_child_result*) lp->data;
if (cresult->fail_handler)
{
- cresult->fail_handler(cresult);
+ cresult->fail_handler (cresult);
}
}
@@ -678,190 +680,191 @@ sixtp_handle_catastrophe(sixtp_sax_data *sax_data)
break;
}
- *stack = sixtp_pop_and_destroy_frame(*stack);
+ *stack = sixtp_pop_and_destroy_frame (*stack);
}
}
static gboolean
-gnc_bad_xml_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+gnc_bad_xml_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
return TRUE;
}
static gboolean
-sixtp_parse_file_common(sixtp *sixtp,
- xmlParserCtxtPtr xml_context,
- gpointer data_for_top_level,
- gpointer global_data,
- gpointer *parse_result)
+sixtp_parse_file_common (sixtp* sixtp,
+ xmlParserCtxtPtr xml_context,
+ gpointer data_for_top_level,
+ gpointer global_data,
+ gpointer* parse_result)
{
- sixtp_parser_context *ctxt;
+ sixtp_parser_context* ctxt;
int parse_ret;
- if (!(ctxt = sixtp_context_new(sixtp, global_data, data_for_top_level)))
+ if (! (ctxt = sixtp_context_new (sixtp, global_data, data_for_top_level)))
{
- g_critical("sixtp_context_new returned null");
+ g_critical ("sixtp_context_new returned null");
return FALSE;
}
ctxt->data.saxParserCtxt = xml_context;
ctxt->data.saxParserCtxt->sax = &ctxt->handler;
ctxt->data.saxParserCtxt->userData = &ctxt->data;
- ctxt->data.bad_xml_parser = sixtp_dom_parser_new(gnc_bad_xml_end_handler, NULL, NULL);
- parse_ret = xmlParseDocument( ctxt->data.saxParserCtxt );
+ ctxt->data.bad_xml_parser = sixtp_dom_parser_new (gnc_bad_xml_end_handler,
+ NULL, NULL);
+ parse_ret = xmlParseDocument (ctxt->data.saxParserCtxt);
//xmlSAXUserParseFile(&ctxt->handler, &ctxt->data, filename);
- sixtp_context_run_end_handler(ctxt);
+ sixtp_context_run_end_handler (ctxt);
if (parse_ret == 0 && ctxt->data.parsing_ok)
{
if (parse_result)
*parse_result = ctxt->top_frame->frame_data;
- sixtp_context_destroy(ctxt);
+ sixtp_context_destroy (ctxt);
return TRUE;
}
else
{
if (parse_result)
*parse_result = NULL;
- if (g_slist_length(ctxt->data.stack) > 1)
- sixtp_handle_catastrophe(&ctxt->data);
- sixtp_context_destroy(ctxt);
+ if (g_slist_length (ctxt->data.stack) > 1)
+ sixtp_handle_catastrophe (&ctxt->data);
+ sixtp_context_destroy (ctxt);
return FALSE;
}
}
gboolean
-sixtp_parse_file(sixtp *sixtp,
- const char *filename,
- gpointer data_for_top_level,
- gpointer global_data,
- gpointer *parse_result)
+sixtp_parse_file (sixtp* sixtp,
+ const char* filename,
+ gpointer data_for_top_level,
+ gpointer global_data,
+ gpointer* parse_result)
{
gboolean ret;
xmlParserCtxtPtr context;
#ifdef G_OS_WIN32
{
- gchar *conv_name = g_win32_locale_filename_from_utf8(filename);
+ gchar* conv_name = g_win32_locale_filename_from_utf8 (filename);
if (!conv_name)
{
- g_warning("Could not convert '%s' to system codepage", filename);
+ g_warning ("Could not convert '%s' to system codepage", filename);
return FALSE;
}
- context = xmlCreateFileParserCtxt(conv_name);
- g_free(conv_name);
+ context = xmlCreateFileParserCtxt (conv_name);
+ g_free (conv_name);
}
#else
- context = xmlCreateFileParserCtxt(filename);
+ context = xmlCreateFileParserCtxt (filename);
#endif
- ret = sixtp_parse_file_common(sixtp, context, data_for_top_level,
- global_data, parse_result);
+ ret = sixtp_parse_file_common (sixtp, context, data_for_top_level,
+ global_data, parse_result);
return ret;
}
/* Call back function for libxml2 to read from compressed or uncompressed stream */
static int
-sixtp_parser_read(void *context, char *buffer, int len)
+sixtp_parser_read (void* context, char* buffer, int len)
{
int ret;
- ret = fread(&buffer[0], sizeof(char), len, (FILE *) context);
+ ret = fread (&buffer[0], sizeof (char), len, (FILE*) context);
if (ret < 0)
- g_warning("Error reading XML file");
+ g_warning ("Error reading XML file");
return ret;
}
gboolean
-sixtp_parse_fd(sixtp *sixtp,
- FILE *fd,
- gpointer data_for_top_level,
- gpointer global_data,
- gpointer *parse_result)
+sixtp_parse_fd (sixtp* sixtp,
+ FILE* fd,
+ gpointer data_for_top_level,
+ gpointer global_data,
+ gpointer* parse_result)
{
gboolean ret;
- xmlParserCtxtPtr context = xmlCreateIOParserCtxt( NULL, NULL,
- sixtp_parser_read, NULL /*no close */, fd,
- XML_CHAR_ENCODING_NONE);
- ret = sixtp_parse_file_common(sixtp, context, data_for_top_level,
- global_data, parse_result);
+ xmlParserCtxtPtr context = xmlCreateIOParserCtxt (NULL, NULL,
+ sixtp_parser_read, NULL /*no close */, fd,
+ XML_CHAR_ENCODING_NONE);
+ ret = sixtp_parse_file_common (sixtp, context, data_for_top_level,
+ global_data, parse_result);
return ret;
}
gboolean
-sixtp_parse_buffer(sixtp *sixtp,
- char *bufp,
- int bufsz,
- gpointer data_for_top_level,
- gpointer global_data,
- gpointer *parse_result)
+sixtp_parse_buffer (sixtp* sixtp,
+ char* bufp,
+ int bufsz,
+ gpointer data_for_top_level,
+ gpointer global_data,
+ gpointer* parse_result)
{
gboolean ret;
- xmlParserCtxtPtr context = xmlCreateMemoryParserCtxt( bufp, bufsz );
- ret = sixtp_parse_file_common(sixtp, context, data_for_top_level,
- global_data, parse_result);
+ xmlParserCtxtPtr context = xmlCreateMemoryParserCtxt (bufp, bufsz);
+ ret = sixtp_parse_file_common (sixtp, context, data_for_top_level,
+ global_data, parse_result);
return ret;
}
gboolean
-sixtp_parse_push (sixtp *sixtp,
+sixtp_parse_push (sixtp* sixtp,
sixtp_push_handler push_handler,
gpointer push_user_data,
gpointer data_for_top_level,
gpointer global_data,
- gpointer *parse_result)
+ gpointer* parse_result)
{
- sixtp_parser_context *ctxt;
+ sixtp_parser_context* ctxt;
xmlParserCtxtPtr xml_context;
if (!push_handler)
{
- g_critical("No push handler specified");
+ g_critical ("No push handler specified");
return FALSE;
}
- if (!(ctxt = sixtp_context_new(sixtp, global_data, data_for_top_level)))
+ if (! (ctxt = sixtp_context_new (sixtp, global_data, data_for_top_level)))
{
- g_critical("sixtp_context_new returned null");
+ g_critical ("sixtp_context_new returned null");
return FALSE;
}
- xml_context = xmlCreatePushParserCtxt(&ctxt->handler, &ctxt->data,
- NULL, 0, NULL);
+ xml_context = xmlCreatePushParserCtxt (&ctxt->handler, &ctxt->data,
+ NULL, 0, NULL);
ctxt->data.saxParserCtxt = xml_context;
- ctxt->data.bad_xml_parser = sixtp_dom_parser_new(gnc_bad_xml_end_handler,
- NULL, NULL);
+ ctxt->data.bad_xml_parser = sixtp_dom_parser_new (gnc_bad_xml_end_handler,
+ NULL, NULL);
- (*push_handler)(xml_context, push_user_data);
+ (*push_handler) (xml_context, push_user_data);
- sixtp_context_run_end_handler(ctxt);
+ sixtp_context_run_end_handler (ctxt);
if (ctxt->data.parsing_ok)
{
if (parse_result)
*parse_result = ctxt->top_frame->frame_data;
- sixtp_context_destroy(ctxt);
+ sixtp_context_destroy (ctxt);
return TRUE;
}
else
{
if (parse_result)
*parse_result = NULL;
- if (g_slist_length(ctxt->data.stack) > 1)
- sixtp_handle_catastrophe(&ctxt->data);
- sixtp_context_destroy(ctxt);
+ if (g_slist_length (ctxt->data.stack) > 1)
+ sixtp_handle_catastrophe (&ctxt->data);
+ sixtp_context_destroy (ctxt);
return FALSE;
}
}
/***********************************************************************/
static gboolean
-eat_whitespace(char **cursor)
+eat_whitespace (char** cursor)
{
- while (**cursor && isspace(**cursor))
+ while (**cursor && isspace (**cursor))
{
(*cursor)++;
}
@@ -877,9 +880,9 @@ eat_whitespace(char **cursor)
}
static gboolean
-search_for(unsigned char marker, char **cursor)
+search_for (unsigned char marker, char** cursor)
{
- while (**cursor && **cursor != marker)
+ while (**cursor &&** cursor != marker)
{
(*cursor)++;
}
@@ -896,22 +899,22 @@ search_for(unsigned char marker, char **cursor)
}
QofBookFileType
-gnc_is_our_xml_file(const char *filename, gboolean *with_encoding)
+gnc_is_our_xml_file (const char* filename, gboolean* with_encoding)
{
- FILE *f = NULL;
+ FILE* f = NULL;
char first_chunk[256];
ssize_t num_read;
- g_return_val_if_fail(filename, GNC_BOOK_NOT_OURS);
+ g_return_val_if_fail (filename, GNC_BOOK_NOT_OURS);
- f = g_fopen(filename, "r");
+ f = g_fopen (filename, "r");
if (f == NULL)
{
return GNC_BOOK_NOT_OURS;
}
- num_read = fread(first_chunk, sizeof(char), sizeof(first_chunk) - 1, f);
- fclose(f);
+ num_read = fread (first_chunk, sizeof (char), sizeof (first_chunk) - 1, f);
+ fclose (f);
if (num_read == 0)
{
@@ -920,13 +923,13 @@ gnc_is_our_xml_file(const char *filename, gboolean *with_encoding)
first_chunk[num_read] = '\0';
- return gnc_is_our_first_xml_chunk(first_chunk, with_encoding);
+ return gnc_is_our_first_xml_chunk (first_chunk, with_encoding);
}
QofBookFileType
-gnc_is_our_first_xml_chunk(char *chunk, gboolean *with_encoding)
+gnc_is_our_first_xml_chunk (char* chunk, gboolean* with_encoding)
{
- char *cursor = NULL;
+ char* cursor = NULL;
size_t n;
if (with_encoding)
@@ -936,19 +939,19 @@ gnc_is_our_first_xml_chunk(char *chunk, gboolean *with_encoding)
cursor = chunk;
- if (!eat_whitespace(&cursor))
+ if (!eat_whitespace (&cursor))
{
return GNC_BOOK_NOT_OURS;
}
- if (strncmp(cursor, "<?xml", 5) == 0)
+ if (strncmp (cursor, "<?xml", 5) == 0)
{
- if (!search_for('>', &cursor))
+ if (!search_for ('>', &cursor))
{
return GNC_BOOK_NOT_OURS;
}
- if (!eat_whitespace(&cursor))
+ if (!eat_whitespace (&cursor))
{
return GNC_BOOK_NOT_OURS;
}
@@ -958,17 +961,17 @@ gnc_is_our_first_xml_chunk(char *chunk, gboolean *with_encoding)
return GNC_BOOK_NOT_OURS;
}
- n = strlen(gnc_v2_xml_version_string);
- if ((strncmp(cursor + 1, gnc_v2_xml_version_string, n) == 0)
- && isspace(*(cursor + 1 + n)))
+ n = strlen (gnc_v2_xml_version_string);
+ if ((strncmp (cursor + 1, gnc_v2_xml_version_string, n) == 0)
+ && isspace (* (cursor + 1 + n)))
{
if (with_encoding)
{
*cursor = '\0';
cursor = chunk;
- while (search_for('e', &cursor))
+ while (search_for ('e', &cursor))
{
- if (strncmp(cursor, "ncoding=", 8) == 0)
+ if (strncmp (cursor, "ncoding=", 8) == 0)
{
*with_encoding = TRUE;
break;
@@ -978,12 +981,12 @@ gnc_is_our_first_xml_chunk(char *chunk, gboolean *with_encoding)
return GNC_BOOK_XML2_FILE;
}
- if (strncmp(cursor, "<gnc>", strlen("<gnc>")) == 0)
+ if (strncmp (cursor, "<gnc>", strlen ("<gnc>")) == 0)
return GNC_BOOK_XML1_FILE;
/* If it doesn't match any of the above but has '<gnc-v...', it must */
/* be a later version */
- if (strncmp(cursor, "<gnc-v", strlen("<gnc-v")) == 0)
+ if (strncmp (cursor, "<gnc-v", strlen ("<gnc-v")) == 0)
return GNC_BOOK_POST_XML2_0_0_FILE;
return GNC_BOOK_NOT_OURS;
@@ -993,11 +996,11 @@ gnc_is_our_first_xml_chunk(char *chunk, gboolean *with_encoding)
}
void
-sixtp_run_callback(sixtp_gdv2 *data, const char *type)
+sixtp_run_callback (sixtp_gdv2* data, const char* type)
{
if (data->countCallback)
{
- data->countCallback(data, type);
+ data->countCallback (data, type);
}
}
diff --git a/src/backend/xml/sixtp.h b/src/backend/xml/sixtp.h
index 62df636..aca886b 100644
--- a/src/backend/xml/sixtp.h
+++ b/src/backend/xml/sixtp.h
@@ -35,7 +35,7 @@ extern "C"
#include "gnc-backend-xml.h"
typedef struct sixtp_gdv2 sixtp_gdv2;
-typedef void (*countCallbackFn)(sixtp_gdv2 *gd, const char *type);
+typedef void (*countCallbackFn) (sixtp_gdv2* gd, const char* type);
typedef struct
{
@@ -63,7 +63,7 @@ typedef struct
struct sixtp_gdv2
{
- QofBook *book;
+ QofBook* book;
load_counter counter;
countCallbackFn countCallback;
QofBePercentageFunc gui_display_fn;
@@ -71,60 +71,60 @@ struct sixtp_gdv2
};
typedef struct _sixtp_child_result sixtp_child_result;
-typedef gboolean (*sixtp_start_handler)(GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *data_for_children,
- gpointer *result,
- const gchar *tag,
- gchar **attrs);
-
-typedef gboolean (*sixtp_before_child_handler)(gpointer data_for_children,
+typedef gboolean (*sixtp_start_handler) (GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* data_for_children,
+ gpointer* result,
+ const gchar* tag,
+ gchar** attrs);
+
+typedef gboolean (*sixtp_before_child_handler) (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag);
+
+typedef gboolean (*sixtp_after_child_handler) (gpointer data_for_children,
GSList* data_from_children,
GSList* sibling_data,
gpointer parent_data,
gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag);
-
-typedef gboolean (*sixtp_after_child_handler)(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
+ gpointer* result,
+ const gchar* tag,
+ const gchar* child_tag,
+ sixtp_child_result* child_result);
+
+typedef gboolean (*sixtp_end_handler) (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag);
+
+typedef gboolean (*sixtp_characters_handler) (GSList* sibling_data,
gpointer parent_data,
gpointer global_data,
- gpointer *result,
- const gchar *tag,
- const gchar *child_tag,
- sixtp_child_result *child_result);
-
-typedef gboolean (*sixtp_end_handler)(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag);
-
-typedef gboolean (*sixtp_characters_handler)(GSList *sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const char *text,
- int length);
-
-typedef void (*sixtp_result_handler)(sixtp_child_result *result);
-
-typedef void (*sixtp_fail_handler)(gpointer data_for_children,
- GSList* data_from_children,
- GSList* sibling_data,
- gpointer parent_data,
- gpointer global_data,
- gpointer *result,
- const gchar *tag);
-
-typedef void (*sixtp_push_handler)(xmlParserCtxtPtr xml_context,
- gpointer user_data);
+ gpointer* result,
+ const char* text,
+ int length);
+
+typedef void (*sixtp_result_handler) (sixtp_child_result* result);
+
+typedef void (*sixtp_fail_handler) (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data,
+ gpointer parent_data,
+ gpointer global_data,
+ gpointer* result,
+ const gchar* tag);
+
+typedef void (*sixtp_push_handler) (xmlParserCtxtPtr xml_context,
+ gpointer user_data);
typedef struct sixtp
{
@@ -148,7 +148,7 @@ typedef struct sixtp
/* called to cleanup character results when cleaning up this node's
children. */
- GHashTable *child_parsers;
+ GHashTable* child_parsers;
} sixtp;
typedef enum
@@ -183,7 +183,7 @@ typedef enum
struct _sixtp_child_result
{
sixtp_child_result_type type;
- gchar *tag; /* NULL for a CHARS node. */
+ gchar* tag; /* NULL for a CHARS node. */
gpointer data;
gboolean should_cleanup;
sixtp_result_handler cleanup_handler;
@@ -193,80 +193,83 @@ struct _sixtp_child_result
typedef struct sixtp_sax_data
{
gboolean parsing_ok;
- GSList *stack;
+ GSList* stack;
gpointer global_data;
xmlParserCtxtPtr saxParserCtxt;
- sixtp *bad_xml_parser;
+ sixtp* bad_xml_parser;
} sixtp_sax_data;
typedef struct
{
- int version; /* backend version number */
- const char * type_name; /* The XML tag for this type */
-
- sixtp * (*create_parser) (void);
- gboolean (*add_item)(sixtp_gdv2 *, gpointer obj);
- int (*get_count) (QofBook *);
- gboolean (*write) (FILE*, QofBook*);
- void (*scrub) (QofBook *);
- gboolean (*ns) (FILE*);
+ int version; /* backend version number */
+ const char* type_name; /* The XML tag for this type */
+
+ sixtp* (*create_parser) (void);
+ gboolean (*add_item) (sixtp_gdv2*, gpointer obj);
+ int (*get_count) (QofBook*);
+ gboolean (*write) (FILE*, QofBook*);
+ void (*scrub) (QofBook*);
+ gboolean (*ns) (FILE*);
} GncXmlDataType_t;
-gboolean is_child_result_from_node_named(sixtp_child_result *cr,
- const char *tag);
-void sixtp_child_free_data(sixtp_child_result *result);
-void sixtp_child_result_destroy(sixtp_child_result *r);
-void sixtp_child_result_print(sixtp_child_result *cr, FILE *f);
-
-void sixtp_sax_start_handler(void *user_data, const xmlChar *name,
- const xmlChar **attrs);
-void sixtp_sax_characters_handler(void *user_data, const xmlChar *text,
- int len);
-void sixtp_sax_end_handler(void *user_data, const xmlChar *name);
-
-sixtp* sixtp_new(void);
-void sixtp_destroy(sixtp *sp);
-
-void sixtp_handle_catastrophe(sixtp_sax_data *sax_data);
-xmlEntityPtr sixtp_sax_get_entity_handler(void *user_data, const xmlChar *name);
-
-gboolean sixtp_parse_file(sixtp *sixtp, const char *filename,
- gpointer data_for_top_level, gpointer global_data,
- gpointer *parse_result);
-gboolean sixtp_parse_fd(sixtp *sixtp, FILE *fd,
- gpointer data_for_top_level, gpointer global_data,
- gpointer *parse_result);
-gboolean sixtp_parse_buffer(sixtp *sixtp, char *bufp, int bufsz,
- gpointer data_for_top_level, gpointer global_data,
- gpointer *parse_result);
-gboolean sixtp_parse_push(sixtp *sixtp, sixtp_push_handler push_handler,
- gpointer push_user_data, gpointer data_for_top_level,
- gpointer global_data, gpointer *parse_result);
-
-void sixtp_set_start(sixtp *parser, sixtp_start_handler start_handler);
-void sixtp_set_before_child(sixtp *parser, sixtp_before_child_handler handler);
-void sixtp_set_after_child(sixtp *parser, sixtp_after_child_handler handler);
-void sixtp_set_end(sixtp *parser, sixtp_end_handler end_handler);
-void sixtp_set_chars(sixtp *parser, sixtp_characters_handler char_handler);
-void sixtp_set_cleanup_result(sixtp *parser, sixtp_result_handler handler);
-void sixtp_set_cleanup_chars(sixtp *parser, sixtp_result_handler handler);
-void sixtp_set_fail(sixtp *parser, sixtp_fail_handler handler);
-void sixtp_set_result_fail(sixtp *parser, sixtp_result_handler handler);
-void sixtp_set_chars_fail(sixtp *parser, sixtp_result_handler handler);
-
-sixtp* sixtp_set_any(sixtp *tochange, gboolean cleanup, ...);
-sixtp* sixtp_add_some_sub_parsers(sixtp *tochange, gboolean cleanup, ...);
-
-gboolean sixtp_add_sub_parser(sixtp *parser, const gchar* tag,
- sixtp *sub_parser);
-
-QofBookFileType gnc_is_our_xml_file(const char *filename,
- gboolean *with_encoding);
-
-QofBookFileType gnc_is_our_first_xml_chunk(char *chunk, gboolean *with_encoding);
+gboolean is_child_result_from_node_named (sixtp_child_result* cr,
+ const char* tag);
+void sixtp_child_free_data (sixtp_child_result* result);
+void sixtp_child_result_destroy (sixtp_child_result* r);
+void sixtp_child_result_print (sixtp_child_result* cr, FILE* f);
+
+void sixtp_sax_start_handler (void* user_data, const xmlChar* name,
+ const xmlChar** attrs);
+void sixtp_sax_characters_handler (void* user_data, const xmlChar* text,
+ int len);
+void sixtp_sax_end_handler (void* user_data, const xmlChar* name);
+
+sixtp* sixtp_new (void);
+void sixtp_destroy (sixtp* sp);
+
+void sixtp_handle_catastrophe (sixtp_sax_data* sax_data);
+xmlEntityPtr sixtp_sax_get_entity_handler (void* user_data,
+ const xmlChar* name);
+
+gboolean sixtp_parse_file (sixtp* sixtp, const char* filename,
+ gpointer data_for_top_level, gpointer global_data,
+ gpointer* parse_result);
+gboolean sixtp_parse_fd (sixtp* sixtp, FILE* fd,
+ gpointer data_for_top_level, gpointer global_data,
+ gpointer* parse_result);
+gboolean sixtp_parse_buffer (sixtp* sixtp, char* bufp, int bufsz,
+ gpointer data_for_top_level, gpointer global_data,
+ gpointer* parse_result);
+gboolean sixtp_parse_push (sixtp* sixtp, sixtp_push_handler push_handler,
+ gpointer push_user_data, gpointer data_for_top_level,
+ gpointer global_data, gpointer* parse_result);
+
+void sixtp_set_start (sixtp* parser, sixtp_start_handler start_handler);
+void sixtp_set_before_child (sixtp* parser,
+ sixtp_before_child_handler handler);
+void sixtp_set_after_child (sixtp* parser, sixtp_after_child_handler handler);
+void sixtp_set_end (sixtp* parser, sixtp_end_handler end_handler);
+void sixtp_set_chars (sixtp* parser, sixtp_characters_handler char_handler);
+void sixtp_set_cleanup_result (sixtp* parser, sixtp_result_handler handler);
+void sixtp_set_cleanup_chars (sixtp* parser, sixtp_result_handler handler);
+void sixtp_set_fail (sixtp* parser, sixtp_fail_handler handler);
+void sixtp_set_result_fail (sixtp* parser, sixtp_result_handler handler);
+void sixtp_set_chars_fail (sixtp* parser, sixtp_result_handler handler);
+
+sixtp* sixtp_set_any (sixtp* tochange, gboolean cleanup, ...);
+sixtp* sixtp_add_some_sub_parsers (sixtp* tochange, gboolean cleanup, ...);
+
+gboolean sixtp_add_sub_parser (sixtp* parser, const gchar* tag,
+ sixtp* sub_parser);
+
+QofBookFileType gnc_is_our_xml_file (const char* filename,
+ gboolean* with_encoding);
+
+QofBookFileType gnc_is_our_first_xml_chunk (char* chunk,
+ gboolean* with_encoding);
/** Call after loading each record */
-void sixtp_run_callback(sixtp_gdv2 *data, const char *type);
+void sixtp_run_callback (sixtp_gdv2* data, const char* type);
#endif /* _SIXTP_H_ */
diff --git a/src/backend/xml/test/test-date-converting.cpp b/src/backend/xml/test/test-date-converting.cpp
index 5ae3834..46c2bc6 100644
--- a/src/backend/xml/test/test-date-converting.cpp
+++ b/src/backend/xml/test/test-date-converting.cpp
@@ -33,61 +33,61 @@ extern "C"
#include "sixtp-dom-generators.h"
#define GNC_V2_STRING "gnc-v2"
-const gchar *gnc_v2_xml_version_string = GNC_V2_STRING;
+const gchar* gnc_v2_xml_version_string = GNC_V2_STRING;
int
-main(int argc, char **argv)
+main (int argc, char** argv)
{
int i;
for (i = 0; i < 20; i++)
{
- Timespec *spec1;
+ Timespec* spec1;
Timespec spec2;
- gchar *sec_str;
- gchar *nsec_str;
+ gchar* sec_str;
+ gchar* nsec_str;
- spec1 = get_random_timespec();
+ spec1 = get_random_timespec ();
- sec_str = timespec_sec_to_string(spec1);
- nsec_str = timespec_nsec_to_string(spec1);
+ sec_str = timespec_sec_to_string (spec1);
+ nsec_str = timespec_nsec_to_string (spec1);
- if (!string_to_timespec_secs(sec_str, &spec2))
+ if (!string_to_timespec_secs (sec_str, &spec2))
{
- failure_args("string_to_timespec_secs", __FILE__, __LINE__,
- "string is %s", sec_str);
+ failure_args ("string_to_timespec_secs", __FILE__, __LINE__,
+ "string is %s", sec_str);
}
- else if (!string_to_timespec_nsecs(nsec_str, &spec2))
+ else if (!string_to_timespec_nsecs (nsec_str, &spec2))
{
- failure_args("string_to_timespec_nsecs", __FILE__, __LINE__,
- "string is %s", nsec_str);
+ failure_args ("string_to_timespec_nsecs", __FILE__, __LINE__,
+ "string is %s", nsec_str);
}
else if (spec1->tv_sec != spec2.tv_sec)
{
- failure_args("timespec_secs", __FILE__, __LINE__,
- "not equal ints are %" G_GINT64_FORMAT
- " and %" G_GINT64_FORMAT "\n",
- spec1->tv_sec, spec2.tv_sec);
+ failure_args ("timespec_secs", __FILE__, __LINE__,
+ "not equal ints are %" G_GINT64_FORMAT
+ " and %" G_GINT64_FORMAT "\n",
+ spec1->tv_sec, spec2.tv_sec);
}
else if (spec1->tv_nsec != spec2.tv_nsec)
{
- failure_args("timespec_nsecs", __FILE__, __LINE__,
- "not equal ints are %ld and %ld\n",
- spec1->tv_nsec, spec2.tv_nsec);
+ failure_args ("timespec_nsecs", __FILE__, __LINE__,
+ "not equal ints are %ld and %ld\n",
+ spec1->tv_nsec, spec2.tv_nsec);
}
else
{
- success("timespec");
+ success ("timespec");
}
- g_free(spec1);
- g_free(sec_str);
- g_free(nsec_str);
+ g_free (spec1);
+ g_free (sec_str);
+ g_free (nsec_str);
}
- print_test_results();
- exit(get_rv());
+ print_test_results ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-dom-converters1.cpp b/src/backend/xml/test/test-dom-converters1.cpp
index e7335df..c577f9a 100644
--- a/src/backend/xml/test/test-dom-converters1.cpp
+++ b/src/backend/xml/test/test-dom-converters1.cpp
@@ -46,156 +46,156 @@ extern "C"
#include "sixtp-dom-generators.h"
#define GNC_V2_STRING "gnc-v2"
-const gchar *gnc_v2_xml_version_string = GNC_V2_STRING;
+const gchar* gnc_v2_xml_version_string = GNC_V2_STRING;
static void
-test_dom_tree_to_commodity_ref(void)
+test_dom_tree_to_commodity_ref (void)
{
int i;
for (i = 0; i < 20; i++)
{
- gnc_commodity *test_com1;
- gchar *test_str1;
- gchar *test_str2;
- gnc_commodity *test_com2;
+ gnc_commodity* test_com1;
+ gchar* test_str1;
+ gchar* test_str2;
+ gnc_commodity* test_com2;
xmlNodePtr test_node;
- QofBook *book;
+ QofBook* book;
book = qof_book_new ();
- test_str1 = get_random_string();
- test_str2 = get_random_string();
+ test_str1 = get_random_string ();
+ test_str2 = get_random_string ();
- test_com1 = gnc_commodity_new(book, NULL, test_str1, test_str2, NULL, 0);
- test_node = commodity_ref_to_dom_tree("test-com", test_com1);
+ test_com1 = gnc_commodity_new (book, NULL, test_str1, test_str2, NULL, 0);
+ test_node = commodity_ref_to_dom_tree ("test-com", test_com1);
- test_com2 = dom_tree_to_commodity_ref_no_engine(test_node, book);
+ test_com2 = dom_tree_to_commodity_ref_no_engine (test_node, book);
- do_test(gnc_commodity_equiv(test_com1, test_com2),
- "dom_tree_to_commodity_ref_no_engine");
+ do_test (gnc_commodity_equiv (test_com1, test_com2),
+ "dom_tree_to_commodity_ref_no_engine");
- xmlFreeNode(test_node);
- gnc_commodity_destroy(test_com1);
- gnc_commodity_destroy(test_com2);
- g_free(test_str1);
- g_free(test_str2);
+ xmlFreeNode (test_node);
+ gnc_commodity_destroy (test_com1);
+ gnc_commodity_destroy (test_com2);
+ g_free (test_str1);
+ g_free (test_str2);
qof_book_destroy (book);
}
}
static void
-test_dom_tree_to_text(void)
+test_dom_tree_to_text (void)
{
int i;
for (i = 0; i < 20; i++)
{
- gchar *test_string1;
- gchar *test_string2;
+ gchar* test_string1;
+ gchar* test_string2;
xmlNodePtr test_node;
- test_node = xmlNewNode(NULL, BAD_CAST "test-node");
- test_string1 = get_random_string();
+ test_node = xmlNewNode (NULL, BAD_CAST "test-node");
+ test_string1 = get_random_string ();
- xmlNodeAddContent(test_node, BAD_CAST test_string1);
+ xmlNodeAddContent (test_node, BAD_CAST test_string1);
- test_string2 = dom_tree_to_text(test_node);
+ test_string2 = dom_tree_to_text (test_node);
if (!test_string2)
{
- failure_args("dom_tree_to_text", __FILE__, __LINE__,
- "null return from dom_tree_to_text");
- xmlElemDump(stdout, NULL, test_node);
+ failure_args ("dom_tree_to_text", __FILE__, __LINE__,
+ "null return from dom_tree_to_text");
+ xmlElemDump (stdout, NULL, test_node);
}
- else if (g_strcmp0(test_string1, test_string2) == 0)
+ else if (g_strcmp0 (test_string1, test_string2) == 0)
{
- success_args("dom_tree_to_text", __FILE__, __LINE__, "with string %s",
- test_string1);
+ success_args ("dom_tree_to_text", __FILE__, __LINE__, "with string %s",
+ test_string1);
}
else
{
- failure_args("dom_tree_to_text", __FILE__, __LINE__,
- "with string %s", test_string1);
+ failure_args ("dom_tree_to_text", __FILE__, __LINE__,
+ "with string %s", test_string1);
}
- xmlFreeNode(test_node);
- g_free(test_string1);
- if (test_string2) g_free(test_string2);
+ xmlFreeNode (test_node);
+ g_free (test_string1);
+ if (test_string2) g_free (test_string2);
}
}
static void
-test_dom_tree_to_timespec(void)
+test_dom_tree_to_timespec (void)
{
int i;
for (i = 0; i < 20; i++)
{
- Timespec *test_spec1;
+ Timespec* test_spec1;
Timespec test_spec2;
xmlNodePtr test_node;
- test_spec1 = get_random_timespec();
+ test_spec1 = get_random_timespec ();
- test_node = timespec_to_dom_tree("test-spec", test_spec1);
+ test_node = timespec_to_dom_tree ("test-spec", test_spec1);
- test_spec2 = dom_tree_to_timespec(test_node);
+ test_spec2 = dom_tree_to_timespec (test_node);
- if (!dom_tree_valid_timespec(&test_spec2, (const xmlChar*)"test-spec"))
+ if (!dom_tree_valid_timespec (&test_spec2, (const xmlChar*)"test-spec"))
{
- failure_args("dom_tree_to_timespec",
- __FILE__, __LINE__, "NULL return");
- printf("Node looks like:\n");
- xmlElemDump(stdout, NULL, test_node);
- printf("\n");
+ failure_args ("dom_tree_to_timespec",
+ __FILE__, __LINE__, "NULL return");
+ printf ("Node looks like:\n");
+ xmlElemDump (stdout, NULL, test_node);
+ printf ("\n");
}
- else if (timespec_cmp(test_spec1, &test_spec2) == 0)
+ else if (timespec_cmp (test_spec1, &test_spec2) == 0)
{
- success("dom_tree_to_timespec");
+ success ("dom_tree_to_timespec");
}
else
{
- failure("dom_tree_to_timespec");
- printf("Node looks like:\n");
- xmlElemDump(stdout, NULL, test_node);
- printf("\n");
- printf("Secs are %" G_GUINT64_FORMAT " vs %" G_GUINT64_FORMAT " :: ",
- test_spec1->tv_sec,
- test_spec2.tv_sec);
- printf("NSecs are %ld vs %ld\n",
- test_spec1->tv_nsec,
- test_spec2.tv_nsec);
+ failure ("dom_tree_to_timespec");
+ printf ("Node looks like:\n");
+ xmlElemDump (stdout, NULL, test_node);
+ printf ("\n");
+ printf ("Secs are %" G_GUINT64_FORMAT " vs %" G_GUINT64_FORMAT " :: ",
+ test_spec1->tv_sec,
+ test_spec2.tv_sec);
+ printf ("NSecs are %ld vs %ld\n",
+ test_spec1->tv_nsec,
+ test_spec2.tv_nsec);
}
- g_free(test_spec1);
- xmlFreeNode(test_node);
+ g_free (test_spec1);
+ xmlFreeNode (test_node);
}
}
-static const char *
-test_gnc_nums_internal(gnc_numeric to_test)
+static const char*
+test_gnc_nums_internal (gnc_numeric to_test)
{
- const char *ret = NULL;
- gnc_numeric *to_compare = NULL;
+ const char* ret = NULL;
+ gnc_numeric* to_compare = NULL;
xmlNodePtr to_gen = NULL;
- to_gen = gnc_numeric_to_dom_tree("test-num", &to_test);
+ to_gen = gnc_numeric_to_dom_tree ("test-num", &to_test);
if (!to_gen)
{
ret = "no dom tree created";
}
else
{
- to_compare = dom_tree_to_gnc_numeric(to_gen);
+ to_compare = dom_tree_to_gnc_numeric (to_gen);
if (!to_compare)
{
ret = "no gnc_numeric parsed";
}
else
{
- if (!gnc_numeric_equal(to_test, *to_compare))
+ if (!gnc_numeric_equal (to_test, *to_compare))
{
ret = "numerics compared different";
}
@@ -204,86 +204,86 @@ test_gnc_nums_internal(gnc_numeric to_test)
if (to_compare)
{
- g_free(to_compare);
+ g_free (to_compare);
}
if (to_gen)
{
- xmlFreeNode(to_gen);
+ xmlFreeNode (to_gen);
}
return ret;
}
static void
-test_dom_tree_to_gnc_numeric(void)
+test_dom_tree_to_gnc_numeric (void)
{
int i;
for (i = 0; i < 20; i++)
{
- const char *message =
- test_gnc_nums_internal(get_random_gnc_numeric(GNC_DENOM_AUTO));
+ const char* message =
+ test_gnc_nums_internal (get_random_gnc_numeric (GNC_DENOM_AUTO));
- do_test_args(message == NULL, "dom_tree_to_gnc_numeric",
- __FILE__, __LINE__, message);
+ do_test_args (message == NULL, "dom_tree_to_gnc_numeric",
+ __FILE__, __LINE__, message);
}
{
- const char *message = test_gnc_nums_internal
- (gnc_numeric_create(18768786810LL, 100000));
+ const char* message = test_gnc_nums_internal
+ (gnc_numeric_create (18768786810LL, 100000));
- do_test_args(message == NULL, "gnc_num 18768786810/100000",
- __FILE__, __LINE__, message);
+ do_test_args (message == NULL, "gnc_num 18768786810/100000",
+ __FILE__, __LINE__, message);
}
}
static void
-test_dom_tree_to_guid(void)
+test_dom_tree_to_guid (void)
{
int i;
for (i = 0; i < 20; i++)
{
- GncGUID *test_guid1;
- GncGUID *test_guid2;
+ GncGUID* test_guid1;
+ GncGUID* test_guid2;
xmlNodePtr test_node;
- test_guid1 = get_random_guid();
+ test_guid1 = get_random_guid ();
- if (!(test_node = guid_to_dom_tree("test-guid", test_guid1)))
+ if (! (test_node = guid_to_dom_tree ("test-guid", test_guid1)))
{
- failure_args("guid_to_dom_tree", __FILE__, __LINE__,
- "conversion to dom tree failed");
+ failure_args ("guid_to_dom_tree", __FILE__, __LINE__,
+ "conversion to dom tree failed");
}
- test_guid2 = dom_tree_to_guid(test_node);
+ test_guid2 = dom_tree_to_guid (test_node);
- do_test(guid_equal(test_guid1, test_guid2),
- "dom_tree_to_guid" );
+ do_test (guid_equal (test_guid1, test_guid2),
+ "dom_tree_to_guid");
- xmlFreeNode(test_node);
- g_free(test_guid1);
- g_free(test_guid2);
+ xmlFreeNode (test_node);
+ g_free (test_guid1);
+ g_free (test_guid2);
}
}
int
-main(int argc, char **argv)
+main (int argc, char** argv)
{
- qof_init();
- cashobjects_register();
- test_dom_tree_to_guid();
- fflush(stdout);
- test_dom_tree_to_commodity_ref();
- fflush(stdout);
- test_dom_tree_to_text();
- fflush(stdout);
- test_dom_tree_to_timespec();
- fflush(stdout);
- test_dom_tree_to_gnc_numeric();
- fflush(stdout);
- print_test_results();
- qof_close();
- exit(get_rv());
+ qof_init ();
+ cashobjects_register ();
+ test_dom_tree_to_guid ();
+ fflush (stdout);
+ test_dom_tree_to_commodity_ref ();
+ fflush (stdout);
+ test_dom_tree_to_text ();
+ fflush (stdout);
+ test_dom_tree_to_timespec ();
+ fflush (stdout);
+ test_dom_tree_to_gnc_numeric ();
+ fflush (stdout);
+ print_test_results ();
+ qof_close ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-dom-parser1.cpp b/src/backend/xml/test/test-dom-parser1.cpp
index d236d39..5c074f0 100644
--- a/src/backend/xml/test/test-dom-parser1.cpp
+++ b/src/backend/xml/test/test-dom-parser1.cpp
@@ -34,62 +34,62 @@ extern "C"
#include "sixtp-parsers.h"
#include "sixtp-utils.h"
-static void parse_file(char *filename, sixtp *parser);
+static void parse_file (char* filename, sixtp* parser);
static sixtp*
-get_parser1_1_parser1(void)
+get_parser1_1_parser1 (void)
{
- sixtp *ret;
+ sixtp* ret;
- ret = sixtp_new();
- g_return_val_if_fail(ret, NULL);
- sixtp_set_chars(ret, allow_and_ignore_only_whitespace);
+ ret = sixtp_new ();
+ g_return_val_if_fail (ret, NULL);
+ sixtp_set_chars (ret, allow_and_ignore_only_whitespace);
- sixtp_add_sub_parser(ret, "foobar",
- sixtp_dom_parser_new(print_dom_tree, NULL, NULL));
+ sixtp_add_sub_parser (ret, "foobar",
+ sixtp_dom_parser_new (print_dom_tree, NULL, NULL));
return ret;
}
static sixtp*
-simple_parser(void)
+simple_parser (void)
{
- sixtp*ret;
- ret = sixtp_new();
- sixtp_set_chars(ret, allow_and_ignore_only_whitespace);
+ sixtp* ret;
+ ret = sixtp_new ();
+ sixtp_set_chars (ret, allow_and_ignore_only_whitespace);
return ret;
}
static sixtp*
-get_parser1_1_parser2(void)
+get_parser1_1_parser2 (void)
{
- sixtp *ret;
- sixtp *foobarer;
+ sixtp* ret;
+ sixtp* foobarer;
- ret = simple_parser();
- foobarer = simple_parser();
+ ret = simple_parser ();
+ foobarer = simple_parser ();
- sixtp_add_sub_parser(ret, "foobar", foobarer);
- sixtp_add_sub_parser(foobarer, "blah",
- sixtp_dom_parser_new(print_dom_tree, NULL, NULL));
- sixtp_add_sub_parser(foobarer, "you",
- sixtp_dom_parser_new(print_dom_tree, NULL, NULL));
+ sixtp_add_sub_parser (ret, "foobar", foobarer);
+ sixtp_add_sub_parser (foobarer, "blah",
+ sixtp_dom_parser_new (print_dom_tree, NULL, NULL));
+ sixtp_add_sub_parser (foobarer, "you",
+ sixtp_dom_parser_new (print_dom_tree, NULL, NULL));
return ret;
}
int
-main(int argc, char **argv)
+main (int argc, char** argv)
{
- parse_file("test-dom-parser1-1.xml", get_parser1_1_parser1());
- parse_file("test-dom-parser1-1.xml", get_parser1_1_parser2());
- exit(get_rv());
+ parse_file ("test-dom-parser1-1.xml", get_parser1_1_parser1 ());
+ parse_file ("test-dom-parser1-1.xml", get_parser1_1_parser2 ());
+ exit (get_rv ());
}
static void
-parse_file(char *filename, sixtp* parser)
+parse_file (char* filename, sixtp* parser)
{
- printf("STARTING: %s\n", filename);
- sixtp_parse_file(parser, filename, NULL, (gpointer)stdout, NULL);
- printf("\nENDING: %s\n", filename);
- sixtp_destroy(parser);
+ printf ("STARTING: %s\n", filename);
+ sixtp_parse_file (parser, filename, NULL, (gpointer)stdout, NULL);
+ printf ("\nENDING: %s\n", filename);
+ sixtp_destroy (parser);
}
diff --git a/src/backend/xml/test/test-file-stuff.cpp b/src/backend/xml/test/test-file-stuff.cpp
index acf912b..a6bbf80 100644
--- a/src/backend/xml/test/test-file-stuff.cpp
+++ b/src/backend/xml/test/test-file-stuff.cpp
@@ -50,41 +50,41 @@ extern "C"
*/
/***********************************************************************/
-extern KvpFrame* dom_tree_to_kvp_frame(xmlNodePtr node);
+extern KvpFrame* dom_tree_to_kvp_frame (xmlNodePtr node);
static int
-files_return(int ret, const char* msg)
+files_return (int ret, const char* msg)
{
- printf("%s", msg);
+ printf ("%s", msg);
return ret;
}
int
-files_compare(const gchar* f1, const gchar* f2)
+files_compare (const gchar* f1, const gchar* f2)
{
gchar buf1[512];
gchar buf2[512];
int fd1, fd2;
int amount_read1, amount_read2;
- fd1 = g_open(f1, O_RDONLY, 0);
- fd2 = g_open(f2, O_RDONLY, 0);
+ fd1 = g_open (f1, O_RDONLY, 0);
+ fd2 = g_open (f2, O_RDONLY, 0);
do
{
int memcmp_ret;
- amount_read1 = read(fd1, buf1, 512);
- amount_read2 = read(fd2, buf2, 512);
+ amount_read1 = read (fd1, buf1, 512);
+ amount_read2 = read (fd2, buf2, 512);
if (amount_read1 > amount_read2)
- return files_return(1, "read1 > read2");
+ return files_return (1, "read1 > read2");
if (amount_read1 < amount_read2)
- return files_return(-1, "read1 < read2");
+ return files_return (-1, "read1 < read2");
- if ((memcmp_ret = memcmp(buf1, buf2, amount_read1)) != 0)
+ if ((memcmp_ret = memcmp (buf1, buf2, amount_read1)) != 0)
{
- return files_return(memcmp_ret, "memcmp return");
+ return files_return (memcmp_ret, "memcmp return");
}
}
@@ -94,44 +94,44 @@ files_compare(const gchar* f1, const gchar* f2)
}
void
-write_dom_node_to_file(xmlNodePtr node, int fd)
+write_dom_node_to_file (xmlNodePtr node, int fd)
{
- FILE *out;
+ FILE* out;
- out = fdopen(fd, "w");
+ out = fdopen (fd, "w");
- xmlElemDump(out, NULL, node);
+ xmlElemDump (out, NULL, node);
- fclose(out);
+ fclose (out);
}
gboolean
-print_dom_tree(gpointer data_for_children, GSList* data_from_children,
- GSList* sibling_data, gpointer parent_data,
- gpointer global_data, gpointer *result, const gchar *tag)
+print_dom_tree (gpointer data_for_children, GSList* data_from_children,
+ GSList* sibling_data, gpointer parent_data,
+ gpointer global_data, gpointer* result, const gchar* tag)
{
if (parent_data == NULL)
{
- xmlElemDump((FILE*)global_data, NULL, (xmlNodePtr)data_for_children);
- xmlFreeNode(static_cast<xmlNodePtr>(data_for_children));
+ xmlElemDump ((FILE*)global_data, NULL, (xmlNodePtr)data_for_children);
+ xmlFreeNode (static_cast<xmlNodePtr> (data_for_children));
}
return TRUE;
}
gboolean
-check_dom_tree_version(xmlNodePtr node, const char *verstr)
+check_dom_tree_version (xmlNodePtr node, const char* verstr)
{
- char *verteststr;
+ char* verteststr;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(verstr, FALSE);
- g_return_val_if_fail(node->properties, FALSE);
- g_return_val_if_fail(node->properties->xmlAttrPropertyValue, FALSE);
- g_return_val_if_fail(node->properties->xmlAttrPropertyValue->content,
- FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (verstr, FALSE);
+ g_return_val_if_fail (node->properties, FALSE);
+ g_return_val_if_fail (node->properties->xmlAttrPropertyValue, FALSE);
+ g_return_val_if_fail (node->properties->xmlAttrPropertyValue->content,
+ FALSE);
verteststr = (char*) node->properties->xmlAttrPropertyValue->content;
- if (g_strcmp0(verstr, verteststr) == 0)
+ if (g_strcmp0 (verstr, verteststr) == 0)
{
return TRUE;
}
@@ -142,134 +142,134 @@ check_dom_tree_version(xmlNodePtr node, const char *verstr)
}
gboolean
-equals_node_val_vs_string(xmlNodePtr node, const gchar* str)
+equals_node_val_vs_string (xmlNodePtr node, const gchar* str)
{
- gchar *cmp1;
+ gchar* cmp1;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(str, FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (str, FALSE);
- cmp1 = dom_tree_to_text(node);
+ cmp1 = dom_tree_to_text (node);
if (!cmp1)
{
return FALSE;
}
- else if (g_strcmp0(cmp1, str) == 0)
+ else if (g_strcmp0 (cmp1, str) == 0)
{
- g_free(cmp1);
+ g_free (cmp1);
return TRUE;
}
else
{
- printf("Differing types: node:`%s' vs string:`%s'\n", cmp1, str);
- g_free(cmp1);
+ printf ("Differing types: node:`%s' vs string:`%s'\n", cmp1, str);
+ g_free (cmp1);
return FALSE;
}
}
gboolean
-equals_node_val_vs_int(xmlNodePtr node, gint64 val)
+equals_node_val_vs_int (xmlNodePtr node, gint64 val)
{
- gchar *text;
+ gchar* text;
gint64 test_val;
- g_return_val_if_fail(node, FALSE);
+ g_return_val_if_fail (node, FALSE);
- text = dom_tree_to_text(node);
+ text = dom_tree_to_text (node);
- if (!string_to_gint64(text, &test_val))
+ if (!string_to_gint64 (text, &test_val))
{
- g_free(text);
+ g_free (text);
return FALSE;
}
- g_free(text);
+ g_free (text);
return val == test_val;
}
gboolean
-equals_node_val_vs_boolean(xmlNodePtr node, gboolean val)
+equals_node_val_vs_boolean (xmlNodePtr node, gboolean val)
{
- return equals_node_val_vs_string(node, val ? "TRUE" : "FALSE");
+ return equals_node_val_vs_string (node, val ? "TRUE" : "FALSE");
}
gboolean
-equals_node_val_vs_guid(xmlNodePtr node, const GncGUID *id)
+equals_node_val_vs_guid (xmlNodePtr node, const GncGUID* id)
{
- GncGUID *cmpid;
+ GncGUID* cmpid;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(id, FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (id, FALSE);
- cmpid = dom_tree_to_guid(node);
+ cmpid = dom_tree_to_guid (node);
- g_return_val_if_fail(cmpid, FALSE);
+ g_return_val_if_fail (cmpid, FALSE);
- if (guid_compare(cmpid, id) == 0)
+ if (guid_compare (cmpid, id) == 0)
{
- g_free(cmpid);
+ g_free (cmpid);
return TRUE;
}
else
{
- g_free(cmpid);
+ g_free (cmpid);
return FALSE;
}
}
gboolean
-equals_node_val_vs_commodity(xmlNodePtr node, const gnc_commodity *com,
- QofBook *book)
+equals_node_val_vs_commodity (xmlNodePtr node, const gnc_commodity* com,
+ QofBook* book)
{
- gnc_commodity *cmpcom;
+ gnc_commodity* cmpcom;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(com, FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (com, FALSE);
- cmpcom = dom_tree_to_commodity_ref_no_engine(node, book);
+ cmpcom = dom_tree_to_commodity_ref_no_engine (node, book);
- g_return_val_if_fail(cmpcom, FALSE);
+ g_return_val_if_fail (cmpcom, FALSE);
- if (gnc_commodity_equiv(com, cmpcom))
+ if (gnc_commodity_equiv (com, cmpcom))
{
- gnc_commodity_destroy(cmpcom);
+ gnc_commodity_destroy (cmpcom);
return TRUE;
}
else
{
- gnc_commodity_destroy(cmpcom);
+ gnc_commodity_destroy (cmpcom);
return FALSE;
}
}
gboolean
-equals_node_val_vs_kvp_frame(xmlNodePtr node, const KvpFrame *frm)
+equals_node_val_vs_kvp_frame (xmlNodePtr node, const KvpFrame* frm)
{
- KvpFrame *cmpfrm;
+ KvpFrame* cmpfrm;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(frm, FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (frm, FALSE);
- cmpfrm = dom_tree_to_kvp_frame(node);
+ cmpfrm = dom_tree_to_kvp_frame (node);
- g_return_val_if_fail(cmpfrm, FALSE);
+ g_return_val_if_fail (cmpfrm, FALSE);
- if (compare(frm, cmpfrm) == 0)
+ if (compare (frm, cmpfrm) == 0)
{
delete cmpfrm;
return TRUE;
}
else
{
- auto frm1str = g_strdup(frm->to_string().c_str());
- auto frm2str = g_strdup(cmpfrm->to_string().c_str());
+ auto frm1str = g_strdup (frm->to_string ().c_str ());
+ auto frm2str = g_strdup (cmpfrm->to_string ().c_str ());
- printf("%s vs %s\n", frm1str, frm2str);
+ printf ("%s vs %s\n", frm1str, frm2str);
- g_free(frm1str);
- g_free(frm2str);
+ g_free (frm1str);
+ g_free (frm2str);
delete cmpfrm;
return FALSE;
@@ -277,9 +277,9 @@ equals_node_val_vs_kvp_frame(xmlNodePtr node, const KvpFrame *frm)
}
gboolean
-equals_node_val_vs_date(xmlNodePtr node, const Timespec tm)
+equals_node_val_vs_date (xmlNodePtr node, const Timespec tm)
{
- Timespec tm_test = dom_tree_to_timespec(node);
+ Timespec tm_test = dom_tree_to_timespec (node);
if (tm_test.tv_sec == tm.tv_sec && tm_test.tv_nsec == tm.tv_nsec)
{
@@ -294,13 +294,13 @@ equals_node_val_vs_date(xmlNodePtr node, const Timespec tm)
/***********************************************************************/
static gboolean
-just_dom_tree_end_handler(gpointer data_for_children,
- GSList* data_from_children, GSList* sibling_data,
- gpointer parent_data, gpointer global_data,
- gpointer *result, const gchar *tag)
+just_dom_tree_end_handler (gpointer data_for_children,
+ GSList* data_from_children, GSList* sibling_data,
+ gpointer parent_data, gpointer global_data,
+ gpointer* result, const gchar* tag)
{
xmlNodePtr tree = (xmlNodePtr)data_for_children;
- xmlNodePtr *globaldata = (xmlNodePtr*)global_data;
+ xmlNodePtr* globaldata = (xmlNodePtr*)global_data;
if (parent_data)
{
@@ -314,7 +314,7 @@ just_dom_tree_end_handler(gpointer data_for_children,
return TRUE;
}
- g_return_val_if_fail(tree, FALSE);
+ g_return_val_if_fail (tree, FALSE);
*globaldata = tree;
@@ -322,85 +322,85 @@ just_dom_tree_end_handler(gpointer data_for_children,
}
static xmlNodePtr
-grab_file_doc(const char *filename)
+grab_file_doc (const char* filename)
{
- sixtp *parser;
+ sixtp* parser;
xmlNodePtr ret;
gpointer parse_result = NULL;
- parser = sixtp_dom_parser_new(just_dom_tree_end_handler, NULL, NULL);
+ parser = sixtp_dom_parser_new (just_dom_tree_end_handler, NULL, NULL);
- sixtp_parse_file(parser, filename, NULL, &ret, &parse_result);
+ sixtp_parse_file (parser, filename, NULL, &ret, &parse_result);
return ret;
}
static void
-test_load_file(const char *filename, gxpf_callback cb, sixtp *top_parser,
- QofBook *book)
+test_load_file (const char* filename, gxpf_callback cb, sixtp* top_parser,
+ QofBook* book)
{
xmlNodePtr node;
- node = grab_file_doc(filename);
+ node = grab_file_doc (filename);
if (!node)
{
- failure_args("failure of libxml to parse file", __FILE__, __LINE__,
- "%s", filename);
+ failure_args ("failure of libxml to parse file", __FILE__, __LINE__,
+ "%s", filename);
return;
}
- if (!gnc_xml_parse_file(top_parser, filename, cb, node->children, book))
+ if (!gnc_xml_parse_file (top_parser, filename, cb, node->children, book))
{
- failure_args("failure to parse file", __FILE__, __LINE__,
- "%s", filename);
+ failure_args ("failure to parse file", __FILE__, __LINE__,
+ "%s", filename);
}
- xmlFreeNode(node);
+ xmlFreeNode (node);
}
void
-test_files_in_dir(int argc, char **argv, gxpf_callback cb,
- sixtp *parser, const char *parser_tag,
- QofBook *book)
+test_files_in_dir (int argc, char** argv, gxpf_callback cb,
+ sixtp* parser, const char* parser_tag,
+ QofBook* book)
{
int count;
- sixtp *main_parser;
- sixtp *top_parser;
+ sixtp* main_parser;
+ sixtp* top_parser;
- top_parser = sixtp_new();
- main_parser = sixtp_new();
+ top_parser = sixtp_new ();
+ main_parser = sixtp_new ();
- if (!sixtp_add_some_sub_parsers(top_parser, TRUE, "gnc-v2", main_parser,
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (top_parser, TRUE, "gnc-v2", main_parser,
+ NULL, NULL))
return;
- if (!sixtp_add_some_sub_parsers(main_parser, TRUE, parser_tag, parser,
- NULL, NULL))
+ if (!sixtp_add_some_sub_parsers (main_parser, TRUE, parser_tag, parser,
+ NULL, NULL))
return;
for (count = 1; count < argc; count++)
{
struct stat file_info;
- const char *to_open = argv[count];
- if (g_stat(to_open, &file_info) != 0)
+ const char* to_open = argv[count];
+ if (g_stat (to_open, &file_info) != 0)
{
- printf("cannot stat %s.\n", to_open);
- failure("unable to stat file");
+ printf ("cannot stat %s.\n", to_open);
+ failure ("unable to stat file");
}
else
{
- if (!S_ISDIR(file_info.st_mode))
+ if (!S_ISDIR (file_info.st_mode))
{
#ifdef __DEBUG
- printf( "testing load of file \"%s\":\n", argv[count] );
+ printf ("testing load of file \"%s\":\n", argv[count]);
#endif
- test_load_file(to_open, cb, top_parser, book);
+ test_load_file (to_open, cb, top_parser, book);
}
}
}
- sixtp_destroy(top_parser);
+ sixtp_destroy (top_parser);
}
diff --git a/src/backend/xml/test/test-file-stuff.h b/src/backend/xml/test/test-file-stuff.h
index 53f77d0..feea972 100644
--- a/src/backend/xml/test/test-file-stuff.h
+++ b/src/backend/xml/test/test-file-stuff.h
@@ -40,28 +40,29 @@ typedef struct KvpFrameImpl KvpFrame;
#define __KVP_FRAME
#endif
-void write_dom_node_to_file(xmlNodePtr node, int fd);
+void write_dom_node_to_file (xmlNodePtr node, int fd);
-int files_compare(const gchar* f1, const gchar* f2);
+int files_compare (const gchar* f1, const gchar* f2);
-gboolean print_dom_tree(gpointer data_for_children, GSList* data_from_children,
- GSList* sibling_data, gpointer parent_data,
- gpointer global_data, gpointer *result,
- const gchar *tag);
+gboolean print_dom_tree (gpointer data_for_children,
+ GSList* data_from_children,
+ GSList* sibling_data, gpointer parent_data,
+ gpointer global_data, gpointer* result,
+ const gchar* tag);
/**/
-gboolean check_dom_tree_version(xmlNodePtr node, const char *verstr);
-gboolean equals_node_val_vs_string(xmlNodePtr node, const gchar* str);
-gboolean equals_node_val_vs_guid(xmlNodePtr node, const GncGUID *id);
-gboolean equals_node_val_vs_commodity(xmlNodePtr node,
- const gnc_commodity *com, QofBook *);
-gboolean equals_node_val_vs_kvp_frame(xmlNodePtr node, const KvpFrame *frm);
-gboolean equals_node_val_vs_date(xmlNodePtr node, const Timespec tm);
-gboolean equals_node_val_vs_int(xmlNodePtr node, gint64 val);
-gboolean equals_node_val_vs_boolean(xmlNodePtr node, gboolean val);
+gboolean check_dom_tree_version (xmlNodePtr node, const char* verstr);
+gboolean equals_node_val_vs_string (xmlNodePtr node, const gchar* str);
+gboolean equals_node_val_vs_guid (xmlNodePtr node, const GncGUID* id);
+gboolean equals_node_val_vs_commodity (xmlNodePtr node,
+ const gnc_commodity* com, QofBook*);
+gboolean equals_node_val_vs_kvp_frame (xmlNodePtr node, const KvpFrame* frm);
+gboolean equals_node_val_vs_date (xmlNodePtr node, const Timespec tm);
+gboolean equals_node_val_vs_int (xmlNodePtr node, gint64 val);
+gboolean equals_node_val_vs_boolean (xmlNodePtr node, gboolean val);
void
-test_files_in_dir(int argc, char **argv, gxpf_callback cb,
- sixtp *parser, const char *parser_tag,
- QofBook *book);
+test_files_in_dir (int argc, char** argv, gxpf_callback cb,
+ sixtp* parser, const char* parser_tag,
+ QofBook* book);
#endif
diff --git a/src/backend/xml/test/test-kvp-frames.cpp b/src/backend/xml/test/test-kvp-frames.cpp
index 7d6a596..2a483d1 100644
--- a/src/backend/xml/test/test-kvp-frames.cpp
+++ b/src/backend/xml/test/test-kvp-frames.cpp
@@ -17,77 +17,77 @@ extern "C"
#include "sixtp-dom-parsers.h"
#define GNC_V2_STRING "gnc-v2"
-const gchar *gnc_v2_xml_version_string = GNC_V2_STRING;
-extern KvpFrame* dom_tree_to_kvp_frame(xmlNodePtr node);
+const gchar* gnc_v2_xml_version_string = GNC_V2_STRING;
+extern KvpFrame* dom_tree_to_kvp_frame (xmlNodePtr node);
static void
-test_kvp_get_slot(int run,
- KvpFrame *test_frame1, const KvpValue *test_val1,
- const gchar *test_key)
+test_kvp_get_slot (int run,
+ KvpFrame* test_frame1, const KvpValue* test_val1,
+ const gchar* test_key)
{
- auto test_val2 = test_frame1->get_slot(test_key);
+ auto test_val2 = test_frame1->get_slot (test_key);
auto msg = "KvpFrame::get_slot";
- if (compare(test_val1, test_val2) == 0)
+ if (compare (test_val1, test_val2) == 0)
{
- success_args(msg, __FILE__, __LINE__, "run=%d", run);
+ success_args (msg, __FILE__, __LINE__, "run=%d", run);
}
else
{
- gchar *tmp;
- failure_args(msg, __FILE__, __LINE__, "run=%d", run);
- printf(" Value is %s\n", test_val2->to_string());
+ gchar* tmp;
+ failure_args (msg, __FILE__, __LINE__, "run=%d", run);
+ printf (" Value is %s\n", test_val2->to_string ());
}
}
static void
-test_kvp_copy_compare(int run,
- KvpFrame *test_frame1, const KvpValue *test_val1,
- const gchar *test_key)
+test_kvp_copy_compare (int run,
+ KvpFrame* test_frame1, const KvpValue* test_val1,
+ const gchar* test_key)
{
- auto test_frame2 = new KvpFrame(*test_frame1);
+ auto test_frame2 = new KvpFrame (*test_frame1);
auto msg = "compare after KvpFrame copy construction";
- do_test_args(test_frame2 != NULL, "KvpFrame Copy Constructor",
- __FILE__, __LINE__, "run=%d", run);
+ do_test_args (test_frame2 != NULL, "KvpFrame Copy Constructor",
+ __FILE__, __LINE__, "run=%d", run);
- if (compare(test_frame1, test_frame2) == 0)
+ if (compare (test_frame1, test_frame2) == 0)
{
- success_args(msg, __FILE__, __LINE__, "run=%d", run);
+ success_args (msg, __FILE__, __LINE__, "run=%d", run);
}
else
{
- gchar *tmp;
- failure_args(msg, __FILE__, __LINE__, "run=%d", run);
- printf("Frame1 is %s\n", test_frame1->to_string().c_str());
- printf("Frame2 is %s\n",test_frame2->to_string().c_str());
+ gchar* tmp;
+ failure_args (msg, __FILE__, __LINE__, "run=%d", run);
+ printf ("Frame1 is %s\n", test_frame1->to_string ().c_str ());
+ printf ("Frame2 is %s\n", test_frame2->to_string ().c_str ());
}
delete test_frame2;
}
static void
-test_kvp_copy_get_slot(int run,
- KvpFrame *test_frame1, const KvpValue *test_val1,
- const gchar *test_key)
+test_kvp_copy_get_slot (int run,
+ KvpFrame* test_frame1, const KvpValue* test_val1,
+ const gchar* test_key)
{
- auto test_frame2 = new KvpFrame(*test_frame1);
- auto test_val2 = test_frame2->get_slot(test_key);
+ auto test_frame2 = new KvpFrame (*test_frame1);
+ auto test_val2 = test_frame2->get_slot (test_key);
auto msg = "KvpFrame::get_slot() from a copy-constructed frame";
- if (compare(test_val1, test_val2) == 0)
+ if (compare (test_val1, test_val2) == 0)
{
- success_args(msg, __FILE__, __LINE__, "run=%d", run);
+ success_args (msg, __FILE__, __LINE__, "run=%d", run);
}
else
{
- gchar *tmp;
- failure_args(msg, __FILE__, __LINE__, "run=%d", run);
- printf("Frame1 is %s\n", test_frame1->to_string().c_str());
- printf("Frame2 is %s\n", test_frame2->to_string().c_str());
+ gchar* tmp;
+ failure_args (msg, __FILE__, __LINE__, "run=%d", run);
+ printf ("Frame1 is %s\n", test_frame1->to_string ().c_str ());
+ printf ("Frame2 is %s\n", test_frame2->to_string ().c_str ());
}
delete test_frame2;
}
static void
-test_kvp_create_delete(void)
+test_kvp_create_delete (void)
{
auto test_frame = new KvpFrame;
auto msg = "KvpFrame default constructor";
@@ -95,101 +95,101 @@ test_kvp_create_delete(void)
{
delete test_frame;
test_frame = nullptr;
- success(msg);
+ success (msg);
}
else
{
- failure(msg);
+ failure (msg);
}
}
static void
-test_kvp_frames1(void)
+test_kvp_frames1 (void)
{
int i;
for (i = 0; i < 20; i++)
{
- auto test_val1 = get_random_kvp_value(i % KvpValue::Type::FRAME);
+ auto test_val1 = get_random_kvp_value (i % KvpValue::Type::FRAME);
auto test_frame1 = new KvpFrame;
- auto test_key = get_random_string_without("/");
+ auto test_key = get_random_string_without ("/");
- test_frame1->set(test_key, test_val1);
+ test_frame1->set (test_key, test_val1);
- test_kvp_get_slot(i, test_frame1, test_val1, test_key);
- test_kvp_copy_compare(i, test_frame1, test_val1, test_key);
- test_kvp_copy_get_slot(i, test_frame1, test_val1, test_key);
+ test_kvp_get_slot (i, test_frame1, test_val1, test_key);
+ test_kvp_copy_compare (i, test_frame1, test_val1, test_key);
+ test_kvp_copy_get_slot (i, test_frame1, test_val1, test_key);
- g_free(test_key);
+ g_free (test_key);
delete test_frame1;
}
}
static void
-test_kvp_printing(void)
+test_kvp_printing (void)
{
int i;
for (i = 0; i < 20; i++)
{
- auto ran_frame = get_random_kvp_frame();
- assert(!ran_frame->to_string().empty());
+ auto ran_frame = get_random_kvp_frame ();
+ assert (!ran_frame->to_string ().empty ());
delete ran_frame;
}
}
static void
-test_kvp_xml_stuff(void)
+test_kvp_xml_stuff (void)
{
int i;
for (i = 0; i < 20; i++)
{
- auto inst = static_cast<QofInstance *>(g_object_new (QOF_TYPE_INSTANCE, NULL));
- KvpFrame *test_frame2;
+ auto inst = static_cast<QofInstance*> (g_object_new (QOF_TYPE_INSTANCE, NULL));
+ KvpFrame* test_frame2;
xmlNodePtr test_node;
- inst->kvp_data = get_random_kvp_frame();
+ inst->kvp_data = get_random_kvp_frame ();
auto msg = "XML Stuff";
- test_node = qof_instance_slots_to_dom_tree("test-kvp", inst);
+ test_node = qof_instance_slots_to_dom_tree ("test-kvp", inst);
if (!test_node)
{
- failure_args("xml stuff", __FILE__, __LINE__,
- "kvp_frame_to_dom_tree produced NULL");
+ failure_args ("xml stuff", __FILE__, __LINE__,
+ "kvp_frame_to_dom_tree produced NULL");
}
else
{
- test_frame2 = dom_tree_to_kvp_frame(test_node);
+ test_frame2 = dom_tree_to_kvp_frame (test_node);
- if (compare(inst->kvp_data, test_frame2) == 0)
+ if (compare (inst->kvp_data, test_frame2) == 0)
{
- success(msg);
+ success (msg);
}
else
{
- failure(msg);
- printf(" With KvpFrame 1:\n%s\n",
- inst->kvp_data->to_string().c_str());
- printf(" and XML:\n");
- xmlElemDump(stdout, NULL, test_node);
- printf("\n and kvp_frame 2:\n%s\n",
- test_frame2->to_string().c_str());
+ failure (msg);
+ printf (" With KvpFrame 1:\n%s\n",
+ inst->kvp_data->to_string ().c_str ());
+ printf (" and XML:\n");
+ xmlElemDump (stdout, NULL, test_node);
+ printf ("\n and kvp_frame 2:\n%s\n",
+ test_frame2->to_string ().c_str ());
}
delete test_frame2;
- xmlFreeNode(test_node);
+ xmlFreeNode (test_node);
}
g_object_unref (inst);
}
}
int
-main(int argc, char** argv)
+main (int argc, char** argv)
{
- qof_init();
- test_kvp_create_delete();
- test_kvp_printing();
- test_kvp_frames1();
- test_kvp_xml_stuff();
- print_test_results();
- exit(get_rv());
+ qof_init ();
+ test_kvp_create_delete ();
+ test_kvp_printing ();
+ test_kvp_frames1 ();
+ test_kvp_xml_stuff ();
+ print_test_results ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-load-backend.cpp b/src/backend/xml/test/test-load-backend.cpp
index d531c5b..b891743 100644
--- a/src/backend/xml/test/test-load-backend.cpp
+++ b/src/backend/xml/test/test-load-backend.cpp
@@ -34,14 +34,14 @@ extern "C"
#define GNC_LIB_NAME "gncmod-backend-xml"
-int main (int argc, char ** argv)
+int main (int argc, char** argv)
{
- qof_init();
- cashobjects_register();
- do_test(
+ qof_init ();
+ cashobjects_register ();
+ do_test (
qof_load_backend_library ("../.libs/", GNC_LIB_NAME),
" loading gnc-backend-xml GModule failed");
- print_test_results();
- qof_close();
- exit(get_rv());
+ print_test_results ();
+ qof_close ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-load-example-account.cpp b/src/backend/xml/test/test-load-example-account.cpp
index 1c0411c..c098e81 100644
--- a/src/backend/xml/test/test-load-example-account.cpp
+++ b/src/backend/xml/test/test-load-example-account.cpp
@@ -44,82 +44,82 @@ extern "C"
#include "io-example-account.h"
-static const gchar *da_ending = ".gnucash-xea";
+static const gchar* da_ending = ".gnucash-xea";
static void
-test_load_file(const char *filename)
+test_load_file (const char* filename)
{
- GncExampleAccount *gea;
+ GncExampleAccount* gea;
- gea = gnc_read_example_account(filename);
+ gea = gnc_read_example_account (filename);
if (gea != NULL)
{
- success("example account load");
- gnc_destroy_example_account(gea);
+ success ("example account load");
+ gnc_destroy_example_account (gea);
}
else
{
- failure_args("example account load", __FILE__, __LINE__, "for file %s",
- filename);
+ failure_args ("example account load", __FILE__, __LINE__, "for file %s",
+ filename);
}
}
static void
-guile_main (void *closure, int argc, char **argv)
+guile_main (void* closure, int argc, char** argv)
{
- const char *location = g_getenv("GNC_ACCOUNT_PATH");
- GSList *list = NULL;
- GDir *ea_dir;
+ const char* location = g_getenv ("GNC_ACCOUNT_PATH");
+ GSList* list = NULL;
+ GDir* ea_dir;
if (!location)
{
location = "../../../../accounts/C";
}
- gnc_module_system_init();
- gnc_module_load("gnucash/engine", 0);
+ gnc_module_system_init ();
+ gnc_module_load ("gnucash/engine", 0);
- if ((ea_dir = g_dir_open(location, 0, NULL)) == NULL)
+ if ((ea_dir = g_dir_open (location, 0, NULL)) == NULL)
{
- failure("unable to open ea directory");
+ failure ("unable to open ea directory");
}
else
{
- const gchar *entry;
+ const gchar* entry;
- while ((entry = g_dir_read_name(ea_dir)) != NULL)
+ while ((entry = g_dir_read_name (ea_dir)) != NULL)
{
- if (g_str_has_suffix(entry, da_ending))
+ if (g_str_has_suffix (entry, da_ending))
{
- gchar *to_open = g_build_filename(location, entry, (gchar*)NULL);
- if (!g_file_test(to_open, G_FILE_TEST_IS_DIR))
+ gchar* to_open = g_build_filename (location, entry, (gchar*)NULL);
+ if (!g_file_test (to_open, G_FILE_TEST_IS_DIR))
{
- test_load_file(to_open);
+ test_load_file (to_open);
}
- g_free(to_open);
+ g_free (to_open);
}
}
}
- g_dir_close(ea_dir);
+ g_dir_close (ea_dir);
{
- list = gnc_load_example_account_list(location);
+ list = gnc_load_example_account_list (location);
- do_test(list != NULL, "gnc_load_example_account_list");
+ do_test (list != NULL, "gnc_load_example_account_list");
- gnc_free_example_account_list(list);
+ gnc_free_example_account_list (list);
}
- print_test_results();
- exit(get_rv());
+ print_test_results ();
+ exit (get_rv ());
}
int
-main (int argc, char ** argv)
+main (int argc, char** argv)
{
g_setenv ("GNC_UNINSTALLED", "1", TRUE);
scm_boot_guile (argc, argv, guile_main, NULL);
- exit(get_rv());
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-load-xml2.cpp b/src/backend/xml/test/test-load-xml2.cpp
index 838fc09..3df9861 100644
--- a/src/backend/xml/test/test-load-xml2.cpp
+++ b/src/backend/xml/test/test-load-xml2.cpp
@@ -55,115 +55,116 @@ extern "C"
#define GNC_LIB_NAME "gncmod-backend-xml"
static void
-remove_files_pattern(const char *begining, const char *ending)
+remove_files_pattern (const char* begining, const char* ending)
{
}
static void
-remove_locks(const char *filename)
+remove_locks (const char* filename)
{
struct stat buf;
- char *to_remove;
+ char* to_remove;
{
- to_remove = g_strdup_printf("%s.LCK", filename);
- if (g_stat(to_remove, &buf) != -1)
+ to_remove = g_strdup_printf ("%s.LCK", filename);
+ if (g_stat (to_remove, &buf) != -1)
{
- g_unlink(to_remove);
+ g_unlink (to_remove);
}
- g_free(to_remove);
+ g_free (to_remove);
}
- remove_files_pattern(filename, ".LCK");
+ remove_files_pattern (filename, ".LCK");
}
static void
-test_load_file(const char *filename)
+test_load_file (const char* filename)
{
- QofSession *session;
- QofBook *book;
- Account *root;
+ QofSession* session;
+ QofBook* book;
+ Account* root;
gboolean ignore_lock;
- const char *logdomain = "backend.xml";
- GLogLevelFlags loglevel = static_cast<decltype(loglevel)>(G_LOG_LEVEL_WARNING);
- TestErrorStruct check = { loglevel, const_cast<char*>(logdomain), NULL };
+ const char* logdomain = "backend.xml";
+ GLogLevelFlags loglevel = static_cast<decltype (loglevel)>
+ (G_LOG_LEVEL_WARNING);
+ TestErrorStruct check = { loglevel, const_cast<char*> (logdomain), NULL };
g_log_set_handler (logdomain, loglevel,
(GLogFunc)test_checked_handler, &check);
- session = qof_session_new();
+ session = qof_session_new ();
- remove_locks(filename);
+ remove_locks (filename);
- ignore_lock = (g_strcmp0(g_getenv("SRCDIR"), ".") != 0);
-/* gnc_prefs_set_file_save_compressed(FALSE); */
- qof_session_begin(session, filename, ignore_lock, FALSE, TRUE);
+ ignore_lock = (g_strcmp0 (g_getenv ("SRCDIR"), ".") != 0);
+ /* gnc_prefs_set_file_save_compressed(FALSE); */
+ qof_session_begin (session, filename, ignore_lock, FALSE, TRUE);
- qof_session_load(session, NULL);
+ qof_session_load (session, NULL);
book = qof_session_get_book (session);
- root = gnc_book_get_root_account(book);
+ root = gnc_book_get_root_account (book);
do_test (gnc_account_get_book (root) == book,
"book and root account don't match");
- do_test_args(qof_session_get_error(session) == ERR_BACKEND_NO_ERR,
- "session load xml2", __FILE__, __LINE__,
- "qof error=%d for file [%s]",
- qof_session_get_error(session), filename);
+ do_test_args (qof_session_get_error (session) == ERR_BACKEND_NO_ERR,
+ "session load xml2", __FILE__, __LINE__,
+ "qof error=%d for file [%s]",
+ qof_session_get_error (session), filename);
/* Uncomment the line below to generate corrected files */
-/* qof_session_save( session, NULL ); */
- qof_session_end(session);
+ /* qof_session_save( session, NULL ); */
+ qof_session_end (session);
}
int
-main (int argc, char ** argv)
+main (int argc, char** argv)
{
- const char *location = g_getenv("GNC_TEST_FILES");
+ const char* location = g_getenv ("GNC_TEST_FILES");
int files_tested = 0;
- GDir *xml2_dir;
+ GDir* xml2_dir;
- qof_init();
- cashobjects_register();
- do_test(qof_load_backend_library ("../.libs/", GNC_LIB_NAME),
- " loading gnc-backend-xml GModule failed");
+ qof_init ();
+ cashobjects_register ();
+ do_test (qof_load_backend_library ("../.libs/", GNC_LIB_NAME),
+ " loading gnc-backend-xml GModule failed");
if (!location)
{
location = "test-files/xml2";
}
- xaccLogDisable();
+ xaccLogDisable ();
- if ((xml2_dir = g_dir_open(location, 0, NULL)) == NULL)
+ if ((xml2_dir = g_dir_open (location, 0, NULL)) == NULL)
{
- failure("unable to open xml2 directory");
+ failure ("unable to open xml2 directory");
}
else
{
- const gchar *entry;
+ const gchar* entry;
- while ((entry = g_dir_read_name(xml2_dir)) != NULL)
+ while ((entry = g_dir_read_name (xml2_dir)) != NULL)
{
- if (g_str_has_suffix(entry, ".gml2"))
+ if (g_str_has_suffix (entry, ".gml2"))
{
- gchar *to_open = g_build_filename(location, entry, (gchar*)NULL);
- if (!g_file_test(to_open, G_FILE_TEST_IS_DIR))
+ gchar* to_open = g_build_filename (location, entry, (gchar*)NULL);
+ if (!g_file_test (to_open, G_FILE_TEST_IS_DIR))
{
- test_load_file(to_open);
+ test_load_file (to_open);
files_tested++;
}
- g_free(to_open);
+ g_free (to_open);
}
}
}
- g_dir_close(xml2_dir);
+ g_dir_close (xml2_dir);
if (files_tested == 0)
{
- failure("handled 0 files in test-load-xml2");
+ failure ("handled 0 files in test-load-xml2");
}
- print_test_results();
- qof_close();
- exit(get_rv());
+ print_test_results ();
+ qof_close ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-save-in-lang.cpp b/src/backend/xml/test/test-save-in-lang.cpp
index 89f6873..04214d0 100644
--- a/src/backend/xml/test/test-save-in-lang.cpp
+++ b/src/backend/xml/test/test-save-in-lang.cpp
@@ -39,7 +39,7 @@ extern "C"
}
#include "io-gncxml-v2.h"
-const char *possible_envs[] =
+const char* possible_envs[] =
{
"C", "af", "ar", "az", "be", "bg", "bg_BG.cp1251", "br", "ca", "cs",
"cy", "cz", "da", "de", "de_AT", "el", "en", "en_AU", "en_CA", "en_GB",
@@ -55,165 +55,165 @@ const char *possible_envs[] =
NULL
};
-const char *possible_vars[] =
+const char* possible_vars[] =
{
"LANG", "LC_CTYPE", "LC_COLLATE", "LC_TIME", "LC_NUMERIC",
"LC_MONETARY", "LC_MESSAGES",
NULL
};
-const char *diff_command = "cmp %s %s";
-const char *test_dir = "test-files/xml2";
-const char *base_env = "C";
+const char* diff_command = "cmp %s %s";
+const char* test_dir = "test-files/xml2";
+const char* base_env = "C";
static char*
-gen_new_file_name(const char *filename, const char *env)
+gen_new_file_name (const char* filename, const char* env)
{
- char *ret;
+ char* ret;
- ret = g_new(char, strlen(filename) + strlen(env) + 2);
- strcpy(ret, filename);
- strcat(ret, "-");
- strcat(ret, env);
+ ret = g_new (char, strlen (filename) + strlen (env) + 2);
+ strcpy (ret, filename);
+ strcat (ret, "-");
+ strcat (ret, env);
return ret;
}
static int
-run_command_get_return(const char *command)
+run_command_get_return (const char* command)
{
- return system(command);
+ return system (command);
}
-static char *
-test_file(const char *filename)
+static char*
+test_file (const char* filename)
{
int i;
for (i = 0; possible_envs[i] != NULL; i++)
{
QofBackendError err;
- QofSession *session;
- char *cmd;
- char *new_file = gen_new_file_name(filename, possible_envs[i]);
- QofSession *new_session;
+ QofSession* session;
+ char* cmd;
+ char* new_file = gen_new_file_name (filename, possible_envs[i]);
+ QofSession* new_session;
- session = qof_session_new();
+ session = qof_session_new ();
- qof_session_begin(session, filename, TRUE, FALSE, FALSE);
+ qof_session_begin (session, filename, TRUE, FALSE, FALSE);
err = qof_session_pop_error (session);
if (err)
{
- qof_session_destroy(session);
- return g_strdup_printf("qof_session_begin errorid %d", err);
+ qof_session_destroy (session);
+ return g_strdup_printf ("qof_session_begin errorid %d", err);
}
- qof_session_load(session, NULL);
+ qof_session_load (session, NULL);
err = qof_session_pop_error (session);
if (err)
{
- qof_session_destroy(session);
- return g_strdup_printf("qof_session_load errorid %d", err);
+ qof_session_destroy (session);
+ return g_strdup_printf ("qof_session_load errorid %d", err);
}
- if (!g_setenv("LANG", possible_envs[i], TRUE))
- return g_strdup("setenv for LANG");
+ if (!g_setenv ("LANG", possible_envs[i], TRUE))
+ return g_strdup ("setenv for LANG");
- new_session = qof_session_new();
+ new_session = qof_session_new ();
- qof_session_begin(new_session, new_file, FALSE, FALSE, FALSE);
+ qof_session_begin (new_session, new_file, FALSE, FALSE, FALSE);
err = qof_session_pop_error (new_session);
if (err)
{
- g_free(new_file);
- qof_session_destroy(session);
- qof_session_destroy(new_session);
- return g_strdup_printf("qof_session_begin 2 with LANG=%s",
- possible_envs[i]);
+ g_free (new_file);
+ qof_session_destroy (session);
+ qof_session_destroy (new_session);
+ return g_strdup_printf ("qof_session_begin 2 with LANG=%s",
+ possible_envs[i]);
}
- qof_session_save(new_session, NULL);
+ qof_session_save (new_session, NULL);
- cmd = g_strdup_printf(diff_command, filename, new_file);
+ cmd = g_strdup_printf (diff_command, filename, new_file);
- if (run_command_get_return(cmd) != 0)
+ if (run_command_get_return (cmd) != 0)
{
- g_free(cmd);
- g_free(new_file);
- qof_session_destroy(session);
- qof_session_destroy(new_session);
- return g_strdup_printf("run_command_get_return with LANG=%s",
- possible_envs[i]);
+ g_free (cmd);
+ g_free (new_file);
+ qof_session_destroy (session);
+ qof_session_destroy (new_session);
+ return g_strdup_printf ("run_command_get_return with LANG=%s",
+ possible_envs[i]);
}
- g_free(new_file);
- g_free(cmd);
- qof_session_destroy(session);
- qof_session_destroy(new_session);
+ g_free (new_file);
+ g_free (cmd);
+ qof_session_destroy (session);
+ qof_session_destroy (new_session);
}
return NULL;
}
int
-main(int argc, char **argv)
+main (int argc, char** argv)
{
- GDir *adir;
+ GDir* adir;
- gnc_engine_init(argc, argv);
- xaccLogDisable();
+ gnc_engine_init (argc, argv);
+ xaccLogDisable ();
- if ((adir = g_dir_open(test_dir, 0, NULL)) == NULL)
+ if ((adir = g_dir_open (test_dir, 0, NULL)) == NULL)
{
- failure_args("g_dir_open", __FILE__, __LINE__,
- "couldn't open dir %s", test_dir);
+ failure_args ("g_dir_open", __FILE__, __LINE__,
+ "couldn't open dir %s", test_dir);
}
else
{
- const gchar *next_file;
+ const gchar* next_file;
- while ((next_file = g_dir_read_name(adir)) != NULL)
+ while ((next_file = g_dir_read_name (adir)) != NULL)
{
struct stat file_info;
char* filename;
- filename = g_build_filename(test_dir, next_file, (gchar*) NULL);
+ filename = g_build_filename (test_dir, next_file, (gchar*) NULL);
- if (g_stat(filename, &file_info) != 0)
+ if (g_stat (filename, &file_info) != 0)
{
- failure_args("stat", __FILE__, __LINE__,
- "couldn't stat file %s: %s", filename,
- strerror(errno));
- g_free(filename);
+ failure_args ("stat", __FILE__, __LINE__,
+ "couldn't stat file %s: %s", filename,
+ strerror (errno));
+ g_free (filename);
break;
}
- if (!g_setenv("LANG", base_env, TRUE))
+ if (!g_setenv ("LANG", base_env, TRUE))
{
- failure_args("setenv", __FILE__, __LINE__,
- "setenv of LANG failed");
- g_free(filename);
+ failure_args ("setenv", __FILE__, __LINE__,
+ "setenv of LANG failed");
+ g_free (filename);
break;
}
- if (!S_ISDIR(file_info.st_mode))
+ if (!S_ISDIR (file_info.st_mode))
{
- char *msg = test_file(filename);
+ char* msg = test_file (filename);
if (msg != NULL)
{
- failure_args("test_file", __FILE__, __LINE__,
- "failure testing file %s with msg %s",
- filename, msg);
+ failure_args ("test_file", __FILE__, __LINE__,
+ "failure testing file %s with msg %s",
+ filename, msg);
}
- g_free(msg);
+ g_free (msg);
}
- g_free(filename);
+ g_free (filename);
}
- g_dir_close(adir);
+ g_dir_close (adir);
}
- print_test_results();
- exit(get_rv());
+ print_test_results ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-string-converters.cpp b/src/backend/xml/test/test-string-converters.cpp
index 0653810..8cbf726 100644
--- a/src/backend/xml/test/test-string-converters.cpp
+++ b/src/backend/xml/test/test-string-converters.cpp
@@ -34,9 +34,9 @@ extern "C"
#define GNC_V2_STRING "gnc-v2"
-const gchar *gnc_v2_xml_version_string = GNC_V2_STRING;
+const gchar* gnc_v2_xml_version_string = GNC_V2_STRING;
-static const char *test_strings[] =
+static const char* test_strings[] =
{
"FooBar",
"<Ugly crap>",
@@ -47,18 +47,18 @@ static const char *test_strings[] =
};
static void
-test_string_converters(void)
+test_string_converters (void)
{
int i;
for (i = 0; test_strings[i]; ++i)
{
- const char *mark = test_strings[i];
- xmlNodePtr test_node = text_to_dom_tree("test-string", mark);
- char *backout = dom_tree_to_text(test_node);
+ const char* mark = test_strings[i];
+ xmlNodePtr test_node = text_to_dom_tree ("test-string", mark);
+ char* backout = dom_tree_to_text (test_node);
- do_test_args(
- g_strcmp0(backout, mark) == 0,
+ do_test_args (
+ g_strcmp0 (backout, mark) == 0,
"string converting", __FILE__, __LINE__, "with string %s", mark);
}
}
@@ -66,24 +66,24 @@ test_string_converters(void)
static void
test_bad_string (void)
{
- const char *badstr = "foo\abar";
- const char *sanitized = "foo?bar";
+ const char* badstr = "foo\abar";
+ const char* sanitized = "foo?bar";
xmlNodePtr test_node = text_to_dom_tree ("test-string", badstr);
- char *backout = dom_tree_to_text (test_node);
+ char* backout = dom_tree_to_text (test_node);
do_test_args (g_strcmp0 (backout, sanitized) == 0,
- "string sanitizing", __FILE__, __LINE__,
- "with string %s", badstr);
+ "string sanitizing", __FILE__, __LINE__,
+ "with string %s", badstr);
}
int
-main(int argc, char **argv)
+main (int argc, char** argv)
{
- qof_log_init();
- fflush(stdout);
- test_string_converters();
+ qof_log_init ();
+ fflush (stdout);
+ test_string_converters ();
test_bad_string ();
- fflush(stdout);
- print_test_results();
- exit(get_rv());
+ fflush (stdout);
+ print_test_results ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-xml-account.cpp b/src/backend/xml/test/test-xml-account.cpp
index 75ac7c2..352e259 100644
--- a/src/backend/xml/test/test-xml-account.cpp
+++ b/src/backend/xml/test/test-xml-account.cpp
@@ -46,10 +46,10 @@ extern "C"
#include "../sixtp-dom-parsers.h"
#include "test-file-stuff.h"
-static QofBook *sixbook;
+static QofBook* sixbook;
static gchar*
-node_and_account_equal(xmlNodePtr node, Account *act)
+node_and_account_equal (xmlNodePtr node, Account* act)
{
xmlNodePtr mark;
@@ -58,135 +58,136 @@ node_and_account_equal(xmlNodePtr node, Account *act)
node = node->next;
}
- if (!check_dom_tree_version(node, "2.0.0"))
+ if (!check_dom_tree_version (node, "2.0.0"))
{
- return g_strdup("version wrong. Not 2.0.0 or not there");
+ return g_strdup ("version wrong. Not 2.0.0 or not there");
}
- if (!node->name || g_strcmp0((char*)node->name, "gnc:account"))
+ if (!node->name || g_strcmp0 ((char*)node->name, "gnc:account"))
{
- return g_strdup("Name of toplevel node is bad");
+ return g_strdup ("Name of toplevel node is bad");
}
for (mark = node->xmlChildrenNode; mark; mark = mark->next)
{
- if (g_strcmp0((char*)mark->name, "text") == 0)
+ if (g_strcmp0 ((char*)mark->name, "text") == 0)
{
}
- else if (g_strcmp0((char*)mark->name, "act:name") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:name") == 0)
{
- if (!equals_node_val_vs_string(mark, xaccAccountGetName(act)))
+ if (!equals_node_val_vs_string (mark, xaccAccountGetName (act)))
{
- return g_strdup("names differ");
+ return g_strdup ("names differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:id") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:id") == 0)
{
- if (!equals_node_val_vs_guid(mark, xaccAccountGetGUID(act)))
+ if (!equals_node_val_vs_guid (mark, xaccAccountGetGUID (act)))
{
- return g_strdup("ids differ");
+ return g_strdup ("ids differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:type") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:type") == 0)
{
- gchar *txt;
+ gchar* txt;
GNCAccountType type;
- txt = dom_tree_to_text(mark);
+ txt = dom_tree_to_text (mark);
if (!txt)
{
- return g_strdup("couldn't get type string");
+ return g_strdup ("couldn't get type string");
}
- else if (!xaccAccountStringToType(txt, &type))
+ else if (!xaccAccountStringToType (txt, &type))
{
- g_free(txt);
- return g_strdup("couldn't convert type string to int");
+ g_free (txt);
+ return g_strdup ("couldn't convert type string to int");
}
- else if (type != xaccAccountGetType(act))
+ else if (type != xaccAccountGetType (act))
{
- g_free(txt);
- return g_strdup("types differ");
+ g_free (txt);
+ return g_strdup ("types differ");
}
else
{
- g_free(txt);
+ g_free (txt);
}
}
- else if (g_strcmp0((char*)mark->name, "act:commodity") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:commodity") == 0)
{
/* This is somewhat BS, because if the commodity isn't a
currency (and therefore built in) there isn't a
corresponding currency in the XML, skip the test. jralls
2010-11-02 */
- if (xaccAccountGetCommodity(act) == NULL) continue;
- if (!equals_node_val_vs_commodity(
- mark, xaccAccountGetCommodity(act),
- gnc_account_get_book(act)))
+ if (xaccAccountGetCommodity (act) == NULL) continue;
+ if (!equals_node_val_vs_commodity (
+ mark, xaccAccountGetCommodity (act),
+ gnc_account_get_book (act)))
{
- return g_strdup("commodities differ");
+ return g_strdup ("commodities differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:code") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:code") == 0)
{
- if (!equals_node_val_vs_string(mark, xaccAccountGetCode(act)))
+ if (!equals_node_val_vs_string (mark, xaccAccountGetCode (act)))
{
- return g_strdup("codes differ");
+ return g_strdup ("codes differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:description") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:description") == 0)
{
- if (!equals_node_val_vs_string(
- mark, xaccAccountGetDescription(act)))
+ if (!equals_node_val_vs_string (
+ mark, xaccAccountGetDescription (act)))
{
- return g_strdup("descriptions differ");
+ return g_strdup ("descriptions differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:slots") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:slots") == 0)
{
/* xaccAccountDeleteOldData (act); */
- if (!equals_node_val_vs_kvp_frame(mark, qof_instance_get_slots(QOF_INSTANCE (act))))
+ if (!equals_node_val_vs_kvp_frame (mark,
+ qof_instance_get_slots (QOF_INSTANCE (act))))
{
- return g_strdup("slots differ");
+ return g_strdup ("slots differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:parent") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:parent") == 0)
{
- if (!equals_node_val_vs_guid(
- mark, xaccAccountGetGUID(gnc_account_get_parent(act))))
+ if (!equals_node_val_vs_guid (
+ mark, xaccAccountGetGUID (gnc_account_get_parent (act))))
{
- return g_strdup("parent ids differ");
+ return g_strdup ("parent ids differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:commodity-scu") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:commodity-scu") == 0)
{
- if (!equals_node_val_vs_int(mark, xaccAccountGetCommoditySCU(act)))
+ if (!equals_node_val_vs_int (mark, xaccAccountGetCommoditySCU (act)))
{
- return g_strdup("commodity scus differ");
+ return g_strdup ("commodity scus differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:hidden") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:hidden") == 0)
{
- if (!equals_node_val_vs_boolean(mark, xaccAccountGetHidden(act)))
+ if (!equals_node_val_vs_boolean (mark, xaccAccountGetHidden (act)))
{
- return g_strdup("Hidden flags differ");
+ return g_strdup ("Hidden flags differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:placeholder") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:placeholder") == 0)
{
- if (!equals_node_val_vs_boolean(mark, xaccAccountGetPlaceholder(act)))
+ if (!equals_node_val_vs_boolean (mark, xaccAccountGetPlaceholder (act)))
{
- return g_strdup("Placeholder flags differ");
+ return g_strdup ("Placeholder flags differ");
}
}
- else if (g_strcmp0((char*)mark->name, "act:security") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "act:security") == 0)
{
return NULL; // This tag is ignored.
}
else
{
- return g_strdup_printf("unknown node in dom tree: %s", mark->name);
+ return g_strdup_printf ("unknown node in dom tree: %s", mark->name);
}
}
@@ -194,27 +195,27 @@ node_and_account_equal(xmlNodePtr node, Account *act)
}
static void
-delete_random_account(Account *act)
+delete_random_account (Account* act)
{
- xaccAccountBeginEdit(act);
- xaccAccountDestroy(act);
+ xaccAccountBeginEdit (act);
+ xaccAccountDestroy (act);
}
struct act_data_struct
{
- Account *act;
+ Account* act;
int value;
};
typedef struct act_data_struct act_data;
static gboolean
-test_add_account(const char *tag, gpointer globaldata, gpointer data)
+test_add_account (const char* tag, gpointer globaldata, gpointer data)
{
- Account *account = static_cast<decltype(account)>(data);
- act_data *gdata = (act_data*)globaldata;
- gnc_commodity * com;
- gnc_commodity * new_com;
- gnc_commodity_table *t;
+ Account* account = static_cast<decltype (account)> (data);
+ act_data* gdata = (act_data*)globaldata;
+ gnc_commodity* com;
+ gnc_commodity* new_com;
+ gnc_commodity_table* t;
com = xaccAccountGetCommodity (account);
@@ -229,68 +230,68 @@ test_add_account(const char *tag, gpointer globaldata, gpointer data)
xaccAccountSetCommodity (account, new_com);
}
- do_test_args(xaccAccountEqual((Account*)account, (Account*)(gdata->act),
- TRUE),
- "gnc_account_sixtp_parser_create",
- __FILE__, __LINE__, "%d", gdata->value );
+ do_test_args (xaccAccountEqual ((Account*)account, (Account*) (gdata->act),
+ TRUE),
+ "gnc_account_sixtp_parser_create",
+ __FILE__, __LINE__, "%d", gdata->value);
return TRUE;
}
static void
-test_account(int i, Account *test_act)
+test_account (int i, Account* test_act)
{
xmlNodePtr test_node;
- gchar *filename1;
- gchar *compare_msg;
+ gchar* filename1;
+ gchar* compare_msg;
int fd;
- test_node = gnc_account_dom_tree_create(test_act, FALSE, TRUE);
+ test_node = gnc_account_dom_tree_create (test_act, FALSE, TRUE);
if (!test_node)
{
- failure_args("account_xml", __FILE__, __LINE__,
- "gnc_account_dom_tree_create returned NULL");
+ failure_args ("account_xml", __FILE__, __LINE__,
+ "gnc_account_dom_tree_create returned NULL");
return;
}
- if ((compare_msg = node_and_account_equal(test_node, test_act)) != NULL)
+ if ((compare_msg = node_and_account_equal (test_node, test_act)) != NULL)
{
- failure_args("account_xml", __FILE__, __LINE__,
- "node and account were not equal: %s", compare_msg);
- xmlElemDump(stdout, NULL, test_node);
- fprintf(stdout, "\n");
- xmlFreeNode(test_node);
- g_free(compare_msg);
+ failure_args ("account_xml", __FILE__, __LINE__,
+ "node and account were not equal: %s", compare_msg);
+ xmlElemDump (stdout, NULL, test_node);
+ fprintf (stdout, "\n");
+ xmlFreeNode (test_node);
+ g_free (compare_msg);
return;
}
else
{
- success("account_xml");
+ success ("account_xml");
}
- filename1 = g_strdup_printf("test_file_XXXXXX");
+ filename1 = g_strdup_printf ("test_file_XXXXXX");
- fd = g_mkstemp(filename1);
+ fd = g_mkstemp (filename1);
- write_dom_node_to_file(test_node, fd);
+ write_dom_node_to_file (test_node, fd);
- close(fd);
+ close (fd);
{
- sixtp *parser;
+ sixtp* parser;
act_data data;
data.act = test_act;
data.value = i;
- parser = gnc_account_sixtp_parser_create();
+ parser = gnc_account_sixtp_parser_create ();
- if (!gnc_xml_parse_file(parser, filename1, test_add_account,
- &data, sixbook))
+ if (!gnc_xml_parse_file (parser, filename1, test_add_account,
+ &data, sixbook))
{
- failure_args("gnc_xml_parse_file returned FALSE",
- __FILE__, __LINE__, "%d", i);
+ failure_args ("gnc_xml_parse_file returned FALSE",
+ __FILE__, __LINE__, "%d", i);
}
/* no handling of circular data structures. We'll do that later */
@@ -298,48 +299,51 @@ test_account(int i, Account *test_act)
}
- g_unlink(filename1);
- g_free(filename1);
- xmlFreeNode(test_node);
+ g_unlink (filename1);
+ g_free (filename1);
+ xmlFreeNode (test_node);
}
static void
-test_generation()
+test_generation ()
{
int i;
for (i = 0; i < 20; i++)
{
- Account *ran_act;
+ Account* ran_act;
- ran_act = get_random_account(sixbook);
+ ran_act = get_random_account (sixbook);
- test_account(i, ran_act);
+ test_account (i, ran_act);
- delete_random_account(ran_act);
+ delete_random_account (ran_act);
}
{
/* empty some things. */
- Account *act;
- const char *msg = "xaccAccountSetCommodity: assertion `GNC_IS_COMMODITY(com)' failed";
- const char *logdomain = "gnc.engine";
- GLogLevelFlags loglevel = static_cast<decltype(loglevel)>(G_LOG_LEVEL_CRITICAL);
- TestErrorStruct check = { loglevel, const_cast<char*>(logdomain),
- const_cast<char*>(msg) };
+ Account* act;
+ const char* msg =
+ "xaccAccountSetCommodity: assertion `GNC_IS_COMMODITY(com)' failed";
+ const char* logdomain = "gnc.engine";
+ GLogLevelFlags loglevel = static_cast<decltype (loglevel)>
+ (G_LOG_LEVEL_CRITICAL);
+ TestErrorStruct check = { loglevel, const_cast<char*> (logdomain),
+ const_cast<char*> (msg)
+ };
g_log_set_handler (logdomain, loglevel,
(GLogFunc)test_checked_handler, &check);
- act = get_random_account(sixbook);
+ act = get_random_account (sixbook);
- xaccAccountSetCode(act, "");
- xaccAccountSetDescription(act, "");
+ xaccAccountSetCode (act, "");
+ xaccAccountSetDescription (act, "");
- xaccAccountSetCommodity(act, NULL);
+ xaccAccountSetCommodity (act, NULL);
- test_account(-1, act);
+ test_account (-1, act);
- delete_random_account(act);
+ delete_random_account (act);
}
/* { */
@@ -361,46 +365,46 @@ test_generation()
}
static gboolean
-test_real_account(const char *tag, gpointer global_data, gpointer data)
+test_real_account (const char* tag, gpointer global_data, gpointer data)
{
- char *msg;
- Account *act = (Account*)data;
+ char* msg;
+ Account* act = (Account*)data;
- if (!gnc_account_get_parent(act))
+ if (!gnc_account_get_parent (act))
{
- gnc_account_append_child(gnc_book_get_root_account(sixbook), act);
+ gnc_account_append_child (gnc_book_get_root_account (sixbook), act);
}
- msg = node_and_account_equal((xmlNodePtr)global_data, act);
- do_test_args(msg == NULL, "test_real_account",
- __FILE__, __LINE__, msg);
+ msg = node_and_account_equal ((xmlNodePtr)global_data, act);
+ do_test_args (msg == NULL, "test_real_account",
+ __FILE__, __LINE__, msg);
- g_free(msg);
+ g_free (msg);
return TRUE;
}
int
-main (int argc, char ** argv)
+main (int argc, char** argv)
{
- QofSession *session;
+ QofSession* session;
- qof_init();
- cashobjects_register();
- session = qof_session_new();
+ qof_init ();
+ cashobjects_register ();
+ session = qof_session_new ();
sixbook = qof_session_get_book (session);
if (argc > 1)
{
- test_files_in_dir(argc, argv, test_real_account,
- gnc_account_sixtp_parser_create(),
- "gnc:account", sixbook);
+ test_files_in_dir (argc, argv, test_real_account,
+ gnc_account_sixtp_parser_create (),
+ "gnc:account", sixbook);
}
else
{
- test_generation();
+ test_generation ();
}
- qof_session_destroy(session);
- print_test_results();
- qof_close();
- exit(get_rv());
+ qof_session_destroy (session);
+ print_test_results ();
+ qof_close ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-xml-commodity.cpp b/src/backend/xml/test/test-xml-commodity.cpp
index 049f972..afb9d0e 100644
--- a/src/backend/xml/test/test-xml-commodity.cpp
+++ b/src/backend/xml/test/test-xml-commodity.cpp
@@ -42,100 +42,100 @@ extern "C"
#include "io-gncxml-gen.h"
#include "test-file-stuff.h"
-static QofBook *book;
+static QofBook* book;
static const char*
-node_and_commodity_equal(xmlNodePtr node, const gnc_commodity *com)
+node_and_commodity_equal (xmlNodePtr node, const gnc_commodity* com)
{
xmlNodePtr mark;
while (g_strcmp0 ((char*)node->name, "text") == 0)
node = node->next;
- if (!check_dom_tree_version(node, "2.0.0"))
+ if (!check_dom_tree_version (node, "2.0.0"))
{
return "version wrong. Not 2.0.0 or not there";
}
- if (!node->name || g_strcmp0((char*)node->name, "gnc:commodity"))
+ if (!node->name || g_strcmp0 ((char*)node->name, "gnc:commodity"))
{
return "Name of toplevel node is bad";
}
for (mark = node->xmlChildrenNode; mark; mark = mark->next)
{
- if (g_strcmp0((char*)mark->name, "text") == 0)
+ if (g_strcmp0 ((char*)mark->name, "text") == 0)
{
}
- else if (g_strcmp0((char*)mark->name, "cmdty:space") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "cmdty:space") == 0)
{
- if (!equals_node_val_vs_string(
- mark, gnc_commodity_get_namespace_compat(com)))
+ if (!equals_node_val_vs_string (
+ mark, gnc_commodity_get_namespace_compat (com)))
{
return "namespaces differ";
}
}
- else if (g_strcmp0((char*)mark->name, "cmdty:id") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "cmdty:id") == 0)
{
- if (!equals_node_val_vs_string(
- mark, gnc_commodity_get_mnemonic(com)))
+ if (!equals_node_val_vs_string (
+ mark, gnc_commodity_get_mnemonic (com)))
{
return "mnemonic differ";
}
}
- else if (g_strcmp0((char*)mark->name, "cmdty:name") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "cmdty:name") == 0)
{
- if (!equals_node_val_vs_string(
- mark, gnc_commodity_get_fullname(com)))
+ if (!equals_node_val_vs_string (
+ mark, gnc_commodity_get_fullname (com)))
{
return "names differ";
}
}
- else if (g_strcmp0((char*)mark->name, "cmdty:xcode") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "cmdty:xcode") == 0)
{
- if (!equals_node_val_vs_string(
- mark, gnc_commodity_get_cusip(com)))
+ if (!equals_node_val_vs_string (
+ mark, gnc_commodity_get_cusip (com)))
{
return "exchange codes differ";
}
}
- else if (g_strcmp0((char*)mark->name, "cmdty:fraction") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "cmdty:fraction") == 0)
{
- gchar *txt;
+ gchar* txt;
gint64 type;
- txt = dom_tree_to_text(mark);
+ txt = dom_tree_to_text (mark);
if (!txt)
{
return "couldn't get fraction string";
}
- else if (!string_to_gint64(txt, &type))
+ else if (!string_to_gint64 (txt, &type))
{
- g_free(txt);
+ g_free (txt);
return "couldn't convert fraction string to int";
}
- else if (type != gnc_commodity_get_fraction(com))
+ else if (type != gnc_commodity_get_fraction (com))
{
- g_free(txt);
+ g_free (txt);
return "fractions differ";
}
else
{
- g_free(txt);
+ g_free (txt);
}
}
- else if (g_strcmp0((char*)mark->name, "cmdty:slots") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "cmdty:slots") == 0)
{
- if (!equals_node_val_vs_kvp_frame(mark,
- gnc_commodity_get_kvp_frame(com)))
+ if (!equals_node_val_vs_kvp_frame (mark,
+ gnc_commodity_get_kvp_frame (com)))
return "slots differ";
}
/* Legitimate tags which we don't yet have tests */
- else if (g_strcmp0((char*)mark->name, "cmdty:get_quotes") == 0 ||
- g_strcmp0((char*)mark->name, "cmdty:quote_source") == 0 ||
- g_strcmp0((char*)mark->name, "cmdty:quote_tz") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "cmdty:get_quotes") == 0 ||
+ g_strcmp0 ((char*)mark->name, "cmdty:quote_source") == 0 ||
+ g_strcmp0 ((char*)mark->name, "cmdty:quote_tz") == 0)
{
continue;
}
@@ -150,126 +150,126 @@ node_and_commodity_equal(xmlNodePtr node, const gnc_commodity *com)
struct com_data_struct
{
- gnc_commodity *com;
+ gnc_commodity* com;
int value;
};
typedef struct com_data_struct com_data;
static gboolean
-test_add_commodity(const char *tag, gpointer globaldata, gpointer data)
+test_add_commodity (const char* tag, gpointer globaldata, gpointer data)
{
- com_data *gdata = (com_data*)globaldata;
+ com_data* gdata = (com_data*)globaldata;
- do_test_args(gnc_commodity_equiv((gnc_commodity*)data, gdata->com),
- "gnc_commodity_sixtp_parser_create",
- __FILE__, __LINE__, "%d", gdata->value );
- gnc_commodity_destroy((gnc_commodity*)data);
+ do_test_args (gnc_commodity_equiv ((gnc_commodity*)data, gdata->com),
+ "gnc_commodity_sixtp_parser_create",
+ __FILE__, __LINE__, "%d", gdata->value);
+ gnc_commodity_destroy ((gnc_commodity*)data);
return TRUE;
}
static void
-test_generation(void)
+test_generation (void)
{
int i;
for (i = 0; i < 20; i++)
{
- gnc_commodity *ran_com;
+ gnc_commodity* ran_com;
xmlNodePtr test_node;
- gchar *filename1;
+ gchar* filename1;
int fd;
- ran_com = get_random_commodity(book);
+ ran_com = get_random_commodity (book);
- test_node = gnc_commodity_dom_tree_create(ran_com);
+ test_node = gnc_commodity_dom_tree_create (ran_com);
if (!test_node)
{
- failure_args("commodity_xml", __FILE__, __LINE__,
- "gnc_commodity_dom_tree_create returned NULL");
- gnc_commodity_destroy(ran_com);
+ failure_args ("commodity_xml", __FILE__, __LINE__,
+ "gnc_commodity_dom_tree_create returned NULL");
+ gnc_commodity_destroy (ran_com);
continue;
}
- auto compare_msg = node_and_commodity_equal(test_node, ran_com);
+ auto compare_msg = node_and_commodity_equal (test_node, ran_com);
if (compare_msg != nullptr)
{
- failure_args("commodity_xml", __FILE__, __LINE__,
- "node and commodity were not equal: %s", compare_msg);
- xmlElemDump(stdout, NULL, test_node);
- xmlFreeNode(test_node);
- gnc_commodity_destroy(ran_com);
+ failure_args ("commodity_xml", __FILE__, __LINE__,
+ "node and commodity were not equal: %s", compare_msg);
+ xmlElemDump (stdout, NULL, test_node);
+ xmlFreeNode (test_node);
+ gnc_commodity_destroy (ran_com);
continue;
}
else
{
- success_args("commodity_xml", __FILE__, __LINE__, "%d", i);
+ success_args ("commodity_xml", __FILE__, __LINE__, "%d", i);
}
- filename1 = g_strdup_printf("test_file_XXXXXX");
+ filename1 = g_strdup_printf ("test_file_XXXXXX");
- fd = g_mkstemp(filename1);
+ fd = g_mkstemp (filename1);
- write_dom_node_to_file(test_node, fd);
+ write_dom_node_to_file (test_node, fd);
- close(fd);
+ close (fd);
{
- sixtp *parser;
+ sixtp* parser;
com_data data;
data.com = ran_com;
data.value = i;
- parser = gnc_commodity_sixtp_parser_create();
+ parser = gnc_commodity_sixtp_parser_create ();
- if (!gnc_xml_parse_file(parser, filename1, test_add_commodity,
- (gpointer)&data, book))
+ if (!gnc_xml_parse_file (parser, filename1, test_add_commodity,
+ (gpointer)&data, book))
{
- failure_args("gnc_xml_parse_file returned FALSE",
- __FILE__, __LINE__, "%d", i);
+ failure_args ("gnc_xml_parse_file returned FALSE",
+ __FILE__, __LINE__, "%d", i);
}
/* no handling of circular data structures. We'll do that later */
/* sixtp_destroy(parser); */
}
- g_unlink(filename1);
- g_free(filename1);
- gnc_commodity_destroy(ran_com);
- xmlFreeNode(test_node);
+ g_unlink (filename1);
+ g_free (filename1);
+ gnc_commodity_destroy (ran_com);
+ xmlFreeNode (test_node);
}
}
static gboolean
-test_real_commodity(const char *tag, gpointer globaldata, gpointer data)
+test_real_commodity (const char* tag, gpointer globaldata, gpointer data)
{
- const char *msg = node_and_commodity_equal((xmlNodePtr)globaldata,
- (gnc_commodity*)data);
- do_test_args(msg == NULL, "test_real_commodity",
- __FILE__, __LINE__, msg);
- gnc_commodity_destroy((gnc_commodity*)data);
+ const char* msg = node_and_commodity_equal ((xmlNodePtr)globaldata,
+ (gnc_commodity*)data);
+ do_test_args (msg == NULL, "test_real_commodity",
+ __FILE__, __LINE__, msg);
+ gnc_commodity_destroy ((gnc_commodity*)data);
return TRUE;
}
int
-main(int argc, char **argv)
+main (int argc, char** argv)
{
g_setenv ("GNC_UNINSTALLED", "1", TRUE);
- gnc_engine_init(argc, argv);
+ gnc_engine_init (argc, argv);
book = qof_book_new ();
if (argc > 1)
{
- test_files_in_dir(argc, argv, test_real_commodity,
- gnc_commodity_sixtp_parser_create(),
- "gnc:commodity", book);
+ test_files_in_dir (argc, argv, test_real_commodity,
+ gnc_commodity_sixtp_parser_create (),
+ "gnc:commodity", book);
}
else
{
- test_generation();
+ test_generation ();
}
- print_test_results();
- exit(get_rv());
+ print_test_results ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-xml-pricedb.cpp b/src/backend/xml/test/test-xml-pricedb.cpp
index 164e542..efbf249 100644
--- a/src/backend/xml/test/test-xml-pricedb.cpp
+++ b/src/backend/xml/test/test-xml-pricedb.cpp
@@ -46,17 +46,17 @@ extern "C"
#include "io-gncxml-v2.h"
#include "test-file-stuff.h"
-static QofSession *session;
+static QofSession* session;
static int iter;
static gboolean
-test_add_pricedb (const char *tag, gpointer globaldata, gpointer data)
+test_add_pricedb (const char* tag, gpointer globaldata, gpointer data)
{
- sixtp_gdv2 *gdata = static_cast<decltype(gdata)>(globaldata);
- GNCPriceDB *db1 = static_cast<decltype(db1)>(data);
- GNCPriceDB *db2 = gnc_pricedb_get_db (gdata->book);
+ sixtp_gdv2* gdata = static_cast<decltype (gdata)> (globaldata);
+ GNCPriceDB* db1 = static_cast<decltype (db1)> (data);
+ GNCPriceDB* db2 = gnc_pricedb_get_db (gdata->book);
- do_test_args (gnc_pricedb_equal(db1, db2),
+ do_test_args (gnc_pricedb_equal (db1, db2),
"gnc_pricedb_sixtp_parser_create",
__FILE__, __LINE__, "%d", iter);
@@ -64,12 +64,12 @@ test_add_pricedb (const char *tag, gpointer globaldata, gpointer data)
}
static void
-test_db (GNCPriceDB *db)
+test_db (GNCPriceDB* db)
{
xmlNodePtr test_node;
- gchar *filename1;
+ gchar* filename1;
int fd;
- QofBook *book = qof_instance_get_book (QOF_INSTANCE (db));
+ QofBook* book = qof_instance_get_book (QOF_INSTANCE (db));
test_node = gnc_pricedb_dom_tree_create (db);
@@ -93,15 +93,15 @@ test_db (GNCPriceDB *db)
{
sixtp *parser;
- load_counter lc = {0, 0, 0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0};
+ load_counter lc = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
sixtp_gdv2 data = {book, lc, NULL, NULL, FALSE};
parser = sixtp_new ();
if (!sixtp_add_some_sub_parsers
- (parser, TRUE,
- "gnc:pricedb", gnc_pricedb_sixtp_parser_create(),
- NULL, NULL))
+ (parser, TRUE,
+ "gnc:pricedb", gnc_pricedb_sixtp_parser_create (),
+ NULL, NULL))
{
failure_args ("sixtp_add_some_sub_parsers failed",
__FILE__, __LINE__, "%d", iter);
@@ -125,9 +125,9 @@ test_generation (void)
{
for (iter = 0; iter < 20; iter++)
{
- GNCPriceDB *db;
- g_message("iter=%d", iter);
- session = qof_session_new();
+ GNCPriceDB* db;
+ g_message ("iter=%d", iter);
+ session = qof_session_new ();
db = get_random_pricedb (qof_session_get_book (session));
if (!db)
{
@@ -139,21 +139,21 @@ test_generation (void)
test_db (db);
gnc_pricedb_destroy (db);
- qof_session_end(session);
+ qof_session_end (session);
}
}
int
-main (int argc, char ** argv)
+main (int argc, char** argv)
{
- qof_init();
- cashobjects_register();
+ qof_init ();
+ cashobjects_register ();
//qof_log_init_filename("/tmp/gnctest.trace");
//qof_log_set_default(QOF_LOG_DETAIL);
//qof_log_set_level(GNC_MOD_PRICE, QOF_LOG_DETAIL);
session = qof_session_new ();
test_generation ();
print_test_results ();
- qof_close();
- exit(get_rv());
+ qof_close ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-xml-transaction.cpp b/src/backend/xml/test/test-xml-transaction.cpp
index 02f7a5f..9247fda 100644
--- a/src/backend/xml/test/test-xml-transaction.cpp
+++ b/src/backend/xml/test/test-xml-transaction.cpp
@@ -54,12 +54,12 @@ extern "C"
#include "../io-gncxml-gen.h"
#include <test-file-stuff.h>
-static QofBook *book;
+static QofBook* book;
extern gboolean gnc_transaction_xml_v2_testing;
static xmlNodePtr
-find_appropriate_node(xmlNodePtr node, Split *spl)
+find_appropriate_node (xmlNodePtr node, Split* spl)
{
xmlNodePtr mark;
@@ -71,27 +71,27 @@ find_appropriate_node(xmlNodePtr node, Split *spl)
for (mark2 = mark->xmlChildrenNode; mark2; mark2 = mark2->next)
{
- if (g_strcmp0((char*)mark2->name, "split:value") == 0)
+ if (g_strcmp0 ((char*)mark2->name, "split:value") == 0)
{
- gnc_numeric *num = dom_tree_to_gnc_numeric(mark2);
+ gnc_numeric* num = dom_tree_to_gnc_numeric (mark2);
- if (gnc_numeric_equal(*num, xaccSplitGetValue(spl)))
+ if (gnc_numeric_equal (*num, xaccSplitGetValue (spl)))
{
amount_good = TRUE;
}
- g_free(num);
+ g_free (num);
}
- else if (g_strcmp0((char*)mark2->name, "split:account") == 0)
+ else if (g_strcmp0 ((char*)mark2->name, "split:account") == 0)
{
- GncGUID *accid = dom_tree_to_guid(mark2);
- Account *account = xaccSplitGetAccount (spl);
+ GncGUID* accid = dom_tree_to_guid (mark2);
+ Account* account = xaccSplitGetAccount (spl);
- if (guid_equal(accid, xaccAccountGetGUID(account)))
+ if (guid_equal (accid, xaccAccountGetGUID (account)))
{
account_guid_good = TRUE;
}
- g_free(accid);
+ g_free (accid);
}
if (account_guid_good && amount_good)
@@ -104,128 +104,128 @@ find_appropriate_node(xmlNodePtr node, Split *spl)
return NULL;
}
-static const char *
-equals_node_val_vs_split_internal(xmlNodePtr node, Split* spl)
+static const char*
+equals_node_val_vs_split_internal (xmlNodePtr node, Split* spl)
{
xmlNodePtr mark;
for (mark = node->children; mark != NULL; mark = mark->next)
{
- if (g_strcmp0((char*)mark->name, "split:id") == 0)
+ if (g_strcmp0 ((char*)mark->name, "split:id") == 0)
{
- GncGUID *id = dom_tree_to_guid(mark);
+ GncGUID* id = dom_tree_to_guid (mark);
- if (!guid_equal(id, xaccSplitGetGUID(spl)))
+ if (!guid_equal (id, xaccSplitGetGUID (spl)))
{
- g_free(id);
+ g_free (id);
return "ids differ";
}
- g_free(id);
+ g_free (id);
}
- else if (g_strcmp0((char*)mark->name, "split:memo") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "split:memo") == 0)
{
- char *memo = dom_tree_to_text(mark);
+ char* memo = dom_tree_to_text (mark);
- if (g_strcmp0(memo, xaccSplitGetMemo(spl)) != 0)
+ if (g_strcmp0 (memo, xaccSplitGetMemo (spl)) != 0)
{
- g_free(memo);
+ g_free (memo);
return "memos differ";
}
- g_free(memo);
+ g_free (memo);
}
- else if (g_strcmp0((char*)mark->name, "split:reconciled-state") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "split:reconciled-state") == 0)
{
- char *rs = dom_tree_to_text(mark);
+ char* rs = dom_tree_to_text (mark);
- if (rs[0] != xaccSplitGetReconcile(spl))
+ if (rs[0] != xaccSplitGetReconcile (spl))
{
- g_free(rs);
+ g_free (rs);
return "states differ";
}
- g_free(rs);
+ g_free (rs);
}
- else if (g_strcmp0((char*)mark->name, "split:value") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "split:value") == 0)
{
- gnc_numeric *num = dom_tree_to_gnc_numeric(mark);
- gnc_numeric val = xaccSplitGetValue(spl);
+ gnc_numeric* num = dom_tree_to_gnc_numeric (mark);
+ gnc_numeric val = xaccSplitGetValue (spl);
- if (!gnc_numeric_equal(*num, val))
+ if (!gnc_numeric_equal (*num, val))
{
- g_free(num);
+ g_free (num);
return g_strdup_printf ("values differ: %" G_GINT64_FORMAT "/%"
G_GINT64_FORMAT " v %" G_GINT64_FORMAT
"/%" G_GINT64_FORMAT,
(*num).num, (*num).denom,
val.num, val.denom);
}
- g_free(num);
+ g_free (num);
}
- else if (g_strcmp0((char*)mark->name, "split:quantity") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "split:quantity") == 0)
{
- gnc_numeric *num = dom_tree_to_gnc_numeric(mark);
- gnc_numeric val = xaccSplitGetAmount(spl);
+ gnc_numeric* num = dom_tree_to_gnc_numeric (mark);
+ gnc_numeric val = xaccSplitGetAmount (spl);
- if (!gnc_numeric_equal(*num, val))
+ if (!gnc_numeric_equal (*num, val))
{
- return g_strdup_printf( "quantities differ under _equal: %"
+ return g_strdup_printf ("quantities differ under _equal: %"
G_GINT64_FORMAT "/%" G_GINT64_FORMAT
" v %" G_GINT64_FORMAT "/%"
G_GINT64_FORMAT,
(*num).num, (*num).denom,
- val.num, val.denom );
+ val.num, val.denom);
}
- if (!gnc_numeric_equal(*num, val))
+ if (!gnc_numeric_equal (*num, val))
{
- g_free(num);
+ g_free (num);
return g_strdup_printf ("quantities differ: %" G_GINT64_FORMAT
"/%" G_GINT64_FORMAT " v %"
G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
(*num).num, (*num).denom,
val.num, val.denom);
}
- g_free(num);
+ g_free (num);
}
- else if (g_strcmp0((char*)mark->name, "split:account") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "split:account") == 0)
{
- GncGUID *id = dom_tree_to_guid(mark);
- Account *account = xaccSplitGetAccount (spl);
+ GncGUID* id = dom_tree_to_guid (mark);
+ Account* account = xaccSplitGetAccount (spl);
- if (!guid_equal(id, xaccAccountGetGUID(account)))
+ if (!guid_equal (id, xaccAccountGetGUID (account)))
{
- g_free(id);
+ g_free (id);
return "accounts differ";
}
- g_free(id);
+ g_free (id);
}
}
return NULL;
}
-static const char *
-equals_node_val_vs_splits(xmlNodePtr node, const Transaction *trn)
+static const char*
+equals_node_val_vs_splits (xmlNodePtr node, const Transaction* trn)
{
xmlNodePtr spl_node;
- Split *spl_mark;
+ Split* spl_mark;
int i;
- g_return_val_if_fail(node, FALSE);
- g_return_val_if_fail(node->xmlChildrenNode, FALSE);
+ g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (node->xmlChildrenNode, FALSE);
- for (i = 0, spl_mark = xaccTransGetSplit((Transaction*)trn, i);
- spl_mark;
- i++, spl_mark = xaccTransGetSplit((Transaction*)trn, i))
+ for (i = 0, spl_mark = xaccTransGetSplit ((Transaction*)trn, i);
+ spl_mark;
+ i++, spl_mark = xaccTransGetSplit ((Transaction*)trn, i))
{
- spl_node = find_appropriate_node(node, spl_mark);
+ spl_node = find_appropriate_node (node, spl_mark);
if (!spl_node)
{
- gchar guidstr[GUID_ENCODING_LENGTH+1];
- guid_to_string_buff(xaccSplitGetGUID(spl_mark),guidstr);
- g_print( "Split GUID %s", guidstr );
+ gchar guidstr[GUID_ENCODING_LENGTH + 1];
+ guid_to_string_buff (xaccSplitGetGUID (spl_mark), guidstr);
+ g_print ("Split GUID %s", guidstr);
return "no matching split found";
}
- const char *msg = equals_node_val_vs_split_internal(spl_node, spl_mark);
+ const char* msg = equals_node_val_vs_split_internal (spl_node, spl_mark);
if (msg != NULL)
{
return msg;
@@ -236,31 +236,31 @@ equals_node_val_vs_splits(xmlNodePtr node, const Transaction *trn)
}
static const char*
-node_and_transaction_equal(xmlNodePtr node, Transaction *trn)
+node_and_transaction_equal (xmlNodePtr node, Transaction* trn)
{
xmlNodePtr mark;
while (g_strcmp0 ((char*)node->name, "text") == 0)
node = node->next;
- if (!check_dom_tree_version(node, "2.0.0"))
+ if (!check_dom_tree_version (node, "2.0.0"))
{
return "version wrong. Not 2.0.0 or not there";
}
- if (!node->name || g_strcmp0((char*)node->name, "gnc:transaction"))
+ if (!node->name || g_strcmp0 ((char*)node->name, "gnc:transaction"))
{
return "Name of toplevel node is bad";
}
for (mark = node->xmlChildrenNode; mark; mark = mark->next)
{
- if (g_strcmp0((char*)mark->name, "text") == 0)
+ if (g_strcmp0 ((char*)mark->name, "text") == 0)
{
}
- else if (g_strcmp0((char*)mark->name, "trn:id") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "trn:id") == 0)
{
- if (!equals_node_val_vs_guid(mark, xaccTransGetGUID(trn)))
+ if (!equals_node_val_vs_guid (mark, xaccTransGetGUID (trn)))
{
return "ids differ";
}
@@ -269,54 +269,55 @@ node_and_transaction_equal(xmlNodePtr node, Transaction *trn)
/* This test will fail for many splits where the transaction has
* splits in different commodities -- eg, buying or selling a
* stock. jralls 2010-11-02 */
- else if (g_strcmp0((char*)mark->name, "trn:currency") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "trn:currency") == 0)
{
#if 0
- if (!equals_node_val_vs_commodity(
- mark, xaccTransGetCurrency(trn), xaccTransGetBook(trn)))
+ if (!equals_node_val_vs_commodity (
+ mark, xaccTransGetCurrency (trn), xaccTransGetBook (trn)))
{
- return g_strdup("currencies differ");
+ return g_strdup ("currencies differ");
}
#endif
}
- else if (g_strcmp0((char*)mark->name, "trn:num") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "trn:num") == 0)
{
- if (!equals_node_val_vs_string(mark, xaccTransGetNum(trn)))
+ if (!equals_node_val_vs_string (mark, xaccTransGetNum (trn)))
{
return "nums differ";
}
}
- else if (g_strcmp0((char*)mark->name, "trn:date-posted") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "trn:date-posted") == 0)
{
- if (!equals_node_val_vs_date(mark, xaccTransRetDatePostedTS(trn)))
+ if (!equals_node_val_vs_date (mark, xaccTransRetDatePostedTS (trn)))
{
return "posted dates differ";
}
}
- else if (g_strcmp0((char*)mark->name, "trn:date-entered") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "trn:date-entered") == 0)
{
- if (!equals_node_val_vs_date(mark, xaccTransRetDateEnteredTS(trn)))
+ if (!equals_node_val_vs_date (mark, xaccTransRetDateEnteredTS (trn)))
{
return "entered dates differ";
}
}
- else if (g_strcmp0((char*)mark->name, "trn:description") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "trn:description") == 0)
{
- if (!equals_node_val_vs_string(mark, xaccTransGetDescription(trn)))
+ if (!equals_node_val_vs_string (mark, xaccTransGetDescription (trn)))
{
return "descriptions differ";
}
}
- else if (g_strcmp0((char*)mark->name, "trn:slots") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "trn:slots") == 0)
{
- if (!equals_node_val_vs_kvp_frame(mark, qof_instance_get_slots (QOF_INSTANCE (trn))))
+ if (!equals_node_val_vs_kvp_frame (mark,
+ qof_instance_get_slots (QOF_INSTANCE (trn))))
{
return "slots differ";
}
}
- else if (g_strcmp0((char*)mark->name, "trn:splits") == 0)
+ else if (g_strcmp0 ((char*)mark->name, "trn:splits") == 0)
{
- const char *msg = equals_node_val_vs_splits (mark, trn);
+ const char* msg = equals_node_val_vs_splits (mark, trn);
if (msg != NULL)
{
return msg;
@@ -332,37 +333,37 @@ node_and_transaction_equal(xmlNodePtr node, Transaction *trn)
}
static void
-really_get_rid_of_transaction(Transaction *trn)
+really_get_rid_of_transaction (Transaction* trn)
{
- xaccTransBeginEdit(trn);
- xaccTransDestroy(trn);
- xaccTransCommitEdit(trn);
+ xaccTransBeginEdit (trn);
+ xaccTransDestroy (trn);
+ xaccTransCommitEdit (trn);
}
struct tran_data_struct
{
- Transaction *trn;
- Transaction *new_trn;
- gnc_commodity *com;
+ Transaction* trn;
+ Transaction* new_trn;
+ gnc_commodity* com;
int value;
};
typedef struct tran_data_struct tran_data;
static gboolean
-test_add_transaction(const char *tag, gpointer globaldata, gpointer data)
+test_add_transaction (const char* tag, gpointer globaldata, gpointer data)
{
- Transaction *trans = static_cast<decltype(trans)>(data);
- tran_data *gdata = static_cast<decltype(gdata)>(globaldata);
+ Transaction* trans = static_cast<decltype (trans)> (data);
+ tran_data* gdata = static_cast<decltype (gdata)> (globaldata);
gboolean retval = TRUE;
xaccTransBeginEdit (trans);
xaccTransSetCurrency (trans, gdata->com);
xaccTransCommitEdit (trans);
- if (!do_test_args(xaccTransEqual(gdata->trn, trans, TRUE, TRUE, TRUE, FALSE),
- "gnc_transaction_sixtp_parser_create",
- __FILE__, __LINE__,
- "%d", gdata->value))
+ if (!do_test_args (xaccTransEqual (gdata->trn, trans, TRUE, TRUE, TRUE, FALSE),
+ "gnc_transaction_sixtp_parser_create",
+ __FILE__, __LINE__,
+ "%d", gdata->value))
retval = FALSE;
gdata->new_trn = trans;
@@ -371,91 +372,91 @@ test_add_transaction(const char *tag, gpointer globaldata, gpointer data)
}
static void
-test_transaction(void)
+test_transaction (void)
{
int i;
for (i = 0; i < 50; i++)
{
- Transaction *ran_trn;
+ Transaction* ran_trn;
xmlNodePtr test_node;
- gnc_commodity *com, *new_com;
- gchar *filename1;
+ gnc_commodity* com, *new_com;
+ gchar* filename1;
int fd;
/* The next line exists for its side effect of creating the
* account tree. */
- get_random_account_tree(book);
- ran_trn = get_random_transaction(book);
- new_com = get_random_commodity( book );
+ get_random_account_tree (book);
+ ran_trn = get_random_transaction (book);
+ new_com = get_random_commodity (book);
if (!ran_trn)
{
- failure_args("transaction_xml", __FILE__, __LINE__,
- "get_random_transaction returned NULL");
+ failure_args ("transaction_xml", __FILE__, __LINE__,
+ "get_random_transaction returned NULL");
return;
}
{
/* xaccAccountInsertSplit can reorder the splits. */
- GList * list = g_list_copy(xaccTransGetSplitList (ran_trn));
- GList * node = list;
- for ( ; node; node = node->next)
+ GList* list = g_list_copy (xaccTransGetSplitList (ran_trn));
+ GList* node = list;
+ for (; node; node = node->next)
{
- Split * s = static_cast<decltype(s)>(node->data);
- Account * a = xaccMallocAccount(book);
+ Split* s = static_cast<decltype (s)> (node->data);
+ Account* a = xaccMallocAccount (book);
xaccAccountBeginEdit (a);
- xaccAccountSetCommodity( a, new_com );
+ xaccAccountSetCommodity (a, new_com);
xaccAccountSetCommoditySCU (a, xaccSplitGetAmount (s).denom);
xaccAccountInsertSplit (a, s);
xaccAccountCommitEdit (a);
}
- g_list_free(list);
+ g_list_free (list);
}
com = xaccTransGetCurrency (ran_trn);
- test_node = gnc_transaction_dom_tree_create(ran_trn);
+ test_node = gnc_transaction_dom_tree_create (ran_trn);
if (!test_node)
{
- failure_args("transaction_xml", __FILE__, __LINE__,
- "gnc_transaction_dom_tree_create returned NULL");
- really_get_rid_of_transaction(ran_trn);
+ failure_args ("transaction_xml", __FILE__, __LINE__,
+ "gnc_transaction_dom_tree_create returned NULL");
+ really_get_rid_of_transaction (ran_trn);
continue;
}
- auto compare_msg = node_and_transaction_equal(test_node, ran_trn);
+ auto compare_msg = node_and_transaction_equal (test_node, ran_trn);
if (compare_msg != nullptr)
{
- failure_args("transaction_xml", __FILE__, __LINE__,
- "node and transaction were not equal: %s",
- compare_msg);
- xmlElemDump(stdout, NULL, test_node);
- printf("\n");
- fflush(stdout);
- xmlFreeNode(test_node);
- really_get_rid_of_transaction(ran_trn);
+ failure_args ("transaction_xml", __FILE__, __LINE__,
+ "node and transaction were not equal: %s",
+ compare_msg);
+ xmlElemDump (stdout, NULL, test_node);
+ printf ("\n");
+ fflush (stdout);
+ xmlFreeNode (test_node);
+ really_get_rid_of_transaction (ran_trn);
continue;
}
else
{
- success_args("transaction_xml", __FILE__, __LINE__, "%d", i );
+ success_args ("transaction_xml", __FILE__, __LINE__, "%d", i);
}
- filename1 = g_strdup_printf("test_file_XXXXXX");
+ filename1 = g_strdup_printf ("test_file_XXXXXX");
- fd = g_mkstemp(filename1);
+ fd = g_mkstemp (filename1);
- write_dom_node_to_file(test_node, fd);
+ write_dom_node_to_file (test_node, fd);
- close(fd);
+ close (fd);
{
- GList * node = xaccTransGetSplitList (ran_trn);
- for ( ; node; node = node->next)
+ GList* node = xaccTransGetSplitList (ran_trn);
+ for (; node; node = node->next)
{
- Split * s = static_cast<decltype(s)>(node->data);
- Account * a1 = xaccSplitGetAccount(s);
- Account * a2 = xaccMallocAccount(book);
+ Split* s = static_cast<decltype (s)> (node->data);
+ Account* a1 = xaccSplitGetAccount (s);
+ Account* a2 = xaccMallocAccount (book);
xaccAccountBeginEdit (a2);
xaccAccountSetCommoditySCU (a2, xaccAccountGetCommoditySCU (a1));
@@ -465,60 +466,63 @@ test_transaction(void)
}
{
- sixtp *parser;
+ sixtp* parser;
tran_data data;
- const char *msg = "[xaccAccountScrubCommodity()] Account \"\" does not have a commodity!";
- const char *logdomain = "gnc.engine.scrub";
- GLogLevelFlags loglevel = static_cast<decltype(loglevel)>(G_LOG_LEVEL_CRITICAL);
- TestErrorStruct check = { loglevel, const_cast<char*>(logdomain),
- const_cast<char*>(msg) };
+ const char* msg =
+ "[xaccAccountScrubCommodity()] Account \"\" does not have a commodity!";
+ const char* logdomain = "gnc.engine.scrub";
+ GLogLevelFlags loglevel = static_cast<decltype (loglevel)>
+ (G_LOG_LEVEL_CRITICAL);
+ TestErrorStruct check = { loglevel, const_cast<char*> (logdomain),
+ const_cast<char*> (msg)
+ };
g_log_set_handler (logdomain, loglevel,
(GLogFunc)test_checked_handler, &check);
data.trn = ran_trn;
data.com = com;
data.value = i;
- parser = gnc_transaction_sixtp_parser_create();
+ parser = gnc_transaction_sixtp_parser_create ();
- if (!gnc_xml_parse_file(parser, filename1, test_add_transaction,
- (gpointer)&data, book))
+ if (!gnc_xml_parse_file (parser, filename1, test_add_transaction,
+ (gpointer)&data, book))
{
- failure_args("gnc_xml_parse_file returned FALSE",
- __FILE__, __LINE__, "%d", i);
+ failure_args ("gnc_xml_parse_file returned FALSE",
+ __FILE__, __LINE__, "%d", i);
}
else
- really_get_rid_of_transaction(data.new_trn);
+ really_get_rid_of_transaction (data.new_trn);
}
/* no handling of circular data structures. We'll do that later */
/* sixtp_destroy(parser); */
- g_unlink(filename1);
- g_free(filename1);
- really_get_rid_of_transaction(ran_trn);
- xmlFreeNode(test_node);
+ g_unlink (filename1);
+ g_free (filename1);
+ really_get_rid_of_transaction (ran_trn);
+ xmlFreeNode (test_node);
}
}
static gboolean
-test_real_transaction(const char *tag, gpointer global_data, gpointer data)
+test_real_transaction (const char* tag, gpointer global_data, gpointer data)
{
- const char *msg;
+ const char* msg;
- msg = node_and_transaction_equal((xmlNodePtr)global_data,
- (Transaction*)data);
- do_test_args(msg == NULL, "test_real_transaction",
- __FILE__, __LINE__, msg);
- really_get_rid_of_transaction((Transaction*)data);
+ msg = node_and_transaction_equal ((xmlNodePtr)global_data,
+ (Transaction*)data);
+ do_test_args (msg == NULL, "test_real_transaction",
+ __FILE__, __LINE__, msg);
+ really_get_rid_of_transaction ((Transaction*)data);
return TRUE;
}
int
-main (int argc, char ** argv)
+main (int argc, char** argv)
{
- qof_init();
- cashobjects_register();
- xaccLogDisable();
+ qof_init ();
+ cashobjects_register ();
+ xaccLogDisable ();
gnc_transaction_xml_v2_testing = TRUE;
@@ -526,16 +530,16 @@ main (int argc, char ** argv)
if (argc > 1)
{
- test_files_in_dir(argc, argv, test_real_transaction,
- gnc_transaction_sixtp_parser_create(),
- "gnc:transaction", book);
+ test_files_in_dir (argc, argv, test_real_transaction,
+ gnc_transaction_sixtp_parser_create (),
+ "gnc:transaction", book);
}
else
{
- test_transaction();
+ test_transaction ();
}
- print_test_results();
- qof_close();
- exit(get_rv());
+ print_test_results ();
+ qof_close ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/test/test-xml2-is-file.cpp b/src/backend/xml/test/test-xml2-is-file.cpp
index 3cab137..956d269 100644
--- a/src/backend/xml/test/test-xml2-is-file.cpp
+++ b/src/backend/xml/test/test-xml2-is-file.cpp
@@ -33,19 +33,20 @@ extern "C"
#define FILENAME "Money95bank_fr.gml2"
int
-main(int argc, char **argv)
+main (int argc, char** argv)
{
- const char *directory = g_getenv("GNC_TEST_FILES");
+ const char* directory = g_getenv ("GNC_TEST_FILES");
if (!directory)
{
directory = "test-files/xml2";
}
- char *filename = static_cast<decltype(filename)>(malloc(strlen(directory) + 1 + strlen(FILENAME) + 1));
- sprintf(filename, "%s/%s", directory, FILENAME);
- do_test(gnc_is_xml_data_file_v2(filename, NULL), "gnc_is_xml_data_file_v2");
+ char* filename = static_cast<decltype (filename)> (malloc (strlen (
+ directory) + 1 + strlen (FILENAME) + 1));
+ sprintf (filename, "%s/%s", directory, FILENAME);
+ do_test (gnc_is_xml_data_file_v2 (filename, NULL), "gnc_is_xml_data_file_v2");
- print_test_results();
- exit(get_rv());
+ print_test_results ();
+ exit (get_rv ());
}
diff --git a/src/backend/xml/xml-helpers.h b/src/backend/xml/xml-helpers.h
index 7d3ee52..782f56b 100644
--- a/src/backend/xml/xml-helpers.h
+++ b/src/backend/xml/xml-helpers.h
@@ -24,28 +24,28 @@
*/
static inline void
-maybe_add_int (xmlNodePtr ptr, const char *tag, gint val)
+maybe_add_int (xmlNodePtr ptr, const char* tag, gint val)
{
if (val)
xmlAddChild (ptr, int_to_dom_tree (tag, val));
}
static inline void
-maybe_add_numeric (xmlNodePtr ptr, const char *tag, gnc_numeric val)
+maybe_add_numeric (xmlNodePtr ptr, const char* tag, gnc_numeric val)
{
if (!gnc_numeric_zero_p (val))
xmlAddChild (ptr, gnc_numeric_to_dom_tree (tag, &val));
}
static inline void
-maybe_add_string (xmlNodePtr ptr, const char *tag, const char *str)
+maybe_add_string (xmlNodePtr ptr, const char* tag, const char* str)
{
- if (str && strlen(str) > 0)
+ if (str && strlen (str) > 0)
xmlAddChild (ptr, text_to_dom_tree (tag, str));
}
static inline void
-maybe_add_guid (xmlNodePtr ptr, const char *tag, QofInstance *inst)
+maybe_add_guid (xmlNodePtr ptr, const char* tag, QofInstance* inst)
{
if (inst)
xmlAddChild (ptr, guid_to_dom_tree (tag,
commit a2863ab370b6864146950e460fd11c3417ac32c2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 12 13:34:22 2016 -0800
Remove old static analysis markup from backend.
diff --git a/src/backend/dbi/gnc-backend-dbi-priv.h b/src/backend/dbi/gnc-backend-dbi-priv.h
index 7e7db53..3aefd55 100644
--- a/src/backend/dbi/gnc-backend-dbi-priv.h
+++ b/src/backend/dbi/gnc-backend-dbi-priv.h
@@ -85,7 +85,6 @@ struct GncDbiBackend_struct
dbi_conn conn;
- /*@ dependent @*/
QofBook *primary_book; /* The primary, main open book */
gboolean loading; /* We are performing an initial load */
gboolean in_query;
@@ -104,11 +103,8 @@ typedef struct
{
GncSqlConnection base;
- /*@ observer @*/
QofBackend* qbe;
- /*@ observer @*/
dbi_conn conn;
- /*@ observer @*/
provider_functions_t* provider;
gboolean conn_ok; // Used by the error handler routines to flag if the connection is ok to use
gint last_error; // Code of the last error that occurred. This is set in the error callback function
diff --git a/src/backend/dbi/gnc-backend-dbi.cpp b/src/backend/dbi/gnc-backend-dbi.cpp
index 59cf235..a3b56da 100644
--- a/src/backend/dbi/gnc-backend-dbi.cpp
+++ b/src/backend/dbi/gnc-backend-dbi.cpp
@@ -113,7 +113,7 @@ static gchar lock_table[] = "gnclock";
#define SQLITE3_URI_PREFIX (SQLITE3_URI_TYPE "://")
#define PGSQL_DEFAULT_PORT 5432
-static /*@ null @*/ gchar* conn_create_table_ddl_sqlite3( GncSqlConnection* conn,
+static gchar* conn_create_table_ddl_sqlite3( GncSqlConnection* conn,
const gchar* table_name,
const GList* col_info_list );
static GSList* conn_get_table_list( dbi_conn conn, const gchar* dbname );
@@ -131,7 +131,7 @@ static provider_functions_t provider_sqlite3 =
};
#define SQLITE3_TIMESPEC_STR_FORMAT "%04d%02d%02d%02d%02d%02d"
-static /*@ null @*/ gchar* conn_create_table_ddl_mysql( GncSqlConnection* conn,
+static gchar* conn_create_table_ddl_mysql( GncSqlConnection* conn,
const gchar* table_name,
const GList* col_info_list );
static void append_mysql_col_def( GString* ddl, GncSqlColumnInfo* info );
@@ -147,7 +147,7 @@ static provider_functions_t provider_mysql =
};
#define MYSQL_TIMESPEC_STR_FORMAT "%04d%02d%02d%02d%02d%02d"
-static /*@ null @*/ gchar* conn_create_table_ddl_pgsql( GncSqlConnection* conn,
+static gchar* conn_create_table_ddl_pgsql( GncSqlConnection* conn,
const gchar* table_name,
const GList* col_info_list );
static GSList* conn_get_table_list_pgsql( dbi_conn conn, const gchar* dbname );
@@ -169,14 +169,14 @@ static gboolean gnc_dbi_lock_database( QofBackend *qbe, gboolean ignore_lock );
static void gnc_dbi_unlock( QofBackend *qbe );
static gboolean save_may_clobber_data( QofBackend* qbe );
-static /*@ null @*/ gchar* create_index_ddl( GncSqlConnection* conn,
+static gchar* create_index_ddl( GncSqlConnection* conn,
const gchar* index_name,
const gchar* table_name,
const GncSqlColumnTableEntry* col_table );
-static /*@ null @*/ gchar* add_columns_ddl( GncSqlConnection* conn,
+static gchar* add_columns_ddl( GncSqlConnection* conn,
const gchar* table_name,
GList* col_info_list );
-static GncSqlConnection* create_dbi_connection( /*@ observer @*/ provider_functions_t* provider, /*@ observer @*/ QofBackend* qbe, /*@ observer @*/ dbi_conn conn );
+static GncSqlConnection* create_dbi_connection( provider_functions_t* provider, QofBackend* qbe, dbi_conn conn );
static GncDbiTestResult conn_test_dbi_library( dbi_conn conn );
#define GNC_DBI_PROVIDER_SQLITE (&provider_sqlite3)
#define GNC_DBI_PROVIDER_MYSQL (&provider_mysql)
@@ -1515,7 +1515,7 @@ gnc_dbi_session_end( QofBackend *be_start )
}
static void
-gnc_dbi_destroy_backend( /*@ only @*/ QofBackend *be )
+gnc_dbi_destroy_backend( QofBackend *be )
{
g_return_if_fail( be != NULL );
@@ -1539,7 +1539,7 @@ gnc_dbi_destroy_backend( /*@ only @*/ QofBackend *be )
* both values to match this version of Gnucash.
*/
static void
-gnc_dbi_load( QofBackend* qbe, /*@ dependent @*/ QofBook *book, QofBackendLoadType loadType )
+gnc_dbi_load( QofBackend* qbe, QofBook *book, QofBackendLoadType loadType )
{
GncDbiBackend *be = (GncDbiBackend*)qbe;
@@ -1867,9 +1867,9 @@ init_sql_backend( GncDbiBackend* dbi_be )
static QofBackend*
new_backend( void (*session_begin)( QofBackend *, QofSession *, const gchar *,
- /*@ unused @*/ gboolean,
- /*@ unused @*/ gboolean,
- /*@ unused @*/ gboolean ) )
+ gboolean,
+ gboolean,
+ gboolean ) )
{
GncDbiBackend *dbi_be;
QofBackend *be;
@@ -1905,7 +1905,7 @@ gnc_dbi_backend_postgres_new( void )
}
static void
-gnc_dbi_provider_free( /*@ only @*/ QofBackendProvider *prov )
+gnc_dbi_provider_free( QofBackendProvider *prov )
{
g_return_if_fail( prov != NULL );
@@ -2121,13 +2121,12 @@ typedef struct
{
GncSqlRow base;
- /*@ dependent @*/
dbi_result result;
GList* gvalue_list;
} GncDbiSqlRow;
static void
-row_dispose( /*@ only @*/ GncSqlRow* row )
+row_dispose( GncSqlRow* row )
{
GncDbiSqlRow* dbi_row = (GncDbiSqlRow*)row;
GList* node;
@@ -2151,7 +2150,7 @@ row_dispose( /*@ only @*/ GncSqlRow* row )
g_free( dbi_row );
}
-static /*@ null @*/ const GValue*
+static const GValue*
row_get_value_at_col_name( GncSqlRow* row, const gchar* col_name )
{
GncDbiSqlRow* dbi_row = (GncDbiSqlRow*)row;
@@ -2223,7 +2222,7 @@ row_get_value_at_col_name( GncSqlRow* row, const gchar* col_name )
}
static GncSqlRow*
-create_dbi_row( /*@ dependent @*/ dbi_result result )
+create_dbi_row( dbi_result result )
{
GncDbiSqlRow* row;
@@ -2241,9 +2240,7 @@ typedef struct
{
GncSqlResult base;
- /*@ observer @*/
GncDbiSqlConnection* dbi_conn;
- /*@ owned @*/
dbi_result result;
guint num_rows;
guint cur_row;
@@ -2251,7 +2248,7 @@ typedef struct
} GncDbiSqlResult;
static void
-result_dispose( /*@ only @*/ GncSqlResult* result )
+result_dispose( GncSqlResult* result )
{
GncDbiSqlResult* dbi_result = (GncDbiSqlResult*)result;
@@ -2281,7 +2278,7 @@ result_get_num_rows( GncSqlResult* result )
return dbi_result->num_rows;
}
-static /*@ null @*/ GncSqlRow*
+static GncSqlRow*
result_get_first_row( GncSqlResult* result )
{
GncDbiSqlResult* dbi_result = (GncDbiSqlResult*)result;
@@ -2309,7 +2306,7 @@ result_get_first_row( GncSqlResult* result )
}
}
-static /*@ null @*/ GncSqlRow*
+static GncSqlRow*
result_get_next_row( GncSqlResult* result )
{
GncDbiSqlResult* dbi_result = (GncDbiSqlResult*)result;
@@ -2338,7 +2335,7 @@ result_get_next_row( GncSqlResult* result )
}
static GncSqlResult*
-create_dbi_result( /*@ observer @*/ GncDbiSqlConnection* dbi_conn, /*@ owned @*/ dbi_result result )
+create_dbi_result( GncDbiSqlConnection* dbi_conn, dbi_result result )
{
GncDbiSqlResult* dbi_result;
@@ -2362,12 +2359,11 @@ typedef struct
GncSqlStatement base;
GString* sql;
- /*@ observer @*/
GncSqlConnection* conn;
} GncDbiSqlStatement;
static void
-stmt_dispose( /*@ only @*/ GncSqlStatement* stmt )
+stmt_dispose( GncSqlStatement* stmt )
{
GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt;
@@ -2387,8 +2383,8 @@ stmt_to_sql( GncSqlStatement* stmt )
}
static void
-stmt_add_where_cond( GncSqlStatement* stmt, /*@ unused @*/ QofIdTypeConst type_name,
- /*@ unused @*/ gpointer obj, const GncSqlColumnTableEntry* table_row, GValue* value )
+stmt_add_where_cond( GncSqlStatement* stmt, QofIdTypeConst type_name,
+ gpointer obj, const GncSqlColumnTableEntry* table_row, GValue* value )
{
GncDbiSqlStatement* dbi_stmt = (GncDbiSqlStatement*)stmt;
gchar* buf;
@@ -2403,7 +2399,7 @@ stmt_add_where_cond( GncSqlStatement* stmt, /*@ unused @*/ QofIdTypeConst type_n
}
static GncSqlStatement*
-create_dbi_statement( /*@ observer @*/ GncSqlConnection* conn, const gchar* sql )
+create_dbi_statement( GncSqlConnection* conn, const gchar* sql )
{
GncDbiSqlStatement* stmt;
@@ -2420,14 +2416,14 @@ create_dbi_statement( /*@ observer @*/ GncSqlConnection* conn, const gchar* sql
}
/* --------------------------------------------------------- */
static void
-conn_dispose( /*@ only @*/ GncSqlConnection* conn )
+conn_dispose( GncSqlConnection* conn )
{
//GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
g_free( conn );
}
-static /*@ null @*/ GncSqlResult*
+static GncSqlResult*
conn_execute_select_statement( GncSqlConnection* conn, GncSqlStatement* stmt )
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
@@ -2483,7 +2479,7 @@ conn_execute_nonselect_statement( GncSqlConnection* conn, GncSqlStatement* stmt
}
static GncSqlStatement*
-conn_create_statement_from_sql( /*@ observer @*/ GncSqlConnection* conn, const gchar* sql )
+conn_create_statement_from_sql( GncSqlConnection* conn, const gchar* sql )
{
//GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
@@ -2523,7 +2519,7 @@ conn_does_table_exist( GncSqlConnection* conn, const gchar* table_name )
}
static gboolean
-conn_begin_transaction( /*@ unused @*/ GncSqlConnection* conn )
+conn_begin_transaction( GncSqlConnection* conn )
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result;
@@ -2563,7 +2559,7 @@ conn_begin_transaction( /*@ unused @*/ GncSqlConnection* conn )
}
static gboolean
-conn_rollback_transaction( /*@ unused @*/ GncSqlConnection* conn )
+conn_rollback_transaction( GncSqlConnection* conn )
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result;
@@ -2590,7 +2586,7 @@ conn_rollback_transaction( /*@ unused @*/ GncSqlConnection* conn )
}
static gboolean
-conn_commit_transaction( /*@ unused @*/ GncSqlConnection* conn )
+conn_commit_transaction( GncSqlConnection* conn )
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
dbi_result result;
@@ -2616,7 +2612,7 @@ conn_commit_transaction( /*@ unused @*/ GncSqlConnection* conn )
return success;
}
-static /*@ null @*/ gchar*
+static gchar*
create_index_ddl( GncSqlConnection* conn,
const gchar* index_name,
const gchar* table_name,
@@ -2645,7 +2641,7 @@ create_index_ddl( GncSqlConnection* conn,
return g_string_free( ddl, FALSE );
}
-static /*@ null @*/ gchar*
+static gchar*
add_columns_ddl( GncSqlConnection* conn,
const gchar* table_name,
GList* col_info_list )
@@ -2725,7 +2721,7 @@ append_sqlite3_col_def( GString* ddl, GncSqlColumnInfo* info )
}
}
-static /*@ null @*/ gchar*
+static gchar*
conn_create_table_ddl_sqlite3( GncSqlConnection* conn,
const gchar* table_name,
const GList* col_info_list )
@@ -2817,7 +2813,7 @@ append_mysql_col_def( GString* ddl, GncSqlColumnInfo* info )
}
}
-static /*@ null @*/ gchar*
+static gchar*
conn_create_table_ddl_mysql( GncSqlConnection* conn, const gchar* table_name,
const GList* col_info_list )
{
@@ -2907,7 +2903,7 @@ append_pgsql_col_def( GString* ddl, GncSqlColumnInfo* info )
}
}
-static /*@ null @*/ gchar*
+static gchar*
conn_create_table_ddl_pgsql( GncSqlConnection* conn, const gchar* table_name,
const GList* col_info_list )
{
@@ -2983,8 +2979,8 @@ conn_create_table( GncSqlConnection* conn, const gchar* table_name,
}
static gboolean
-conn_create_index( /*@ unused @*/ GncSqlConnection* conn, /*@ unused @*/ const gchar* index_name,
- /*@ unused @*/ const gchar* table_name, /*@ unused @*/ const GncSqlColumnTableEntry* col_table )
+conn_create_index( GncSqlConnection* conn, const gchar* index_name,
+ const gchar* table_name, const GncSqlColumnTableEntry* col_table )
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
gchar* ddl;
@@ -3019,7 +3015,7 @@ conn_create_index( /*@ unused @*/ GncSqlConnection* conn, /*@ unused @*/ const g
}
static gboolean
-conn_add_columns_to_table( /*@ unused @*/ GncSqlConnection* conn, /*@ unused @*/ const gchar* table_name,
+conn_add_columns_to_table( GncSqlConnection* conn, const gchar* table_name,
GList* col_info_list )
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
@@ -3053,7 +3049,7 @@ conn_add_columns_to_table( /*@ unused @*/ GncSqlConnection* conn, /*@ unused @*/
return TRUE;
}
-static /*@ null @*/ gchar*
+static gchar*
conn_quote_string( const GncSqlConnection* conn, gchar* unquoted_str )
{
GncDbiSqlConnection* dbi_conn = (GncDbiSqlConnection*)conn;
@@ -3240,9 +3236,9 @@ conn_test_dbi_library( dbi_conn conn )
static GncSqlConnection*
-create_dbi_connection( /*@ observer @*/ provider_functions_t* provider,
- /*@ observer @*/ QofBackend* qbe,
- /*@ observer @*/ dbi_conn conn )
+create_dbi_connection( provider_functions_t* provider,
+ QofBackend* qbe,
+ dbi_conn conn )
{
GncDbiSqlConnection* dbi_conn;
diff --git a/src/backend/dbi/gncmod-backend-dbi.c b/src/backend/dbi/gncmod-backend-dbi.c
index 3511048..e01dead 100644
--- a/src/backend/dbi/gncmod-backend-dbi.c
+++ b/src/backend/dbi/gncmod-backend-dbi.c
@@ -40,7 +40,7 @@ int gnc_module_current = 0;
int gnc_module_revision = 0;
int gnc_module_age = 0;
-/*@ dependent @*//*@ null @*/
+
static GNCModule engine;
gchar *
diff --git a/src/backend/sql/gnc-account-sql.cpp b/src/backend/sql/gnc-account-sql.cpp
index 019d9d1..c85c7f9 100644
--- a/src/backend/sql/gnc-account-sql.cpp
+++ b/src/backend/sql/gnc-account-sql.cpp
@@ -52,9 +52,9 @@ static QofLogModule log_module = G_LOG_DOMAIN;
#define TABLE_NAME "accounts"
#define TABLE_VERSION 1
-static /*@ null @*//*@ dependent @*/ gpointer get_parent( gpointer pObject );
-static void set_parent( gpointer pObject, /*@ null @*/ gpointer pValue );
-static void set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue );
+static gpointer get_parent( gpointer pObject );
+static void set_parent( gpointer pObject, gpointer pValue );
+static void set_parent_guid( gpointer pObject, gpointer pValue );
#define ACCOUNT_MAX_NAME_LEN 2048
#define ACCOUNT_MAX_TYPE_LEN 2048
@@ -63,7 +63,6 @@ static void set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue );
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "name", CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, "name" },
{ "account_type", CT_STRING, ACCOUNT_MAX_TYPE_LEN, COL_NNUL, NULL, ACCOUNT_TYPE_ },
@@ -79,25 +78,22 @@ static const GncSqlColumnTableEntry col_table[] =
{ "hidden", CT_BOOLEAN, 0, 0, "hidden" },
{ "placeholder", CT_BOOLEAN, 0, 0, "placeholder" },
{ NULL }
- /*@ +full_init_block @*/
};
static GncSqlColumnTableEntry parent_col_table[] =
{
- /*@ -full_init_block @*/
{ "parent_guid", CT_GUID, 0, 0, NULL, NULL, NULL, set_parent_guid },
{ NULL }
- /*@ +full_init_block @*/
};
typedef struct
{
- /*@ dependent @*/ Account* pAccount;
+ Account* pAccount;
GncGUID guid;
} account_parent_guid_struct;
/* ================================================================= */
-static /*@ null @*//*@ dependent @*/ gpointer
+static gpointer
get_parent( gpointer pObject )
{
const Account* pAccount;
@@ -122,7 +118,7 @@ get_parent( gpointer pObject )
}
static void
-set_parent( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_parent( gpointer pObject, gpointer pValue )
{
Account* pAccount;
QofBook* pBook;
@@ -145,7 +141,7 @@ set_parent( gpointer pObject, /*@ null @*/ gpointer pValue )
}
static void
-set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_parent_guid( gpointer pObject, gpointer pValue )
{
account_parent_guid_struct* s = (account_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
@@ -156,7 +152,7 @@ set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
s->guid = *guid;
}
-static /*@ dependent @*//*@ null @*/ Account*
+static Account*
load_single_account( GncSqlBackend* be, GncSqlRow* row,
GList** l_accounts_needing_parents )
{
@@ -401,7 +397,7 @@ gnc_sql_save_account( GncSqlBackend* be, QofInstance* inst )
/* ================================================================= */
static void
load_account_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
diff --git a/src/backend/sql/gnc-backend-sql.cpp b/src/backend/sql/gnc-backend-sql.cpp
index 956cf1d..0ede462 100644
--- a/src/backend/sql/gnc-backend-sql.cpp
+++ b/src/backend/sql/gnc-backend-sql.cpp
@@ -84,17 +84,14 @@ static void update_progress( GncSqlBackend* be );
static void finish_progress( GncSqlBackend* be );
static void register_standard_col_type_handlers( void );
static gboolean reset_version_info( GncSqlBackend* be );
-/*@ null @*/
static GncSqlStatement* build_insert_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
const GncSqlColumnTableEntry* table );
-/*@ null @*/
static GncSqlStatement* build_update_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
const GncSqlColumnTableEntry* table );
-/*@ null @*/
static GncSqlStatement* build_delete_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
@@ -106,8 +103,7 @@ static GList *post_load_commodities = NULL;
typedef struct
{
- /*@ dependent @*/ QofIdType searchObj;
- /*@ dependent @*/
+ QofIdType searchObj;
gpointer pCompiledQuery;
} gnc_sql_query_info;
@@ -116,15 +112,10 @@ typedef struct
{
gboolean is_known;
gboolean is_ok;
- /*@ dependent @*/
GncSqlBackend* be;
- /*@ dependent @*/
QofInstance* inst;
- /*@ dependent @*/
QofQuery* pQuery;
- /*@ dependent @*/
gpointer pCompiledQuery;
- /*@ owned @*/
gnc_sql_query_info* pQueryInfo;
} sql_backend;
@@ -135,7 +126,7 @@ static QofLogModule log_module = G_LOG_DOMAIN;
/* ================================================================= */
void
-gnc_sql_init( /*@ unused @*/ GncSqlBackend* be )
+gnc_sql_init( GncSqlBackend* be )
{
static gboolean initialized = FALSE;
@@ -226,7 +217,7 @@ commit_commodity (gpointer data)
}
void
-gnc_sql_load( GncSqlBackend* be, /*@ dependent @*/ QofBook *book, QofBackendLoadType loadType )
+gnc_sql_load( GncSqlBackend* be, QofBook *book, QofBackendLoadType loadType )
{
GncSqlObjectBackend* pData;
gint i;
@@ -304,7 +295,6 @@ static gboolean
write_account_tree( GncSqlBackend* be, Account* root )
{
GList* descendants;
- /*@ dependent @*/
GList* node;
gboolean is_ok = TRUE;
@@ -453,7 +443,7 @@ finish_progress( GncSqlBackend* be )
}
void
-gnc_sql_sync_all( GncSqlBackend* be, /*@ dependent @*/ QofBook *book )
+gnc_sql_sync_all( GncSqlBackend* be, QofBook *book )
{
gboolean is_ok;
@@ -839,7 +829,6 @@ compile_query_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
gchar* gnc_sql_compile_query_to_sql( GncSqlBackend* be, QofQuery* query );
-/*@ null @*/
gpointer
gnc_sql_compile_query( QofBackend* pBEnd, QofQuery* pQuery )
{
@@ -1132,7 +1121,7 @@ gnc_sql_get_integer_value( const GValue* value )
}
/* ----------------------------------------------------------------- */
-/*@ null @*/ static gpointer
+ static gpointer
get_autoinc_id(void *object, const QofParam* param)
{
// Just need a 0 to force a new autoinc value
@@ -1145,7 +1134,7 @@ set_autoinc_id(void* object, void *item)
// Nowhere to put the ID
}
-/*@ null @*/ QofAccessFunc
+ QofAccessFunc
gnc_sql_get_getter( QofIdTypeConst obj_name, const GncSqlColumnTableEntry* table_row )
{
QofAccessFunc getter;
@@ -1214,7 +1203,7 @@ gint size, gboolean is_unicode )
/* ----------------------------------------------------------------- */
static void
load_string( const GncSqlBackend* be, GncSqlRow* row,
-/*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -1315,7 +1304,7 @@ typedef void (*IntSetterFunc)( const gpointer, gint );
static void
load_int( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -1418,7 +1407,7 @@ typedef void (*BooleanSetterFunc)( const gpointer, gboolean );
static void
load_boolean( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -1520,7 +1509,7 @@ typedef void (*Int64SetterFunc)( const gpointer, gint64 );
static void
load_int64( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -1612,7 +1601,7 @@ static GncSqlColumnTypeHandler int64_handler
static void
load_double( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -1726,7 +1715,7 @@ static GncSqlColumnTypeHandler double_handler
static void
load_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -1915,7 +1904,7 @@ gnc_sql_convert_timespec_to_string( const GncSqlBackend* be, Timespec ts )
static void
load_timespec( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -2050,7 +2039,7 @@ static GncSqlColumnTypeHandler timespec_handler
static void
load_date( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -2201,16 +2190,14 @@ typedef void (*NumericSetterFunc)( gpointer, gnc_numeric );
static const GncSqlColumnTableEntry numeric_col_table[] =
{
- /*@ -full_init_block @*/
{ "num", CT_INT64, 0, COL_NNUL, "guid" },
{ "denom", CT_INT64, 0, COL_NNUL, "guid" },
{ NULL }
- /*@ +full_init_block @*/
};
static void
load_numeric( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
@@ -2354,7 +2341,7 @@ static GncSqlColumnTypeHandler numeric_handler
};
/* ================================================================= */
-static /*@ null @*//*@ only @*/ GHashTable* g_columnTypeHash = NULL;
+static GHashTable* g_columnTypeHash = NULL;
void
gnc_sql_register_col_type_handler( const gchar* colType, const GncSqlColumnTypeHandler* handler )
@@ -2372,7 +2359,7 @@ gnc_sql_register_col_type_handler( const gchar* colType, const GncSqlColumnTypeH
g_hash_table_insert( g_columnTypeHash, (gpointer)colType, (gpointer)handler );
}
-/*@ dependent @*//*@ null @*/ static GncSqlColumnTypeHandler*
+ static GncSqlColumnTypeHandler*
get_handler( const GncSqlColumnTableEntry* table_row )
{
GncSqlColumnTypeHandler* pHandler;
@@ -2409,7 +2396,7 @@ register_standard_col_type_handlers( void )
}
void
-_retrieve_guid_( gpointer pObject, /*@ null @*/ gpointer pValue )
+_retrieve_guid_( gpointer pObject, gpointer pValue )
{
GncGUID* pGuid = (GncGUID*)pObject;
GncGUID* guid = (GncGUID*)pValue;
@@ -2424,13 +2411,10 @@ _retrieve_guid_( gpointer pObject, /*@ null @*/ gpointer pValue )
// Table to retrieve just the guid
static GncSqlColumnTableEntry guid_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, 0, NULL, NULL, NULL, _retrieve_guid_ },
{ NULL }
- /*@ +full_init_block @*/
};
-/*@ null @*/
const GncGUID*
gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row )
{
@@ -2447,13 +2431,11 @@ gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row )
// Table to retrieve just the guid
static GncSqlColumnTableEntry tx_guid_table[] =
{
- /*@ -full_init_block @*/
{ "tx_guid", CT_GUID, 0, 0, NULL, NULL, NULL, _retrieve_guid_ },
{ NULL }
- /*@ +full_init_block @*/
};
-/*@ null @*//*@ dependent @*/
+
const GncGUID*
gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row )
{
@@ -2469,7 +2451,7 @@ gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row )
void
gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofIdTypeConst obj_name, gpointer pObject,
+ QofIdTypeConst obj_name, gpointer pObject,
const GncSqlColumnTableEntry* table )
{
QofSetterFunc setter;
@@ -2504,7 +2486,7 @@ gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
}
/* ================================================================= */
-/*@ null @*/ GncSqlStatement*
+ GncSqlStatement*
gnc_sql_create_select_statement( GncSqlBackend* be, const gchar* table_name )
{
gchar* sql;
@@ -2519,7 +2501,7 @@ gnc_sql_create_select_statement( GncSqlBackend* be, const gchar* table_name )
return stmt;
}
-/*@ null @*/ static GncSqlStatement*
+ static GncSqlStatement*
create_single_col_select_statement( GncSqlBackend* be,
const gchar* table_name,
const GncSqlColumnTableEntry* table_row )
@@ -2539,7 +2521,7 @@ create_single_col_select_statement( GncSqlBackend* be,
/* ================================================================= */
-/*@ null @*/ GncSqlResult*
+ GncSqlResult*
gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStatement* stmt )
{
GncSqlResult* result;
@@ -2557,7 +2539,7 @@ gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStatement* stmt )
return result;
}
-/*@ null @*/ GncSqlStatement*
+ GncSqlStatement*
gnc_sql_create_statement_from_sql( GncSqlBackend* be, const gchar* sql )
{
GncSqlStatement* stmt;
@@ -2575,7 +2557,7 @@ gnc_sql_create_statement_from_sql( GncSqlBackend* be, const gchar* sql )
return stmt;
}
-/*@ null @*/ GncSqlResult*
+ GncSqlResult*
gnc_sql_execute_select_sql( GncSqlBackend* be, const gchar* sql )
{
GncSqlStatement* stmt;
@@ -2867,7 +2849,7 @@ free_gvalue_list( GSList* list )
g_slist_free( list );
}
-/*@ null @*/ static GncSqlStatement*
+ static GncSqlStatement*
build_insert_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
@@ -2942,7 +2924,7 @@ build_insert_statement( GncSqlBackend* be,
return stmt;
}
-/*@ null @*/ static GncSqlStatement*
+ static GncSqlStatement*
build_update_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
@@ -3020,7 +3002,7 @@ build_update_statement( GncSqlBackend* be,
return stmt;
}
-/*@ null @*/ static GncSqlStatement*
+ static GncSqlStatement*
build_delete_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
@@ -3247,11 +3229,9 @@ gboolean gnc_sql_add_columns_to_table( GncSqlBackend* be, const gchar* table_nam
static GncSqlColumnTableEntry version_table[] =
{
- /*@ -full_init_block @*/
{ TABLE_COL_NAME, CT_STRING, MAX_TABLE_NAME_LEN, COL_PKEY | COL_NNUL },
{ VERSION_COL_NAME, CT_INT, 0, COL_NNUL },
{ NULL }
- /*@ +full_init_block @*/
};
/**
diff --git a/src/backend/sql/gnc-backend-sql.h b/src/backend/sql/gnc-backend-sql.h
index 53fa0fe..f593757 100644
--- a/src/backend/sql/gnc-backend-sql.h
+++ b/src/backend/sql/gnc-backend-sql.h
@@ -55,7 +55,6 @@ struct GncSqlBackend
{
QofBackend be; /**< QOF backend */
GncSqlConnection* conn; /**< SQL connection */
- /*@ dependent @*/
QofBook *book; /**< The primary, main open book */
gboolean loading; /**< We are performing an initial load */
gboolean in_query; /**< We are processing a query */
@@ -80,7 +79,7 @@ void gnc_sql_init( GncSqlBackend* be );
* @param be SQL backend
* @param book Book to be loaded
*/
-void gnc_sql_load( GncSqlBackend* be, /*@ dependent @*/ QofBook *book, QofBackendLoadType loadType );
+void gnc_sql_load( GncSqlBackend* be, QofBook *book, QofBackendLoadType loadType );
/**
* Register a commodity to be committed after loading is complete.
@@ -98,7 +97,7 @@ void gnc_sql_push_commodity_for_postload_processing (GncSqlBackend *be,
* @param be SQL backend
* @param book Book to be saved
*/
-void gnc_sql_sync_all( GncSqlBackend* be, /*@ dependent @*/ QofBook *book );
+void gnc_sql_sync_all( GncSqlBackend* be, QofBook *book );
/**
* An object is about to be edited.
@@ -139,8 +138,7 @@ typedef struct GncSqlRow GncSqlRow;
*/
struct GncSqlStatement
{
- void (*dispose)( /*@ only @*/ GncSqlStatement* );
- /*@ dependent @*/
+ void (*dispose)( GncSqlStatement* );
gchar* (*toSql)( GncSqlStatement* );
void (*addWhereCond)( GncSqlStatement*, QofIdTypeConst, gpointer, const GncSqlColumnTableEntry*, GValue* );
};
@@ -159,10 +157,10 @@ struct GncSqlStatement
*/
struct GncSqlConnection
{
- void (*dispose)( /*@ only @*/ GncSqlConnection* );
+ void (*dispose)( GncSqlConnection* );
GncSqlResult* (*executeSelectStatement)( GncSqlConnection*, GncSqlStatement* ); /**< Returns NULL if error */
gint (*executeNonSelectStatement)( GncSqlConnection*, GncSqlStatement* ); /**< Returns -1 if error */
- GncSqlStatement* (*createStatementFromSql)( /*@ observer @*/ GncSqlConnection*, const gchar* );
+ GncSqlStatement* (*createStatementFromSql)( GncSqlConnection*, const gchar* );
gboolean (*doesTableExist)( GncSqlConnection*, const gchar* ); /**< Returns true if successful */
gboolean (*beginTransaction)( GncSqlConnection* ); /**< Returns TRUE if successful, FALSE if error */
gboolean (*rollbackTransaction)( GncSqlConnection* ); /**< Returns TRUE if successful, FALSE if error */
@@ -205,7 +203,7 @@ struct GncSqlConnection
struct GncSqlRow
{
const GValue* (*getValueAtColName)( GncSqlRow*, const gchar* );
- void (*dispose)( /*@ only @*/ GncSqlRow* );
+ void (*dispose)( GncSqlRow* );
};
#define gnc_sql_row_get_value_at_col_name(ROW,N) \
(ROW)->getValueAtColName(ROW,N)
@@ -223,7 +221,7 @@ struct GncSqlResult
guint (*getNumRows)( GncSqlResult* );
GncSqlRow* (*getFirstRow)( GncSqlResult* );
GncSqlRow* (*getNextRow)( GncSqlResult* );
- void (*dispose)( /*@ only @*/ GncSqlResult* );
+ void (*dispose)( GncSqlResult* );
};
#define gnc_sql_result_get_num_rows(RESULT) \
(RESULT)->getNumRows(RESULT)
@@ -255,27 +253,20 @@ typedef struct
/** Commit an instance of this object to the database
* @return TRUE if successful, FALSE if error
*/
- /*@ null @*/
gboolean (*commit)( GncSqlBackend* be, QofInstance* inst );
/** Load all objects of this type from the database */
- /*@ null @*/
void (*initial_load)( GncSqlBackend* be );
/** Create database tables for this object */
- /*@ null @*/
void (*create_tables)( GncSqlBackend* be );
/** Compile a query on these objects */
- /*@ null @*/
gpointer (*compile_query)( GncSqlBackend* be, QofQuery* pQuery );
/** Run a query on these objects */
- /*@ null @*/
void (*run_query)( GncSqlBackend* be, gpointer pQuery );
/** Free a query on these objects */
- /*@ null @*/
void (*free_query)( GncSqlBackend* be, gpointer pQuery );
/** Write all objects of this type to the database
* @return TRUE if successful, FALSE if error
*/
- /*@ null @*/
gboolean (*write)( GncSqlBackend* be );
} GncSqlObjectBackend;
#define GNC_SQL_BACKEND "gnc:sql:1"
@@ -302,7 +293,7 @@ typedef enum
*/
typedef struct
{
- /*@ only @*/ gchar* name; /**< Column name */
+ gchar* name; /**< Column name */
GncSqlBasicColumnType type; /**< Column basic type */
gint size; /**< Column size (string types) */
gboolean is_unicode; /**< Column is unicode (string types) */
@@ -347,7 +338,7 @@ typedef struct
*/
struct GncSqlColumnTableEntry
{
- /*@ dependent @*/ const gchar* col_name; /**< Column name */
+ const gchar* col_name; /**< Column name */
const gchar* col_type; /**< Column type */
gint size; /**< Column size in bytes, for string columns */
#define COL_PKEY 0x01 /**< The column is a primary key */
@@ -355,13 +346,9 @@ struct GncSqlColumnTableEntry
#define COL_UNIQUE 0x04 /**< The column must contain unique values */
#define COL_AUTOINC 0x08 /**< The column is an auto-incrementing int */
gint flags; /**< Column flags */
- /*@ null @*/
const gchar* gobj_param_name; /**< If non-null, g_object param name */
- /*@ null @*/
const gchar* qof_param_name; /**< If non-null, qof parameter name */
- /*@ null @*/
QofAccessFunc getter; /**< General access function */
- /*@ null @*/
QofSetterFunc setter; /**< General setter function */
};
@@ -374,7 +361,7 @@ typedef enum
typedef void (*GNC_SQL_LOAD_FN)( const GncSqlBackend* be,
GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table );
typedef void (*GNC_SQL_ADD_COL_INFO_TO_LIST_FN)( const GncSqlBackend* be,
const GncSqlColumnTableEntry* table_row,
@@ -423,7 +410,6 @@ typedef struct
* @param table_row DB table column
* @return Access function
*/
-/*@ null @*/
QofAccessFunc gnc_sql_get_getter( QofIdTypeConst obj_name, const GncSqlColumnTableEntry* table_row );
/**
@@ -462,7 +448,6 @@ gboolean gnc_sql_do_db_operation( GncSqlBackend* be,
* @param statement Statement
* @return Results, or NULL if an error has occured
*/
-/*@ null @*/
GncSqlResult* gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStatement* statement );
/**
@@ -474,7 +459,6 @@ GncSqlResult* gnc_sql_execute_select_statement( GncSqlBackend* be, GncSqlStateme
* @param sql SQL SELECT string
* @return Results, or NULL if an error has occured
*/
-/*@ null @*/
GncSqlResult* gnc_sql_execute_select_sql( GncSqlBackend* be, const gchar* sql );
/**
@@ -493,7 +477,6 @@ gint gnc_sql_execute_nonselect_sql( GncSqlBackend* be, const gchar* sql );
* @param sql SQL char string
* @return Statement
*/
-/*@ null @*/
GncSqlStatement* gnc_sql_create_statement_from_sql( GncSqlBackend* be, const gchar* sql );
/**
@@ -506,7 +489,7 @@ GncSqlStatement* gnc_sql_create_statement_from_sql( GncSqlBackend* be, const gch
* @param table DB table description
*/
void gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofIdTypeConst obj_name, gpointer pObject,
+ QofIdTypeConst obj_name, gpointer pObject,
const GncSqlColumnTableEntry* table );
/**
@@ -584,7 +567,7 @@ gboolean gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
* @param row Database row
* @return GncGUID
*/
-/*@ dependent @*//*@ null @*/
+
const GncGUID* gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row );
/**
@@ -595,7 +578,7 @@ const GncGUID* gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row );
* @param row Database row
* @return GncGUID
*/
-/*@ dependent @*//*@ null @*/
+
const GncGUID* gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row );
/**
@@ -605,7 +588,6 @@ const GncGUID* gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row );
* @param table_name Table name
* @return Statement
*/
-/*@ null @*/
GncSqlStatement* gnc_sql_create_select_statement( GncSqlBackend* be,
const gchar* table_name );
@@ -750,16 +732,15 @@ gboolean gnc_sql_add_columns_to_table( GncSqlBackend* be, const gchar* table_nam
*/
void gnc_sql_set_load_order( const gchar** load_order );
-void _retrieve_guid_( gpointer pObject, /*@ null @*/ gpointer pValue );
+void _retrieve_guid_( gpointer pObject, gpointer pValue );
-/*@ null @*/
gpointer gnc_sql_compile_query( QofBackend* pBEnd, QofQuery* pQuery );
void gnc_sql_free_query( QofBackend* pBEnd, gpointer pQuery );
void gnc_sql_run_query( QofBackend* pBEnd, gpointer pQuery );
typedef struct
{
- /*@ dependent @*/ GncSqlBackend* be;
+ GncSqlBackend* be;
gboolean is_ok;
} write_objects_t;
diff --git a/src/backend/sql/gnc-bill-term-sql.cpp b/src/backend/sql/gnc-bill-term-sql.cpp
index 31c4f9d..56ffda8 100644
--- a/src/backend/sql/gnc-bill-term-sql.cpp
+++ b/src/backend/sql/gnc-bill-term-sql.cpp
@@ -93,7 +93,7 @@ static GncSqlColumnTableEntry billterm_parent_col_table[] =
typedef struct
{
- /*@ dependent @*/ GncBillTerm* billterm;
+ GncBillTerm* billterm;
GncGUID guid;
gboolean have_guid;
} billterm_parent_guid_struct;
@@ -111,7 +111,7 @@ set_invisible( gpointer data, gboolean value )
}
}
-static /*@ null @*//*@ dependent @*/ gpointer
+static gpointer
bt_get_parent( gpointer pObject )
{
const GncBillTerm* billterm;
@@ -160,7 +160,7 @@ bt_set_parent( gpointer data, gpointer value )
}
static void
-bt_set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
+bt_set_parent_guid( gpointer pObject, gpointer pValue )
{
billterm_parent_guid_struct* s = (billterm_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
diff --git a/src/backend/sql/gnc-book-sql.cpp b/src/backend/sql/gnc-book-sql.cpp
index 2c504be..4089afe 100644
--- a/src/backend/sql/gnc-book-sql.cpp
+++ b/src/backend/sql/gnc-book-sql.cpp
@@ -51,14 +51,13 @@ extern "C"
G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
-static /*@ dependent @*//*@ null @*/ gpointer get_root_account_guid( gpointer pObject );
-static void set_root_account_guid( gpointer pObject, /*@ null @*/ gpointer pValue );
-static /*@ dependent @*//*@ null @*/ gpointer get_root_template_guid( gpointer pObject );
-static void set_root_template_guid( gpointer pObject, /*@ null @*/ gpointer pValue );
+static gpointer get_root_account_guid( gpointer pObject );
+static void set_root_account_guid( gpointer pObject, gpointer pValue );
+static gpointer get_root_template_guid( gpointer pObject );
+static void set_root_template_guid( gpointer pObject, gpointer pValue );
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{
"root_account_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
@@ -69,11 +68,10 @@ static const GncSqlColumnTableEntry col_table[] =
(QofAccessFunc)get_root_template_guid, set_root_template_guid
},
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
-static /*@ dependent @*//*@ null @*/ gpointer
+static gpointer
get_root_account_guid( gpointer pObject )
{
QofBook* book = QOF_BOOK(pObject);
@@ -87,7 +85,7 @@ get_root_account_guid( gpointer pObject )
}
static void
-set_root_account_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_root_account_guid( gpointer pObject, gpointer pValue )
{
QofBook* book = QOF_BOOK(pObject);
const Account* root;
@@ -101,7 +99,7 @@ set_root_account_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
qof_instance_set_guid( QOF_INSTANCE(root), guid );
}
-static /*@ dependent @*//*@ null @*/ gpointer
+static gpointer
get_root_template_guid( gpointer pObject )
{
const QofBook* book = QOF_BOOK(pObject);
@@ -115,7 +113,7 @@ get_root_template_guid( gpointer pObject )
}
static void
-set_root_template_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_root_template_guid( gpointer pObject, gpointer pValue )
{
QofBook* book = QOF_BOOK(pObject);
GncGUID* guid = (GncGUID*)pValue;
diff --git a/src/backend/sql/gnc-budget-sql.cpp b/src/backend/sql/gnc-budget-sql.cpp
index da94857..b81dcfc 100644
--- a/src/backend/sql/gnc-budget-sql.cpp
+++ b/src/backend/sql/gnc-budget-sql.cpp
@@ -49,25 +49,23 @@ extern "C"
#define AMOUNTS_TABLE "budget_amounts"
#define AMOUNTS_TABLE_VERSION 1
-/*@ unused @*/ static QofLogModule log_module = G_LOG_DOMAIN;
+ static QofLogModule log_module = G_LOG_DOMAIN;
#define BUDGET_MAX_NAME_LEN 2048
#define BUDGET_MAX_DESCRIPTION_LEN 2048
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "name", CT_STRING, BUDGET_MAX_NAME_LEN, COL_NNUL, "name" },
{ "description", CT_STRING, BUDGET_MAX_DESCRIPTION_LEN, 0, "description" },
{ "num_periods", CT_INT, 0, COL_NNUL, "num_periods" },
{ NULL }
- /*@ +full_init_block @*/
};
-static /*@ dependent @*//*@ null @*/ QofInstance* get_budget( gpointer pObj );
+static QofInstance* get_budget( gpointer pObj );
static void set_budget( gpointer pObj, gpointer val );
-static /*@ dependent @*//*@ null @*/ QofInstance* get_account( gpointer pObj );
+static QofInstance* get_account( gpointer pObj );
static void set_account( gpointer pObj, gpointer val );
static gint get_period_num( gpointer pObj );
static void set_period_num( gpointer pObj, gpointer val );
@@ -83,7 +81,6 @@ typedef struct
static const GncSqlColumnTableEntry budget_amounts_col_table[] =
{
- /*@ -full_init_block @*/
{ "id", CT_INT, 0, COL_NNUL | COL_PKEY | COL_AUTOINC },
{
"budget_guid", CT_BUDGETREF, 0, COL_NNUL, NULL, NULL,
@@ -102,11 +99,10 @@ static const GncSqlColumnTableEntry budget_amounts_col_table[] =
(QofAccessFunc)get_amount, (QofSetterFunc)set_amount
},
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
-static /*@ dependent @*//*@ null@ */ QofInstance*
+static QofInstance*
get_budget( gpointer pObj )
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
@@ -121,7 +117,7 @@ set_budget( gpointer pObj, gpointer val )
{
}
-static /*@ dependent @*//*@ null @*/ QofInstance*
+static QofInstance*
get_account( gpointer pObj )
{
budget_amount_info_t* info = (budget_amount_info_t*)pObj;
@@ -257,7 +253,6 @@ static gboolean
save_budget_amounts( GncSqlBackend* be, GncBudget* budget )
{
GList* descendants;
- /*@ dependent @*/
GList* node;
budget_amount_info_t info;
guint num_periods;
@@ -292,7 +287,7 @@ save_budget_amounts( GncSqlBackend* be, GncBudget* budget )
return is_ok;
}
/*----------------------------------------------------------------*/
-static /*@ dependent @*//*@ null @*/ GncBudget*
+static GncBudget*
load_single_budget( GncSqlBackend* be, GncSqlRow* row )
{
const GncGUID* guid;
@@ -477,7 +472,7 @@ write_budgets( GncSqlBackend* be )
/* ================================================================= */
static void
load_budget_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
diff --git a/src/backend/sql/gnc-commodity-sql.cpp b/src/backend/sql/gnc-commodity-sql.cpp
index 63f7020..a441082 100644
--- a/src/backend/sql/gnc-commodity-sql.cpp
+++ b/src/backend/sql/gnc-commodity-sql.cpp
@@ -43,10 +43,10 @@ extern "C"
#include "splint-defs.h"
#endif
-/*@ unused @*/ static QofLogModule log_module = G_LOG_DOMAIN;
+ static QofLogModule log_module = G_LOG_DOMAIN;
-static /*@ dependent @*//*@ null @*/ gpointer get_quote_source_name( gpointer pObject );
-static void set_quote_source_name( gpointer pObject, /*@ null @*/ gpointer pValue );
+static gpointer get_quote_source_name( gpointer pObject );
+static void set_quote_source_name( gpointer pObject, gpointer pValue );
#define COMMODITIES_TABLE "commodities"
#define TABLE_VERSION 1
@@ -60,7 +60,6 @@ static void set_quote_source_name( gpointer pObject, /*@ null @*/ gpointer pValu
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{
"namespace", CT_STRING, COMMODITY_MAX_NAMESPACE_LEN, COL_NNUL, NULL, NULL,
@@ -78,12 +77,11 @@ static const GncSqlColumnTableEntry col_table[] =
},
{ "quote_tz", CT_STRING, COMMODITY_MAX_QUOTE_TZ_LEN, 0, "quote-tz" },
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
-static /*@ dependent @*//*@ null @*/ gpointer
+static gpointer
get_quote_source_name( gpointer pObject )
{
const gnc_commodity* pCommodity;
@@ -113,7 +111,7 @@ set_quote_source_name( gpointer pObject, gpointer pValue )
gnc_commodity_set_quote_source( pCommodity, quote_source );
}
-static /*@ dependent @*/ gnc_commodity*
+static gnc_commodity*
load_single_commodity( GncSqlBackend* be, GncSqlRow* row )
{
QofBook* pBook = be->book;
@@ -274,7 +272,7 @@ gnc_sql_commit_commodity (gnc_commodity *pCommodity)
static void
load_commodity_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
diff --git a/src/backend/sql/gnc-lots-sql.cpp b/src/backend/sql/gnc-lots-sql.cpp
index 087f008..2a84edc 100644
--- a/src/backend/sql/gnc-lots-sql.cpp
+++ b/src/backend/sql/gnc-lots-sql.cpp
@@ -45,17 +45,16 @@ extern "C"
#include "gnc-lots-sql.h"
-/*@ unused @*/ static QofLogModule log_module = G_LOG_DOMAIN;
+ static QofLogModule log_module = G_LOG_DOMAIN;
#define TABLE_NAME "lots"
#define TABLE_VERSION 2
-static /*@ dependent @*//*@ null @*/ gpointer get_lot_account( gpointer pObject );
-static void set_lot_account( gpointer pObject, /*@ null @*/ gpointer pValue );
+static gpointer get_lot_account( gpointer pObject );
+static void set_lot_account( gpointer pObject, gpointer pValue );
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{
"account_guid", CT_ACCOUNTREF, 0, 0, NULL, NULL,
@@ -63,11 +62,10 @@ static const GncSqlColumnTableEntry col_table[] =
},
{ "is_closed", CT_BOOLEAN, 0, COL_NNUL, "is-closed" },
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
-static /*@ dependent @*//*@ null @*/ gpointer
+static gpointer
get_lot_account( gpointer pObject )
{
const GNCLot* lot;
@@ -82,7 +80,7 @@ get_lot_account( gpointer pObject )
}
static void
-set_lot_account( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_lot_account( gpointer pObject, gpointer pValue )
{
GNCLot* lot;
Account* pAccount;
@@ -98,7 +96,7 @@ set_lot_account( gpointer pObject, /*@ null @*/ gpointer pValue )
}
}
-static /*@ dependent @*//*@ null @*/ GNCLot*
+static GNCLot*
load_single_lot( GncSqlBackend* be, GncSqlRow* row )
{
GNCLot* lot;
@@ -216,7 +214,7 @@ write_lots( GncSqlBackend* be )
/* ================================================================= */
static void
load_lot_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
diff --git a/src/backend/sql/gnc-price-sql.cpp b/src/backend/sql/gnc-price-sql.cpp
index a1fa71b..8235e7c 100644
--- a/src/backend/sql/gnc-price-sql.cpp
+++ b/src/backend/sql/gnc-price-sql.cpp
@@ -45,7 +45,7 @@ extern "C"
#include "gnc-slots-sql.h"
-/*@ unused @*/ static QofLogModule log_module = G_LOG_DOMAIN;
+ static QofLogModule log_module = G_LOG_DOMAIN;
#define TABLE_NAME "prices"
#define TABLE_VERSION 2
@@ -55,7 +55,6 @@ extern "C"
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, "commodity" },
{ "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, "currency" },
@@ -64,12 +63,11 @@ static const GncSqlColumnTableEntry col_table[] =
{ "type", CT_STRING, PRICE_MAX_TYPE_LEN, 0, "type" },
{ "value", CT_NUMERIC, 0, COL_NNUL, "value" },
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
-static /*@ null @*//*@ dependent @*/ GNCPrice*
+static GNCPrice*
load_single_price( GncSqlBackend* be, GncSqlRow* row )
{
GNCPrice* pPrice;
diff --git a/src/backend/sql/gnc-recurrence-sql.cpp b/src/backend/sql/gnc-recurrence-sql.cpp
index af2df18..1f49b8b 100644
--- a/src/backend/sql/gnc-recurrence-sql.cpp
+++ b/src/backend/sql/gnc-recurrence-sql.cpp
@@ -53,27 +53,24 @@ G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
typedef struct
{
- /*@ dependent @*/ GncSqlBackend* be;
- /*@ dependent @*/
+ GncSqlBackend* be;
const GncGUID* guid;
- /*@ dependent @*/
Recurrence* pRecurrence;
} recurrence_info_t;
-static /*@ null @*/ gpointer get_obj_guid( gpointer pObject );
+static gpointer get_obj_guid( gpointer pObject );
static void set_obj_guid( void );
static gint get_recurrence_mult( gpointer pObject );
static void set_recurrence_mult( gpointer pObject, gint value );
-static /*@ null @*/ gpointer get_recurrence_period_type( gpointer pObject );
-static void set_recurrence_period_type( gpointer pObject, /*@ null @*/ gpointer pValue );
-static /*@ null @*/ gpointer get_recurrence_weekend_adjust( gpointer pObject );
-static void set_recurrence_weekend_adjust( gpointer pObject, /*@ null @*/ gpointer pValue );
-static /*@ dependent @*//*@ null @*/ gpointer get_recurrence_period_start( gpointer pObject );
-static void set_recurrence_period_start( gpointer pObject, /*@ null @*/ gpointer pValue );
+static gpointer get_recurrence_period_type( gpointer pObject );
+static void set_recurrence_period_type( gpointer pObject, gpointer pValue );
+static gpointer get_recurrence_weekend_adjust( gpointer pObject );
+static void set_recurrence_weekend_adjust( gpointer pObject, gpointer pValue );
+static gpointer get_recurrence_period_start( gpointer pObject );
+static void set_recurrence_period_start( gpointer pObject, gpointer pValue );
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
{ "id", CT_INT, 0, COL_PKEY | COL_NNUL | COL_AUTOINC },
{
"obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
@@ -96,36 +93,31 @@ static const GncSqlColumnTableEntry col_table[] =
(QofAccessFunc)get_recurrence_weekend_adjust, set_recurrence_weekend_adjust
},
{ NULL }
- /*@ +full_init_block @*/
};
/* Special column table because we need to be able to access the table by
a column other than the primary key */
static const GncSqlColumnTableEntry guid_col_table[] =
{
- /*@ -full_init_block @*/
{
"obj_guid", CT_GUID, 0, 0, NULL, NULL,
(QofAccessFunc)get_obj_guid, (QofSetterFunc)set_obj_guid
},
{ NULL }
- /*@ +full_init_block @*/
};
/* Special column table used to upgrade table from version 1 to 2 */
static const GncSqlColumnTableEntry weekend_adjust_col_table[] =
{
- /*@ -full_init_block @*/
{
"recurrence_weekend_adjust", CT_STRING, BUDGET_MAX_RECURRENCE_WEEKEND_ADJUST_LEN, 0,
},
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
-static /*@ null @*/ gpointer
+static gpointer
get_obj_guid( gpointer pObject )
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
@@ -163,7 +155,7 @@ set_recurrence_mult( gpointer pObject, gint value )
pInfo->pRecurrence->mult = (guint16)value;
}
-static /*@ null @*/ gpointer
+static gpointer
get_recurrence_period_type( gpointer pObject )
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
@@ -187,7 +179,7 @@ set_recurrence_period_type( gpointer pObject, gpointer pValue )
pInfo->pRecurrence->ptype = recurrencePeriodTypeFromString( (gchar*)pValue );
}
-static /*@ null @*/ gpointer
+static gpointer
get_recurrence_weekend_adjust( gpointer pObject )
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
@@ -211,7 +203,7 @@ set_recurrence_weekend_adjust( gpointer pObject, gpointer pValue )
pInfo->pRecurrence->wadj = recurrenceWeekendAdjustFromString( (gchar*)pValue );
}
-static /*@ dependent @*//*@ null @*/ gpointer
+static gpointer
get_recurrence_period_start( gpointer pObject )
{
recurrence_info_t* pInfo = (recurrence_info_t*)pObject;
@@ -293,7 +285,7 @@ gnc_sql_recurrence_delete( GncSqlBackend* be, const GncGUID* guid )
}
static void
-load_recurrence( GncSqlBackend* be, GncSqlRow* row, /*@ out @*/ Recurrence* r )
+load_recurrence( GncSqlBackend* be, GncSqlRow* row, Recurrence* r )
{
recurrence_info_t recurrence_info;
@@ -307,7 +299,7 @@ load_recurrence( GncSqlBackend* be, GncSqlRow* row, /*@ out @*/ Recurrence* r )
gnc_sql_load_object( be, row, TABLE_NAME, &recurrence_info, col_table );
}
-static /*@ null @*/ GncSqlResult*
+static GncSqlResult*
gnc_sql_set_recurrences_from_db( GncSqlBackend* be, const GncGUID* guid )
{
gchar* buf;
@@ -327,7 +319,7 @@ gnc_sql_set_recurrences_from_db( GncSqlBackend* be, const GncGUID* guid )
return result;
}
-/*@ null @*/ Recurrence*
+ Recurrence*
gnc_sql_recurrence_load( GncSqlBackend* be, const GncGUID* guid )
{
GncSqlResult* result;
@@ -361,7 +353,7 @@ gnc_sql_recurrence_load( GncSqlBackend* be, const GncGUID* guid )
return r;
}
-/*@ null @*/ GList*
+ GList*
gnc_sql_recurrence_load_list( GncSqlBackend* be, const GncGUID* guid )
{
GncSqlResult* result;
diff --git a/src/backend/sql/gnc-recurrence-sql.h b/src/backend/sql/gnc-recurrence-sql.h
index 24caa2a..c03826e 100644
--- a/src/backend/sql/gnc-recurrence-sql.h
+++ b/src/backend/sql/gnc-recurrence-sql.h
@@ -39,9 +39,7 @@ extern "C"
gboolean gnc_sql_recurrence_save( GncSqlBackend* be, const GncGUID* guid, const Recurrence* pRecurrence );
void gnc_sql_recurrence_save_list( GncSqlBackend* be, const GncGUID* guid, GList* schedule );
gboolean gnc_sql_recurrence_delete( GncSqlBackend* be, const GncGUID* guid );
-/*@ null @*/
Recurrence* gnc_sql_recurrence_load( GncSqlBackend* be, const GncGUID* guid );
-/*@ null @*/
GList* gnc_sql_recurrence_load_list( GncSqlBackend* be, const GncGUID* guid );
void gnc_sql_init_recurrence_handler( void );
diff --git a/src/backend/sql/gnc-schedxaction-sql.cpp b/src/backend/sql/gnc-schedxaction-sql.cpp
index 15efc4a..be8c423 100644
--- a/src/backend/sql/gnc-schedxaction-sql.cpp
+++ b/src/backend/sql/gnc-schedxaction-sql.cpp
@@ -57,7 +57,6 @@ G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
static const GncSqlColumnTableEntry col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "name", CT_STRING, SX_MAX_NAME_LEN, 0, "name" },
{ "enabled", CT_BOOLEAN, 0, COL_NNUL, "enabled" },
@@ -73,11 +72,10 @@ static const GncSqlColumnTableEntry col_table[] =
{ "instance_count", CT_INT, 0, COL_NNUL, "instance-count" },
{ "template_act_guid", CT_ACCOUNTREF, 0, COL_NNUL, "template-account" },
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
-static /*@ null @*/ SchedXaction*
+static SchedXaction*
load_single_sx( GncSqlBackend* be, GncSqlRow* row )
{
const GncGUID* guid;
diff --git a/src/backend/sql/gnc-slots-sql.cpp b/src/backend/sql/gnc-slots-sql.cpp
index dfbe95d..67209f7 100644
--- a/src/backend/sql/gnc-slots-sql.cpp
+++ b/src/backend/sql/gnc-slots-sql.cpp
@@ -43,7 +43,7 @@ extern "C"
#include <kvp_frame.hpp>
-/*@ unused @*/ static QofLogModule log_module = G_LOG_DOMAIN;
+ static QofLogModule log_module = G_LOG_DOMAIN;
#define TABLE_NAME "slots"
#define TABLE_VERSION 3
@@ -57,37 +57,34 @@ typedef enum
typedef struct
{
- /*@ dependent @*/ GncSqlBackend* be;
- /*@ dependent @*/
+ GncSqlBackend* be;
const GncGUID* guid;
gboolean is_ok;
- /*@ dependent @*/
KvpFrame* pKvpFrame;
KvpValue::Type value_type;
GList *pList;
context_t context;
- /*@ dependent @*/
KvpValue* pKvpValue;
GString* path;
} slot_info_t;
-static /*@ null @*/ gpointer get_obj_guid( gpointer pObject );
+static gpointer get_obj_guid( gpointer pObject );
static void set_obj_guid( void );
-static /*@ null @*/ gpointer get_path( gpointer pObject );
-static void set_path( gpointer pObject, /*@ null @*/ gpointer pValue );
+static gpointer get_path( gpointer pObject );
+static void set_path( gpointer pObject, gpointer pValue );
static KvpValue::Type get_slot_type( gpointer pObject );
-static void set_slot_type( gpointer pObject, /*@ null @*/ gpointer pValue );
+static void set_slot_type( gpointer pObject, gpointer pValue );
static gint64 get_int64_val( gpointer pObject );
static void set_int64_val( gpointer pObject, gint64 pValue );
-static /*@ null @*/ gpointer get_string_val( gpointer pObject );
-static void set_string_val( gpointer pObject, /*@ null @*/ gpointer pValue );
-static /*@ dependent @*//*@ null @*/ gpointer get_double_val( gpointer pObject );
-static void set_double_val( gpointer pObject, /*@ null @*/ gpointer pValue );
+static gpointer get_string_val( gpointer pObject );
+static void set_string_val( gpointer pObject, gpointer pValue );
+static gpointer get_double_val( gpointer pObject );
+static void set_double_val( gpointer pObject, gpointer pValue );
static Timespec get_timespec_val( gpointer pObject );
static void set_timespec_val( gpointer pObject, Timespec ts );
-static /*@ null @*/ gpointer get_guid_val( gpointer pObject );
-static void set_guid_val( gpointer pObject, /*@ null @*/ gpointer pValue );
+static gpointer get_guid_val( gpointer pObject );
+static void set_guid_val( gpointer pObject, gpointer pValue );
static gnc_numeric get_numeric_val( gpointer pObject );
static void set_numeric_val( gpointer pObject, gnc_numeric value );
static GDate* get_gdate_val( gpointer pObject );
@@ -115,7 +112,6 @@ enum
static const GncSqlColumnTableEntry col_table[] =
{
/* col_name, col_type, size, flags, g0bj_param_name, qof_param_name, getter, setter */
- /*@ -full_init_block @*/
{ "id", CT_INT, 0, COL_PKEY | COL_NNUL | COL_AUTOINC },
{
"obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
@@ -158,25 +154,20 @@ static const GncSqlColumnTableEntry col_table[] =
(QofAccessFunc)get_gdate_val, (QofSetterFunc)set_gdate_val
},
{ NULL }
- /*@ +full_init_block @*/
};
/* Special column table because we need to be able to access the table by
a column other than the primary key */
static const GncSqlColumnTableEntry obj_guid_col_table[] =
{
- /*@ -full_init_block @*/
{ "obj_guid", CT_GUID, 0, 0, NULL, NULL, (QofAccessFunc)get_obj_guid, _retrieve_guid_ },
{ NULL }
- /*@ +full_init_block @*/
};
static const GncSqlColumnTableEntry gdate_col_table[] =
{
- /*@ -full_init_block @*/
{ "gdate_val", CT_GDATE, 0, 0, },
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
@@ -280,7 +271,7 @@ set_slot_from_value( slot_info_t *pInfo, KvpValue *pValue)
}
}
-static /*@ null @*/ gpointer
+static gpointer
get_obj_guid( gpointer pObject )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
@@ -296,7 +287,7 @@ set_obj_guid( void )
// Nowhere to put the GncGUID
}
-static /*@ null @*/ gpointer
+static gpointer
get_path( gpointer pObject )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
@@ -307,7 +298,7 @@ get_path( gpointer pObject )
}
static void
-set_path( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_path( gpointer pObject, gpointer pValue )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
@@ -333,7 +324,7 @@ get_slot_type( gpointer pObject )
}
static void
-set_slot_type( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_slot_type( gpointer pObject, gpointer pValue )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
@@ -373,7 +364,7 @@ set_int64_val( gpointer pObject, gint64 value )
set_slot_from_value( pInfo, pValue );
}
-static /*@ null @*/ gpointer
+static gpointer
get_string_val( gpointer pObject )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
@@ -391,7 +382,7 @@ get_string_val( gpointer pObject )
}
static void
-set_string_val( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_string_val( gpointer pObject, gpointer pValue )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
g_return_if_fail( pObject != NULL );
@@ -403,7 +394,7 @@ set_string_val( gpointer pObject, /*@ null @*/ gpointer pValue )
set_slot_from_value( pInfo, value );
}
-static /*@ dependent @*//*@ null @*/ gpointer
+static gpointer
get_double_val( gpointer pObject )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
@@ -423,7 +414,7 @@ get_double_val( gpointer pObject )
}
static void
-set_double_val( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_double_val( gpointer pObject, gpointer pValue )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
KvpValue *value = NULL;
@@ -459,7 +450,7 @@ set_timespec_val( gpointer pObject, Timespec ts )
set_slot_from_value( pInfo, value );
}
-static /*@ null @*/ gpointer
+static gpointer
get_guid_val( gpointer pObject )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
@@ -477,7 +468,7 @@ get_guid_val( gpointer pObject )
}
static void
-set_guid_val( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_guid_val( gpointer pObject, gpointer pValue )
{
slot_info_t* pInfo = (slot_info_t*)pObject;
@@ -869,7 +860,7 @@ slots_load_info ( slot_info_t *pInfo )
}
}
-static /*@ dependent @*//*@ null @*/ const GncGUID*
+static const GncGUID*
load_obj_guid( const GncSqlBackend* be, GncSqlRow* row )
{
static GncGUID guid;
diff --git a/src/backend/sql/gnc-tax-table-sql.cpp b/src/backend/sql/gnc-tax-table-sql.cpp
index d0512b1..b279f8f 100644
--- a/src/backend/sql/gnc-tax-table-sql.cpp
+++ b/src/backend/sql/gnc-tax-table-sql.cpp
@@ -120,7 +120,7 @@ static GncSqlColumnTableEntry guid_col_table[] =
typedef struct
{
- /*@ dependent @*/ GncTaxTable* tt;
+ GncTaxTable* tt;
GncGUID guid;
gboolean have_guid;
} taxtable_parent_guid_struct;
@@ -141,7 +141,7 @@ set_obj_guid( gpointer pObject, gpointer pValue )
// Nowhere to put the GncGUID
}
-static /*@ null @*//*@ dependent @*/ gpointer
+static gpointer
bt_get_parent( gpointer pObject )
{
const GncTaxTable* tt;
@@ -190,7 +190,7 @@ tt_set_parent( gpointer data, gpointer value )
}
static void
-tt_set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
+tt_set_parent_guid( gpointer pObject, gpointer pValue )
{
taxtable_parent_guid_struct* s = (taxtable_parent_guid_struct*)pObject;
GncGUID* guid = (GncGUID*)pValue;
diff --git a/src/backend/sql/gnc-transaction-sql.cpp b/src/backend/sql/gnc-transaction-sql.cpp
index baf6c0c..07231ed 100644
--- a/src/backend/sql/gnc-transaction-sql.cpp
+++ b/src/backend/sql/gnc-transaction-sql.cpp
@@ -66,8 +66,7 @@ static QofLogModule log_module = G_LOG_DOMAIN;
typedef struct
{
- /*@ dependent @*/ GncSqlBackend* be;
- /*@ dependent @*/
+ GncSqlBackend* be;
const GncGUID* guid;
gboolean is_ok;
} split_info_t;
@@ -77,7 +76,6 @@ typedef struct
static const GncSqlColumnTableEntry tx_col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, "currency" },
{ "num", CT_STRING, TX_MAX_NUM_LEN, COL_NNUL, "num" },
@@ -85,19 +83,17 @@ static const GncSqlColumnTableEntry tx_col_table[] =
{ "enter_date", CT_TIMESPEC, 0, 0, "enter-date" },
{ "description", CT_STRING, TX_MAX_DESCRIPTION_LEN, 0, "description" },
{ NULL }
- /*@ +full_init_block @*/
};
-static /*@ dependent @*//*@ null @*/ gpointer get_split_reconcile_state( gpointer pObject );
-static void set_split_reconcile_state( gpointer pObject, /*@ null @*/ gpointer pValue );
-static void set_split_lot( gpointer pObject, /*@ null @*/ gpointer pLot );
+static gpointer get_split_reconcile_state( gpointer pObject );
+static void set_split_reconcile_state( gpointer pObject, gpointer pValue );
+static void set_split_lot( gpointer pObject, gpointer pLot );
#define SPLIT_MAX_MEMO_LEN 2048
#define SPLIT_MAX_ACTION_LEN 2048
static const GncSqlColumnTableEntry split_col_table[] =
{
- /*@ -full_init_block @*/
{ "guid", CT_GUID, 0, COL_NNUL | COL_PKEY, "guid" },
{ "tx_guid", CT_TXREF, 0, COL_NNUL, "transaction" },
{ "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, "account" },
@@ -115,36 +111,29 @@ static const GncSqlColumnTableEntry split_col_table[] =
(QofAccessFunc)xaccSplitGetLot, set_split_lot
},
{ NULL }
- /*@ +full_init_block @*/
};
static const GncSqlColumnTableEntry post_date_col_table[] =
{
- /*@ -full_init_block @*/
{ "post_date", CT_TIMESPEC, 0, 0, "post-date" },
{ NULL }
- /*@ +full_init_block @*/
};
static const GncSqlColumnTableEntry account_guid_col_table[] =
{
- /*@ -full_init_block @*/
{ "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, "account" },
{ NULL }
- /*@ +full_init_block @*/
};
static const GncSqlColumnTableEntry tx_guid_col_table[] =
{
- /*@ -full_init_block @*/
{ "tx_guid", CT_GUID, 0, 0, "guid" },
{ NULL }
- /*@ +full_init_block @*/
};
/* ================================================================= */
-static /*@ dependent @*//*@ null @*/ gpointer
+static gpointer
get_split_reconcile_state( gpointer pObject )
{
static gchar c[2];
@@ -158,7 +147,7 @@ get_split_reconcile_state( gpointer pObject )
}
static void
-set_split_reconcile_state( gpointer pObject, /*@ null @*/ gpointer pValue )
+set_split_reconcile_state( gpointer pObject, gpointer pValue )
{
const gchar* s = (const gchar*)pValue;
@@ -170,7 +159,7 @@ set_split_reconcile_state( gpointer pObject, /*@ null @*/ gpointer pValue )
}
static void
-set_split_lot( gpointer pObject, /*@ null @*/ gpointer pLot )
+set_split_lot( gpointer pObject, gpointer pLot )
{
GNCLot* lot;
Split* split;
@@ -187,7 +176,7 @@ set_split_lot( gpointer pObject, /*@ null @*/ gpointer pLot )
gnc_lot_add_split( lot, split );
}
-static /*@ null @*/ Split*
+static Split*
load_single_split( GncSqlBackend* be, GncSqlRow* row )
{
const GncGUID* guid;
@@ -280,7 +269,7 @@ load_splits_for_tx_list( GncSqlBackend* be, GList* list )
(void)g_string_free( sql, TRUE );
}
-static /*@ null @*/ Transaction*
+static Transaction*
load_single_tx( GncSqlBackend* be, GncSqlRow* row )
{
const GncGUID* guid;
@@ -325,7 +314,7 @@ load_single_tx( GncSqlBackend* be, GncSqlRow* row )
*/
typedef struct
{
- /*@ dependent @*/ Account* acc;
+ Account* acc;
gnc_numeric start_bal;
gnc_numeric end_bal;
gnc_numeric start_cleared_bal;
@@ -1078,7 +1067,7 @@ typedef struct
#define TX_GUID_CHECK 0
-G_GNUC_UNUSED static /*@ null @*/ gpointer
+G_GNUC_UNUSED static gpointer
compile_split_query( GncSqlBackend* be, QofQuery* query )
{
split_query_info_t* query_info = NULL;
@@ -1269,8 +1258,7 @@ free_split_query( GncSqlBackend* be, gpointer pQuery )
/* ----------------------------------------------------------------- */
typedef struct
{
- /*@ dependent @*/ const GncSqlBackend* be;
- /*@ dependent @*/
+ const GncSqlBackend* be;
Account* acct;
char reconcile_state;
gnc_numeric balance;
@@ -1312,15 +1300,13 @@ set_acct_bal_balance( gpointer pObject, gnc_numeric value )
static const GncSqlColumnTableEntry acct_balances_col_table[] =
{
- /*@ -full_init_block @*/
{ "account_guid", CT_GUID, 0, 0, NULL, NULL, NULL, (QofSetterFunc)set_acct_bal_account_from_guid },
{ "reconcile_state", CT_STRING, 1, 0, NULL, NULL, NULL, (QofSetterFunc)set_acct_bal_reconcile_state },
{ "quantity", CT_NUMERIC, 0, 0, NULL, NULL, NULL, (QofSetterFunc)set_acct_bal_balance },
{ NULL }
- /*@ +full_init_block @*/
};
-G_GNUC_UNUSED static /*@ null @*/ single_acct_balance_t*
+G_GNUC_UNUSED static single_acct_balance_t*
load_single_acct_balances( const GncSqlBackend* be, GncSqlRow* row )
{
single_acct_balance_t* bal = NULL;
@@ -1337,7 +1323,7 @@ load_single_acct_balances( const GncSqlBackend* be, GncSqlRow* row )
return bal;
}
-/*@ null @*/ GSList*
+ GSList*
gnc_sql_get_account_balances_slist( GncSqlBackend* be )
{
#if LOAD_TRANSACTIONS_AS_NEEDED
@@ -1429,7 +1415,7 @@ gnc_sql_get_account_balances_slist( GncSqlBackend* be )
/* ----------------------------------------------------------------- */
static void
load_tx_guid( const GncSqlBackend* be, GncSqlRow* row,
- /*@ null @*/ QofSetterFunc setter, gpointer pObject,
+ QofSetterFunc setter, gpointer pObject,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
diff --git a/src/backend/sql/gnc-transaction-sql.h b/src/backend/sql/gnc-transaction-sql.h
index 2901059..d2332fb 100644
--- a/src/backend/sql/gnc-transaction-sql.h
+++ b/src/backend/sql/gnc-transaction-sql.h
@@ -85,7 +85,6 @@ typedef struct
* @param be SQL backend
* @return GSList of acct_balances_t structures
*/
-/*@ null @*/
GSList* gnc_sql_get_account_balances_slist( GncSqlBackend* be );
#endif /* GNC_TRANSACTION_SQL_H */
commit dc02bd5e12f54bcec21ae73235da044fc52543ea
Merge: 94ca780 a7a0dbc
Author: John Ralls <jralls at ceridwen.us>
Date: Mon May 23 11:47:06 2016 -0700
Merge branch 'maint'
commit a7a0dbcc4b82733e5e0ac499de2cd3b959205ce4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 21 17:45:51 2016 +0200
Bug 765859 - The budget reports missing in Hungarian edition
diff --git a/po/hu.po b/po/hu.po
index 7cafd7f..b432a13 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5306,7 +5306,7 @@ msgstr "Ãœtemezett tranzakciók beállÃtása kölcsön törlesztésére"
#: ../src/gnome/gnc-plugin-basic-commands.c:174
#: ../src/report/report-system/report.scm:67
msgid "B_udget"
-msgstr "Költségvetés"
+msgstr "_Költségvetés"
#: ../src/gnome/gnc-plugin-basic-commands.c:177
msgid "Close _Books"
commit a2ded744b3c0d8e05d4cc4f57a813a4be277d498
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 21 15:54:55 2016 +0200
Fix travis build
diff --git a/src/business/business-ledger/gncEntryLedgerControl.c b/src/business/business-ledger/gncEntryLedgerControl.c
index 96110a5..7233fed 100644
--- a/src/business/business-ledger/gncEntryLedgerControl.c
+++ b/src/business/business-ledger/gncEntryLedgerControl.c
@@ -581,8 +581,8 @@ gnc_entry_ledger_auto_completion (GncEntryLedger *ledger,
/* Taxable?, Tax-include?, Tax table */
{
- gboolean taxable, taxincluded;
- GncTaxTable *taxtable;
+ gboolean taxable = FALSE, taxincluded = FALSE;
+ GncTaxTable *taxtable = NULL;
switch (ledger->type)
{
case GNCENTRY_INVOICE_ENTRY:
commit efbe26bc2619f318148bf9ff3edd69af5b2b9818
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 21 15:39:07 2016 +0200
Bug 736352 - Expense Voucher adds tax automatically
Expense vouchers don't use tax tables, so prevent autocomplete
from setting one anyway.
diff --git a/src/business/business-ledger/gncEntryLedgerControl.c b/src/business/business-ledger/gncEntryLedgerControl.c
index ed8768b..96110a5 100644
--- a/src/business/business-ledger/gncEntryLedgerControl.c
+++ b/src/business/business-ledger/gncEntryLedgerControl.c
@@ -499,15 +499,10 @@ gnc_entry_ledger_auto_completion (GncEntryLedger *ledger,
return FALSE;
/* Ok, we are sure we want to trigger auto-completion. Now find an
- * entry to copy the values from. FIXME: Currently we only use
- * the entries from the current invoice/bill, but it would be
- * better to draw this from a larger set of entries. */
+ * entry to copy the values from. */
auto_entry =
/* Use this for book-wide auto-completion of the invoice entries */
find_entry_in_book_by_desc(ledger, desc);
- /* #else */
- /* gnc_find_entry_in_reg_by_desc(ledger, desc); */
- /* #endif */
if (auto_entry == NULL)
return FALSE;
@@ -596,26 +591,39 @@ gnc_entry_ledger_auto_completion (GncEntryLedger *ledger,
taxincluded = gncEntryGetInvTaxIncluded (auto_entry);
taxtable = gncEntryGetInvTaxTable (auto_entry);
break;
- default:
+ case GNCENTRY_BILL_ENTRY:
+ case GNCENTRY_VEND_CREDIT_NOTE_ENTRY:
taxable = gncEntryGetBillTaxable (auto_entry);
taxincluded = gncEntryGetBillTaxIncluded (auto_entry);
taxtable = gncEntryGetBillTaxTable (auto_entry);
break;
+ default:
+ break;
}
- /* Taxable? cell */
- cell = gnc_table_layout_get_cell (ledger->table->layout, ENTRY_TAXABLE_CELL);
- gnc_checkbox_cell_set_flag ((CheckboxCell *) cell, taxable);
- gnc_basic_cell_set_changed (cell, TRUE);
-
- /* taxincluded? cell */
- cell = gnc_table_layout_get_cell (ledger->table->layout, ENTRY_TAXINCLUDED_CELL);
- gnc_checkbox_cell_set_flag ((CheckboxCell *) cell, taxincluded);
- gnc_basic_cell_set_changed (cell, TRUE);
-
- /* Taxable? cell */
- cell = gnc_table_layout_get_cell (ledger->table->layout, ENTRY_TAXTABLE_CELL);
- set_value_combo_cell(cell, gncTaxTableGetName (taxtable));
+ switch (ledger->type)
+ {
+ case GNCENTRY_INVOICE_ENTRY:
+ case GNCENTRY_CUST_CREDIT_NOTE_ENTRY:
+ case GNCENTRY_BILL_ENTRY:
+ case GNCENTRY_VEND_CREDIT_NOTE_ENTRY:
+ /* Taxable? cell */
+ cell = gnc_table_layout_get_cell (ledger->table->layout, ENTRY_TAXABLE_CELL);
+ gnc_checkbox_cell_set_flag ((CheckboxCell *) cell, taxable);
+ gnc_basic_cell_set_changed (cell, TRUE);
+
+ /* taxincluded? cell */
+ cell = gnc_table_layout_get_cell (ledger->table->layout, ENTRY_TAXINCLUDED_CELL);
+ gnc_checkbox_cell_set_flag ((CheckboxCell *) cell, taxincluded);
+ gnc_basic_cell_set_changed (cell, TRUE);
+
+ /* Taxable? cell */
+ cell = gnc_table_layout_get_cell (ledger->table->layout, ENTRY_TAXTABLE_CELL);
+ set_value_combo_cell(cell, gncTaxTableGetName (taxtable));
+ break;
+ default:
+ break;
+ }
}
commit 5ef9b8121eb4e1e4247d0f851d983620bb8b0a4b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 21 15:04:19 2016 +0200
Bug 766200 - Three-up printing does not position the third check properly
Handle drawing translations properly
- take empty checks into account on first page both when printing
one check only (bug 693342) and when printing multiple
checks
- fix page level translations, should only be called once
- draw debug grid once for each page instead of for each check
To be mentioned in release notes:
A few bugs in the calculation of check positions while printing checks have been corrected. If you manually edited the check formats to compensate for these positioning errors in previous versions of gnucash, you may have to undo these changes. Please check this before printing your next check.
diff --git a/src/gnome/dialog-print-check.c b/src/gnome/dialog-print-check.c
index 9d3913a..6d6a7c4 100644
--- a/src/gnome/dialog-print-check.c
+++ b/src/gnome/dialog-print-check.c
@@ -2238,33 +2238,19 @@ draw_check_format(GtkPrintContext *context, gint position,
check_format_t *format, gpointer user_data)
{
PrintCheckDialog *pcd = (PrintCheckDialog *) user_data;
- cairo_t *cr;
gdouble x, y, r, multip;
+ cairo_t *cr = gtk_print_context_get_cairo_context(context);
- cr = gtk_print_context_get_cairo_context(context);
- cairo_translate(cr, format->trans_x, format->trans_y);
- g_debug("Page translated by %f,%f", format->trans_x, format->trans_y);
- cairo_rotate(cr, format->rotation * DEGREES_TO_RADIANS);
- g_debug("Page rotated by %f degrees", format->rotation);
-
- /* The grid is useful when determining check layouts */
- if (format->show_grid)
- {
- draw_grid(context,
- gtk_print_context_get_width(context),
- gtk_print_context_get_height(context),
- pcd->default_font);
- }
-
- /* Translate all subsequent check items if requested.
- * For check position 0, no translation is needed. */
+ /* Translate all subsequent check items if required. */
if ((position > 0) && (position < pcd->position_max))
{
/* Standard positioning is used.
* Note that the first check on the page (position 0) doesn't
* need to be moved (hence the test for position > 0 above. */
- cairo_translate(cr, 0, position * format->height);
- g_debug("Position %d translated by %f (pre-defined)", position, position * format->height);
+ cairo_translate(cr, 0, format->height); /* Translation is relative to previous
+ check translation, not to page border ! */
+ g_debug("Position %d translated by %f relative to previous check (pre-defined)", position, format->height);
+ g_debug(" by %f relative to page (pre-defined)", position * format->height);
}
else if (position == pcd->position_max)
{
@@ -2392,6 +2378,7 @@ draw_page(GtkPrintOperation *operation,
{
PrintCheckDialog *pcd = (PrintCheckDialog *) user_data;
check_format_t *format;
+ cairo_t *cr = gtk_print_context_get_cairo_context(context);
format = pcd->selected_format;
if (format)
@@ -2401,6 +2388,7 @@ draw_page(GtkPrintOperation *operation,
guint check_count = g_list_length(pcd->splits);
gint check_number;
gint position = gtk_combo_box_get_active(GTK_COMBO_BOX(pcd->position_combobox));
+ gint last_blank_check_pos;
gint checks_per_page;
GList *next_split;
@@ -2432,6 +2420,28 @@ draw_page(GtkPrintOperation *operation,
position = 0;
}
+ /* Do page level translations/rotations */
+ cairo_translate(cr, format->trans_x, format->trans_y);
+ g_debug("Page translated by %f,%f", format->trans_x, format->trans_y);
+ cairo_rotate(cr, format->rotation * DEGREES_TO_RADIANS);
+ g_debug("Page rotated by %f degrees", format->rotation);
+
+ /* The grid is useful when determining check layouts */
+ if (format->show_grid)
+ {
+ draw_grid(context,
+ gtk_print_context_get_width(context),
+ gtk_print_context_get_height(context),
+ pcd->default_font);
+ }
+
+ last_blank_check_pos = position - 1;
+ /* Optionally skip blank check positions if */
+ if ((page_nr == 0) /* on first page AND */
+ && (last_blank_check_pos > 0) /* there's more than one blank check */
+ && (position < pcd->position_max)) /* but don't skip for custom positioning */
+ cairo_translate(cr, 0, format->height * last_blank_check_pos);
+
for (check_number = first_check; check_number <= last_check;
check_number++, position++)
{
commit fa22986c9bcee4729dac8db4e754d8d581df604d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 21 14:23:20 2016 +0200
Check printing: make logic easier to follow
- rework formula to calculate number of pages so it's easier to understand by a human
- add comments to clarify relations between position, position_max, first_page_count and so on
diff --git a/src/gnome/dialog-print-check.c b/src/gnome/dialog-print-check.c
index 1ec4c3e..9d3913a 100644
--- a/src/gnome/dialog-print-check.c
+++ b/src/gnome/dialog-print-check.c
@@ -2460,15 +2460,31 @@ begin_print(GtkPrintOperation *operation,
{
PrintCheckDialog *pcd = (PrintCheckDialog *) user_data;
guint check_count = g_list_length(pcd->splits);
- gint first_page_count;
gint pages;
gint position = gtk_combo_box_get_active(GTK_COMBO_BOX(pcd->position_combobox));
- if (pcd->selected_format && pcd->position_max > 1 && position < pcd->position_max)
+ if (pcd->selected_format /* User selected a format other than custom */
+ && pcd->position_max > 1 /* The format has more than one check per page
+ (position_max is equivalent to custom
+ positioning, and there need to be at least two
+ other check defined positions (0 and 1), so
+ custom positioning should be at least
+ at position 2, i.e. >1) */
+ && position < pcd->position_max) /* User chose a check position other
+ then custom (which is always at
+ position_max in the list) */
{
+ gint first_page_count, remaining_count;
+
first_page_count = gtk_spin_button_get_value_as_int(pcd->first_page_count);
- pages = ((check_count - first_page_count) + pcd->position_max - 1) /
- pcd->position_max + 1;
+ remaining_count = check_count - first_page_count;
+ pages = 1 /* First page, will have first_page_count checks */
+ + remaining_count / pcd->position_max;
+ /* Subsequent pages with all positions filled */
+ if ((remaining_count % pcd->position_max) > 0)
+ pages++; /* Last page, not all positions are filled. Needs to be added
+ separately because integer division rounds towards 0 and
+ would omit the last checks if they didn't fill a full page */
}
else
pages = check_count;
Summary of changes:
po/hu.po | 2 +-
src/backend/dbi/gnc-backend-dbi-priv.h | 30 +-
src/backend/dbi/gnc-backend-dbi.cpp | 2463 ++++++++---------
src/backend/dbi/gnc-backend-dbi.h | 8 +-
src/backend/dbi/gncmod-backend-dbi.c | 28 +-
src/backend/dbi/test/Makefile.am | 2 +-
src/backend/dbi/test/test-backend-dbi-basic.cpp | 264 +-
src/backend/dbi/test/test-backend-dbi.cpp | 16 +-
src/backend/dbi/test/test-dbi-business-stuff.cpp | 112 +-
src/backend/dbi/test/test-dbi-business-stuff.h | 2 +-
src/backend/dbi/test/test-dbi-stuff.cpp | 172 +-
src/backend/dbi/test/test-dbi-stuff.h | 5 +-
src/backend/sql/escape.cpp | 40 +-
src/backend/sql/escape.h | 6 +-
src/backend/sql/gnc-account-sql.cpp | 283 +-
src/backend/sql/gnc-account-sql.h | 4 +-
src/backend/sql/gnc-address-sql.cpp | 151 +-
src/backend/sql/gnc-address-sql.h | 2 +-
src/backend/sql/gnc-backend-sql.cpp | 2817 ++++++++++----------
src/backend/sql/gnc-backend-sql.h | 377 +--
src/backend/sql/gnc-bill-term-sql.cpp | 241 +-
src/backend/sql/gnc-bill-term-sql.h | 4 +-
src/backend/sql/gnc-book-sql.cpp | 155 +-
src/backend/sql/gnc-book-sql.h | 4 +-
src/backend/sql/gnc-budget-sql.cpp | 352 +--
src/backend/sql/gnc-budget-sql.h | 2 +-
src/backend/sql/gnc-commodity-sql.cpp | 202 +-
src/backend/sql/gnc-commodity-sql.h | 4 +-
src/backend/sql/gnc-customer-sql.cpp | 123 +-
src/backend/sql/gnc-customer-sql.h | 2 +-
src/backend/sql/gnc-employee-sql.cpp | 146 +-
src/backend/sql/gnc-employee-sql.h | 2 +-
src/backend/sql/gnc-entry-sql.cpp | 185 +-
src/backend/sql/gnc-entry-sql.h | 2 +-
src/backend/sql/gnc-invoice-sql.cpp | 185 +-
src/backend/sql/gnc-invoice-sql.h | 2 +-
src/backend/sql/gnc-job-sql.cpp | 113 +-
src/backend/sql/gnc-job-sql.h | 2 +-
src/backend/sql/gnc-lots-sql.cpp | 168 +-
src/backend/sql/gnc-lots-sql.h | 2 +-
src/backend/sql/gnc-order-sql.cpp | 150 +-
src/backend/sql/gnc-order-sql.h | 2 +-
src/backend/sql/gnc-owner-sql.cpp | 229 +-
src/backend/sql/gnc-owner-sql.h | 2 +-
src/backend/sql/gnc-price-sql.cpp | 135 +-
src/backend/sql/gnc-price-sql.h | 2 +-
src/backend/sql/gnc-recurrence-sql.cpp | 281 +-
src/backend/sql/gnc-recurrence-sql.h | 16 +-
src/backend/sql/gnc-schedxaction-sql.cpp | 120 +-
src/backend/sql/gnc-schedxaction-sql.h | 4 +-
src/backend/sql/gnc-slots-sql.cpp | 807 +++---
src/backend/sql/gnc-slots-sql.h | 20 +-
src/backend/sql/gnc-tax-table-sql.cpp | 352 +--
src/backend/sql/gnc-tax-table-sql.h | 2 +-
src/backend/sql/gnc-transaction-sql.cpp | 1126 ++++----
src/backend/sql/gnc-transaction-sql.h | 14 +-
src/backend/sql/gnc-vendor-sql.cpp | 137 +-
src/backend/sql/gnc-vendor-sql.h | 2 +-
src/backend/sql/test/test-column-types.cpp | 14 +-
src/backend/sql/test/test-sqlbe.cpp | 16 +-
src/backend/sql/test/utest-gnc-backend-sql.cpp | 64 +-
src/backend/xml/gnc-account-xml-v2.cpp | 296 +-
src/backend/xml/gnc-address-xml-v2.cpp | 102 +-
src/backend/xml/gnc-address-xml-v2.h | 4 +-
src/backend/xml/gnc-backend-xml.cpp | 552 ++--
src/backend/xml/gnc-backend-xml.h | 22 +-
src/backend/xml/gnc-bill-term-xml-v2.cpp | 405 +--
src/backend/xml/gnc-bill-term-xml-v2.h | 2 +-
src/backend/xml/gnc-book-xml-v2.cpp | 160 +-
src/backend/xml/gnc-budget-xml-v2.cpp | 106 +-
src/backend/xml/gnc-commodity-xml-v2.cpp | 192 +-
src/backend/xml/gnc-customer-xml-v2.cpp | 253 +-
src/backend/xml/gnc-employee-xml-v2.cpp | 225 +-
src/backend/xml/gnc-entry-xml-v2.cpp | 341 +--
src/backend/xml/gnc-freqspec-xml-v2.cpp | 271 +-
src/backend/xml/gnc-invoice-xml-v2.cpp | 249 +-
src/backend/xml/gnc-job-xml-v2.cpp | 156 +-
src/backend/xml/gnc-lot-xml-v2.cpp | 86 +-
src/backend/xml/gnc-order-xml-v2.cpp | 172 +-
src/backend/xml/gnc-owner-xml-v2.cpp | 60 +-
src/backend/xml/gnc-owner-xml-v2.h | 6 +-
src/backend/xml/gnc-pricedb-xml-v2.cpp | 302 +--
src/backend/xml/gnc-recurrence-xml-v2.cpp | 84 +-
src/backend/xml/gnc-schedxaction-xml-v2.cpp | 668 ++---
src/backend/xml/gnc-tax-table-xml-v2.cpp | 352 +--
src/backend/xml/gnc-transaction-xml-v2.cpp | 430 +--
src/backend/xml/gnc-vendor-xml-v2.cpp | 221 +-
src/backend/xml/gnc-xml-helper.cpp | 16 +-
src/backend/xml/gnc-xml-helper.h | 2 +-
src/backend/xml/gnc-xml.h | 42 +-
src/backend/xml/gncmod-backend-xml.cpp | 72 +-
src/backend/xml/io-example-account.cpp | 324 +--
src/backend/xml/io-example-account.h | 24 +-
src/backend/xml/io-gncxml-gen.cpp | 20 +-
src/backend/xml/io-gncxml-gen.h | 16 +-
src/backend/xml/io-gncxml-v1.cpp | 2370 ++++++++--------
src/backend/xml/io-gncxml-v2.cpp | 1432 +++++-----
src/backend/xml/io-gncxml-v2.h | 40 +-
src/backend/xml/io-gncxml.h | 4 +-
src/backend/xml/io-utils.cpp | 44 +-
src/backend/xml/io-utils.h | 10 +-
src/backend/xml/sixtp-dom-generators.cpp | 250 +-
src/backend/xml/sixtp-dom-generators.h | 30 +-
src/backend/xml/sixtp-dom-parsers.cpp | 430 +--
src/backend/xml/sixtp-dom-parsers.h | 50 +-
src/backend/xml/sixtp-parsers.h | 6 +-
src/backend/xml/sixtp-stack.cpp | 110 +-
src/backend/xml/sixtp-stack.h | 28 +-
src/backend/xml/sixtp-to-dom-parser.cpp | 82 +-
src/backend/xml/sixtp-utils.cpp | 388 +--
src/backend/xml/sixtp-utils.h | 116 +-
src/backend/xml/sixtp.cpp | 641 ++---
src/backend/xml/sixtp.h | 235 +-
src/backend/xml/test/test-date-converting.cpp | 54 +-
src/backend/xml/test/test-dom-converters1.cpp | 218 +-
src/backend/xml/test/test-dom-parser1.cpp | 62 +-
src/backend/xml/test/test-file-stuff.cpp | 240 +-
src/backend/xml/test/test-file-stuff.h | 37 +-
src/backend/xml/test/test-kvp-frames.cpp | 148 +-
src/backend/xml/test/test-load-backend.cpp | 14 +-
src/backend/xml/test/test-load-example-account.cpp | 62 +-
src/backend/xml/test/test-load-xml2.cpp | 101 +-
src/backend/xml/test/test-save-in-lang.cpp | 154 +-
src/backend/xml/test/test-string-converters.cpp | 40 +-
src/backend/xml/test/test-xml-account.cpp | 274 +-
src/backend/xml/test/test-xml-commodity.cpp | 162 +-
src/backend/xml/test/test-xml-pricedb.cpp | 44 +-
src/backend/xml/test/test-xml-transaction.cpp | 346 +--
src/backend/xml/test/test-xml2-is-file.cpp | 15 +-
src/backend/xml/xml-helpers.h | 10 +-
.../business-ledger/gncEntryLedgerControl.c | 52 +-
src/engine/Transaction.c | 14 +-
src/engine/gnc-pricedb.c | 42 +-
src/gnc/Session.hpp | 8 -
src/gnc/mainwindow-file.cpp | 1 -
src/gnc/mainwindow.cpp | 2 -
src/gnome-utils/gnc-file.c | 3 -
src/gnome/dialog-print-check.c | 74 +-
src/libqof/CMakeLists.txt | 1 +
src/libqof/qof/Makefile.am | 1 +
src/libqof/qof/gnc-backend-prov.hpp | 81 +
src/libqof/qof/qofbackend-p.h | 50 -
src/libqof/qof/qofbackend.cpp | 14 +
src/libqof/qof/qofbackend.h | 76 +-
src/libqof/qof/qofsession.cpp | 205 +-
src/libqof/qof/qofsession.h | 14 -
src/libqof/qof/test/CMakeLists.txt | 3 +-
src/libqof/qof/test/Makefile.am | 2 +-
.../{test-qofsession.c => test-qofsession.cpp} | 192 +-
149 files changed, 13784 insertions(+), 13706 deletions(-)
create mode 100644 src/libqof/qof/gnc-backend-prov.hpp
rename src/libqof/qof/test/{test-qofsession.c => test-qofsession.cpp} (84%)
More information about the gnucash-changes
mailing list