diff --git a/ChangeLog b/ChangeLog index e3b03b7b78..6bb6818a4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-05-07 Joshua Sled + * src/engine/Group.c (xaccAccountStagedTransactionTraversal): + Simplify. + * src/engine/test-core/test-engine-stuff.c (make_trans_query): Don't construct queries involving empty strings, as the query processor asserts that string match terms are not empty. Fixes diff --git a/src/engine/Group.c b/src/engine/Group.c index 1350e4cd1a..def381e88d 100644 --- a/src/engine/Group.c +++ b/src/engine/Group.c @@ -1092,35 +1092,24 @@ xaccAccountStagedTransactionTraversal (const Account *acc, void *cb_data), void *cb_data) { + GList *lp; if (!acc) return 0; - if (callback) + for(lp = acc->splits; lp; lp = lp->next) { - GList *lp; - for(lp = acc->splits; lp; lp = lp->next) + Split *s = (Split *) lp->data; + Transaction *trans = s->parent; + if (trans && (trans->marker < stage)) { - Split *s = (Split *) lp->data; - Transaction *trans = s->parent; - if (trans && (trans->marker < stage)) + trans->marker = stage; + if (callback) { int retval; - trans->marker = stage; retval = callback(trans, cb_data); if (retval) return retval; } } } - else - { - GList *lp; - for(lp = acc->splits; lp; lp = lp->next) - { - Split *s = (Split *) lp->data; - Transaction *trans = s->parent; - if (trans && (trans->marker < stage)) - trans->marker = stage; - } - } return 0; }