From d208d7f5d83e576f6c692be8ca250a9b7c72349c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Wed, 11 Apr 2007 16:47:42 +0000 Subject: [PATCH] Balance some more ENTER/LEAVE calls. Replace one ENTER by DEBUG. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15875 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/engine/Scrub.c | 7 ++++++- src/engine/gnc-commodity.c | 2 ++ src/engine/gnc-filepath-utils.c | 9 ++++++++- src/gnome-utils/gnc-tree-view-account.c | 2 ++ src/register/ledger-core/split-register.c | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/engine/Scrub.c b/src/engine/Scrub.c index cdd1fcc076..1b83fef10b 100644 --- a/src/engine/Scrub.c +++ b/src/engine/Scrub.c @@ -366,7 +366,10 @@ xaccTransScrubImbalance (Transaction *trans, Account *root, /* If the transaction is balanced, nothing more to do */ imbalance = xaccTransGetImbalance (trans); - if (gnc_numeric_zero_p (imbalance)) return; + if (gnc_numeric_zero_p (imbalance)) { + LEAVE("zero imbalance"); + return; + } if (!account) { @@ -377,6 +380,7 @@ xaccTransScrubImbalance (Transaction *trans, Account *root, { /* This can't occur, things should be in books */ PERR ("Bad data corruption, no root account in book"); + LEAVE(""); return; } } @@ -384,6 +388,7 @@ xaccTransScrubImbalance (Transaction *trans, Account *root, trans->common_currency, _("Imbalance")); if (!account) { PERR ("Can't get balancing account"); + LEAVE(""); return; } } diff --git a/src/engine/gnc-commodity.c b/src/engine/gnc-commodity.c index 55d7f46400..7c3e2fe097 100644 --- a/src/engine/gnc-commodity.c +++ b/src/engine/gnc-commodity.c @@ -1297,10 +1297,12 @@ gnc_commodity_table_insert(gnc_commodity_table * table, { if (c == comm) { + LEAVE("already in table"); return c; } gnc_commodity_copy (c, comm); gnc_commodity_destroy (comm); + LEAVE("found at %p", c); return c; } diff --git a/src/engine/gnc-filepath-utils.c b/src/engine/gnc-filepath-utils.c index 474fce2cde..631ae220c8 100644 --- a/src/engine/gnc-filepath-utils.c +++ b/src/engine/gnc-filepath-utils.c @@ -195,11 +195,14 @@ xaccResolveFilePath (const char * filefrag) /* OK, now we try to find or build an absolute file path */ /* check for an absolute file path */ - if (g_path_is_absolute(filefrag)) + if (g_path_is_absolute(filefrag)) { + LEAVE("filefrag is absolute path"); return g_strdup (filefrag); + } if (!g_ascii_strncasecmp(filefrag, "file:", 5)) { + LEAVE("filefrag is file uri"); return g_strdup(filefrag + 5); } @@ -221,6 +224,7 @@ xaccResolveFilePath (const char * filefrag) if (g_file_test(fullpath, G_FILE_TEST_IS_REGULAR)) { + LEAVE("found %s", fullpath); return fullpath; } g_free (fullpath); @@ -251,6 +255,7 @@ xaccResolveFilePath (const char * filefrag) gchar *result; result = g_build_filename(pathbuf, filefrag_dup, (gchar *)NULL); g_free (filefrag_dup); + LEAVE("create new file %s", result); return result; } @@ -261,11 +266,13 @@ xaccResolveFilePath (const char * filefrag) gchar *result; result = g_build_filename(pathbuf, filefrag_dup, (gchar *)NULL); g_free (filefrag_dup); + LEAVE("create new file %s", result); return result; } g_free (filefrag_dup); + LEAVE("%s not found", filefrag); return NULL; } diff --git a/src/gnome-utils/gnc-tree-view-account.c b/src/gnome-utils/gnc-tree-view-account.c index 19699794b8..2e0209b66f 100644 --- a/src/gnome-utils/gnc-tree-view-account.c +++ b/src/gnome-utils/gnc-tree-view-account.c @@ -1002,6 +1002,8 @@ gnc_tree_view_account_get_account_from_iter (GtkTreeModel *s_model, g_return_val_if_fail (GTK_IS_TREE_MODEL_SORT(s_model), NULL); g_return_val_if_fail (s_iter != NULL, NULL); + ENTER("model %p, iter %p", s_model, s_iter); + gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT(s_model), &f_iter, s_iter); diff --git a/src/register/ledger-core/split-register.c b/src/register/ledger-core/split-register.c index 638c97eb1f..32de0959a0 100644 --- a/src/register/ledger-core/split-register.c +++ b/src/register/ledger-core/split-register.c @@ -1353,7 +1353,7 @@ gnc_split_register_save (SplitRegister *reg, gboolean do_commit) return TRUE; } - ENTER ("save split is %p \n", split); + DEBUG ("save split is %p \n", split); if (!gnc_split_register_auto_calc (reg, split)) return FALSE;