r21687 - gnucash/trunk/src - Fix some static warnings and errors as a result of Eclipse's static code
Geert Janssens
gjanssens at code.gnucash.org
Thu Dec 8 12:11:21 EST 2011
Author: gjanssens
Date: 2011-12-08 12:11:21 -0500 (Thu, 08 Dec 2011)
New Revision: 21687
Trac: http://svn.gnucash.org/trac/changeset/21687
Modified:
gnucash/trunk/src/app-utils/gnc-exp-parser.c
gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
gnucash/trunk/src/business/business-gnome/business-urls.c
gnucash/trunk/src/business/business-gnome/dialog-invoice.c
gnucash/trunk/src/business/business-gnome/dialog-payment.c
gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c
gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c
gnucash/trunk/src/engine/Account.c
gnucash/trunk/src/engine/Query.c
gnucash/trunk/src/engine/Recurrence.c
gnucash/trunk/src/engine/SchedXaction.c
gnucash/trunk/src/engine/Split.c
gnucash/trunk/src/engine/Transaction.c
gnucash/trunk/src/engine/gncInvoice.c
gnucash/trunk/src/engine/test/test-recurrence.c
gnucash/trunk/src/gnc-module/test/misc-mods/agedver.c
gnucash/trunk/src/gnome-search/search-string.c
gnucash/trunk/src/gnome-utils/dialog-book-close.c
gnucash/trunk/src/gnome-utils/dialog-object-references.c
gnucash/trunk/src/gnome-utils/dialog-options.c
gnucash/trunk/src/gnome-utils/dialog-preferences.c
gnucash/trunk/src/gnome-utils/gnc-dialog.c
gnucash/trunk/src/gnome-utils/gnc-file.c
gnucash/trunk/src/gnome-utils/gnc-frequency.c
gnucash/trunk/src/gnome/assistant-acct-period.c
gnucash/trunk/src/gnome/dialog-new-user.c
gnucash/trunk/src/gnome/dialog-sx-since-last-run.c
gnucash/trunk/src/html/gnc-html-webkit.c
gnucash/trunk/src/import-export/aqbanking/dialog-ab-trans.c
gnucash/trunk/src/import-export/aqbanking/dialog-daterange.c
gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c
gnucash/trunk/src/libqof/qof/gnc-date.c
gnucash/trunk/src/register/register-gnome/combocell-gnome.c
gnucash/trunk/src/register/register-gnome/formulacell-gnome.c
gnucash/trunk/src/report/business-reports/owner-report.scm
Log:
Fix some static warnings and errors as a result of Eclipse's static code
analysis.
As a result, some unused functions and function prototypes are removed.
It did expose one real bug in Transaction.c so far.
Modified: gnucash/trunk/src/app-utils/gnc-exp-parser.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-exp-parser.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/app-utils/gnc-exp-parser.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -157,14 +157,6 @@
parser_inited = FALSE;
}
-static void
-prepend_name (gpointer key, gpointer value, gpointer data)
-{
- GList **list = data;
-
- *list = g_list_prepend (*list, key);
-}
-
void
gnc_exp_parser_remove_variable (const char *variable_name)
{
Modified: gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
===================================================================
--- gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -1482,7 +1482,7 @@
if ( result )
break;
}
- /* Note fall-through */
+ /* Fall through */
case backup:
case drop_backup:
result = conn_table_manage_backup( conn, table_name, op );
Modified: gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-gnome-utils.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/business/business-gnome/business-gnome-utils.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -76,6 +76,7 @@
case GNCSEARCH_TYPE_EDIT:
text = _("Edit...");
text_editable = FALSE;
+ break;
};
switch (owner->type)
@@ -222,6 +223,7 @@
break;
default:
label = _("Invoice");
+ break;
}
gtk_label_set_text(GTK_LABEL(isi->label), label);
Modified: gnucash/trunk/src/business/business-gnome/business-urls.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-urls.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/business/business-gnome/business-urls.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -270,6 +270,7 @@
}
default:
etype = "OTHER";
+ break;
}
if (owner.owner.undefined == NULL)
Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -1005,6 +1005,7 @@
default:
g_slist_free (standard);
g_return_if_fail (FALSE);
+ break;
}
qof_query_set_sort_order (query, p1, p2, p3);
@@ -2191,6 +2192,7 @@
break;
default:
g_warning ("Invalid owner type");
+ break;
}
break;
case VIEW_INVOICE:
@@ -2214,7 +2216,9 @@
break;
default:
g_warning ("Invalid owner type");
+ break;
}
+ break;
}
entry_ledger = gnc_entry_ledger_new (iw->book, ledger_type);
@@ -2959,6 +2963,8 @@
QofQueryPredData* pred_data;
time_t end_date;
GList *res;
+ gchar *message;
+ DialogQueryList *dialog;
gint len;
Timespec ts;
static GList *param_list = NULL;
@@ -3023,24 +3029,22 @@
return NULL;
}
- {
- gchar *message = g_strdup_printf
- (/* Translators: %d is the number of bills due. This is a
- ngettext(3) message. */
- ngettext("The following %d bill is due:",
- "The following %d bills are due:",
- len),
- len);
- DialogQueryList *dialog =
- gnc_dialog_query_list_create(param_list, q,
- _("Due Bills Reminder"),
- message,
- TRUE, FALSE,
- buttons, NULL);
- g_free(message);
- qof_query_destroy(q);
- return dialog;
- }
+ message = g_strdup_printf
+ (/* Translators: %d is the number of bills due. This is a
+ ngettext(3) message. */
+ ngettext("The following %d bill is due:",
+ "The following %d bills are due:",
+ len),
+ len);
+ dialog = gnc_dialog_query_list_create(param_list, q,
+ _("Due Bills Reminder"),
+ message,
+ TRUE, FALSE,
+ buttons, NULL);
+ g_free(message);
+ qof_query_destroy(q);
+ return dialog;
+
}
void
Modified: gnucash/trunk/src/business/business-gnome/dialog-payment.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-payment.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/business/business-gnome/dialog-payment.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -814,20 +814,6 @@
return NULL;
}
-static gint predicate_not_equal(gconstpointer a,
- gconstpointer user_data)
-{
- return (a != user_data);
-}
-static Split *getFirstOtherSplit(SplitList* slist, const Split *postaccount_split)
-{
- GList *r = g_list_find_custom(slist, postaccount_split, &predicate_not_equal);
- if (r)
- return r->data;
- else
- return NULL;
-}
-
// ///////////////
gboolean gnc_ui_payment_is_customer_payment(const Transaction *txn)
@@ -835,6 +821,9 @@
SplitList *slist;
gboolean result = TRUE;
+ Split *assetaccount_split;
+ gnc_numeric amount;
+
if (!txn)
return result;
@@ -850,13 +839,11 @@
return result;
}
- {
- Split *assetaccount_split = getFirstAssetAccountSplit(slist);
- gnc_numeric amount = xaccSplitGetValue(assetaccount_split);
- gboolean result = gnc_numeric_positive_p(amount); // positive amounts == customer
- //g_message("Amount=%s", gnc_numeric_to_string(amount));
- return result;
- }
+ assetaccount_split = getFirstAssetAccountSplit(slist);
+ amount = xaccSplitGetValue(assetaccount_split);
+ result = gnc_numeric_positive_p(amount); // positive amounts == customer
+ //g_message("Amount=%s", gnc_numeric_to_string(amount));
+ return result;
}
// ///////////////
@@ -865,6 +852,11 @@
{
SplitList *slist;
+ Split *assetaccount_split;
+ Split *postaccount_split;
+ gnc_numeric amount;
+ PaymentWindow *pw;
+
if (!txn)
return NULL;
@@ -880,29 +872,27 @@
return NULL;
}
- {
- Split *assetaccount_split = getFirstAssetAccountSplit(slist);
- Split *postaccount_split = getFirstAPARAccountSplit(slist); // watch out: Might be NULL
- gnc_numeric amount = xaccSplitGetValue(assetaccount_split);
+ assetaccount_split = getFirstAssetAccountSplit(slist);
+ postaccount_split = getFirstAPARAccountSplit(slist); // watch out: Might be NULL
+ amount = xaccSplitGetValue(assetaccount_split);
- PaymentWindow *pw = gnc_ui_payment_new(owner,
- qof_instance_get_book(QOF_INSTANCE(txn)));
- g_assert(assetaccount_split); // we can rely on this because of the countAssetAccounts() check above
- //g_message("Amount=%s", gnc_numeric_to_string(amount));
+ pw = gnc_ui_payment_new(owner,
+ qof_instance_get_book(QOF_INSTANCE(txn)));
+ g_assert(assetaccount_split); // we can rely on this because of the countAssetAccounts() check above
+ //g_message("Amount=%s", gnc_numeric_to_string(amount));
- // Fill in the values from the given txn
- pw->pre_existing_txn = txn;
- gnc_ui_payment_window_set_num(pw, xaccTransGetNum(txn));
- gnc_ui_payment_window_set_memo(pw, xaccTransGetDescription(txn));
- {
- GDate txn_date = xaccTransGetDatePostedGDate (txn);
- gnc_ui_payment_window_set_date(pw, &txn_date);
- }
- gnc_ui_payment_window_set_amount(pw, gnc_numeric_abs(amount));
- gnc_ui_payment_window_set_xferaccount(pw, xaccSplitGetAccount(assetaccount_split));
- if (postaccount_split)
- gnc_ui_payment_window_set_postaccount(pw, xaccSplitGetAccount(postaccount_split));
-
- return pw;
+ // Fill in the values from the given txn
+ pw->pre_existing_txn = txn;
+ gnc_ui_payment_window_set_num(pw, xaccTransGetNum(txn));
+ gnc_ui_payment_window_set_memo(pw, xaccTransGetDescription(txn));
+ {
+ GDate txn_date = xaccTransGetDatePostedGDate (txn);
+ gnc_ui_payment_window_set_date(pw, &txn_date);
}
+ gnc_ui_payment_window_set_amount(pw, gnc_numeric_abs(amount));
+ gnc_ui_payment_window_set_xferaccount(pw, xaccSplitGetAccount(assetaccount_split));
+ if (postaccount_split)
+ gnc_ui_payment_window_set_postaccount(pw, xaccSplitGetAccount(postaccount_split));
+
+ return pw;
}
Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerControl.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -890,7 +890,7 @@
break;
}
- /* FALLTHROUGH */
+ /* FALL THROUGH */
default:
response = GTK_RESPONSE_ACCEPT;
break;
Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -855,7 +855,7 @@
if (gncEntryGetInvoice (entry) != NULL)
return XACC_CELL_ALLOW_SHADOW;
}
- /* FALLTHROUGH */
+ /* FALL THROUGH */
default:
return XACC_CELL_ALLOW_ALL;
}
@@ -887,7 +887,7 @@
return XACC_CELL_ALLOW_ALL | XACC_CELL_ALLOW_EXACT_ONLY;
}
- /* FALLTHROUGH */
+ /* FALL THROUGH */
default:
return XACC_CELL_ALLOW_SHADOW;
}
Modified: gnucash/trunk/src/engine/Account.c
===================================================================
--- gnucash/trunk/src/engine/Account.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/engine/Account.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -453,6 +453,7 @@
case PROP_TAX_SOURCE:
xaccAccountSetTaxUSPayerNameSource(account,
g_value_get_string(value));
+ break;
case PROP_TAX_COPY_NUMBER:
xaccAccountSetTaxUSCopyNumber(account,
g_value_get_int64(value));
Modified: gnucash/trunk/src/engine/Query.c
===================================================================
--- gnucash/trunk/src/engine/Query.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/engine/Query.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -295,6 +295,7 @@
break;
default:
PERR ("Invalid match type: %d", how);
+ break;
}
qof_query_add_term (q, param_list, pred_data, op);
Modified: gnucash/trunk/src/engine/Recurrence.c
===================================================================
--- gnucash/trunk/src/engine/Recurrence.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/engine/Recurrence.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -198,7 +198,8 @@
switch (pt)
{
case PERIOD_YEAR:
- mult *= 12; /* fall-through */
+ mult *= 12;
+ /* fall through */
case PERIOD_MONTH:
case PERIOD_NTH_WEEKDAY:
case PERIOD_LAST_WEEKDAY:
@@ -281,7 +282,8 @@
g_date_add_months(next, mult - 1);
break;
case PERIOD_WEEK:
- mult *= 7; /* fall-through */
+ mult *= 7;
+ /* fall through */
case PERIOD_DAY:
g_date_add_days(next, mult);
break;
@@ -290,6 +292,7 @@
return; /* earlier than start, so this is invalid. */
default:
PERR("Invalid period type");
+ break;
}
/* Step 2: Back up to align to the base phase. To ensure forward
@@ -356,6 +359,7 @@
break;
default:
PERR("Invalid period type");
+ break;
}
}
@@ -814,6 +818,7 @@
{
PeriodType period_a, period_b;
int a_order_index, b_order_index;
+ int a_mult, b_mult;
g_return_val_if_fail(a != NULL && b != NULL, 0);
g_return_val_if_fail(a != NULL, 1);
@@ -839,13 +844,10 @@
}
/* else { the basic periods are equal; compare the multipliers } */
- {
- int a_mult, b_mult;
- a_mult = recurrenceGetMultiplier(a);
- b_mult = recurrenceGetMultiplier(b);
+ a_mult = recurrenceGetMultiplier(a);
+ b_mult = recurrenceGetMultiplier(b);
- return a_mult - b_mult;
- }
+ return a_mult - b_mult;
}
int
Modified: gnucash/trunk/src/engine/SchedXaction.c
===================================================================
--- gnucash/trunk/src/engine/SchedXaction.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/engine/SchedXaction.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -39,10 +39,6 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "gnc.engine.sx"
-/* Local Prototypes *****/
-
-void sxprivtransactionListMapDelete( gpointer data, gpointer user_data );
-
enum
{
PROP_0,
Modified: gnucash/trunk/src/engine/Split.c
===================================================================
--- gnucash/trunk/src/engine/Split.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/engine/Split.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -659,12 +659,6 @@
return TRUE;
}
-static void
-add_keys_to_list(gpointer key, gpointer val, gpointer list)
-{
- *(GList **)list = g_list_prepend(*(GList **)list, key);
-}
-
/********************************************************************
* Account funcs
********************************************************************/
@@ -1527,6 +1521,7 @@
break;
default:
PERR("Bad reconciled flag");
+ break;
}
}
@@ -1550,6 +1545,7 @@
break;
default:
PERR("Bad reconciled flag");
+ break;
}
xaccTransCommitEdit(split->parent);
Modified: gnucash/trunk/src/engine/Transaction.c
===================================================================
--- gnucash/trunk/src/engine/Transaction.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/engine/Transaction.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -319,6 +319,7 @@
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+ break;
}
}
@@ -352,6 +353,7 @@
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+ break;
}
}
@@ -1408,7 +1410,7 @@
s->amount = so->amount;
s->value = so->value;
s->lot = so->lot;
- s->gains_split = s->gains_split;
+ s->gains_split = so->gains_split;
//SET_GAINS_A_VDIRTY(s);
s->date_reconciled = so->date_reconciled;
qof_instance_mark_clean(QOF_INSTANCE(s));
Modified: gnucash/trunk/src/engine/gncInvoice.c
===================================================================
--- gnucash/trunk/src/engine/gncInvoice.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/engine/gncInvoice.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -370,6 +370,7 @@
default:
// this is an invoice
gncInvoiceAddEntry(invoice, to_entry);
+ break;
}
}
Modified: gnucash/trunk/src/engine/test/test-recurrence.c
===================================================================
--- gnucash/trunk/src/engine/test/test-recurrence.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/engine/test/test-recurrence.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -57,11 +57,11 @@
do_test((g_date_get_year(next) - g_date_get_year(start)) % mult == 0,
"year period phase wrong"); // redundant
mult *= 12;
- // fall-through
+ // fall through
case PERIOD_END_OF_MONTH:
if (pt == PERIOD_END_OF_MONTH)
do_test(g_date_is_last_of_month(next), "end of month phase wrong");
- // fall-through
+ // fall through
case PERIOD_LAST_WEEKDAY:
case PERIOD_NTH_WEEKDAY:
case PERIOD_MONTH:
@@ -114,7 +114,7 @@
break;
case PERIOD_WEEK:
mult *= 7;
- // fall-through
+ // fall through
case PERIOD_DAY:
do_test((startToNext % mult) == 0, "week or day period phase wrong");
break;
@@ -123,6 +123,7 @@
break;
default:
do_test(FALSE, "invalid PeriodType");
+ break;
}
}
Modified: gnucash/trunk/src/gnc-module/test/misc-mods/agedver.c
===================================================================
--- gnucash/trunk/src/gnc-module/test/misc-mods/agedver.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnc-module/test/misc-mods/agedver.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -31,3 +31,9 @@
{
return TRUE;
}
+
+int
+libgncmod_agedver_gnc_module_end(int refcount)
+{
+ return TRUE;
+}
Modified: gnucash/trunk/src/gnome/assistant-acct-period.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-acct-period.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome/assistant-acct-period.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -84,7 +84,6 @@
/* =============================================================== */
-void ap_assistant_window_destroy_cb (GtkObject *object, gpointer user_data);
void ap_assistant_prepare (GtkAssistant *assistant, GtkWidget *page,
gpointer user_data);
void ap_assistant_menu_prepare (GtkAssistant *assistant, gpointer user_data);
@@ -194,6 +193,7 @@
break;
default:
str = "";
+ break;
}
return str;
}
@@ -460,18 +460,6 @@
/* =============================================================== */
-static void
-scrub_all(void)
-{
- Account *root = gnc_get_current_root_account ();
- xaccAccountTreeScrubOrphans (root);
- xaccAccountTreeScrubImbalance (root);
- // XXX: Lots are disabled
- // xaccAccountTreeScrubLots (root);
-}
-
-/* =============================================================== */
-
void
ap_assistant_finish (GtkAssistant *assistant, gpointer user_data)
{
Modified: gnucash/trunk/src/gnome/dialog-new-user.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-new-user.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome/dialog-new-user.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -110,24 +110,23 @@
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (new_accounts_button)))
{
gnc_ui_hierarchy_assistant_with_callback(TRUE, after_hierarchy_assistant);
- break;
}
else if ((qifImportAssistantFcn != NULL)
&& gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (import_qif_button)))
{
qifImportAssistantFcn();
gncp_new_user_finish ();
- break;
}
else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tutorial_button)))
{
gnc_gnome_help (HF_GUIDE, NULL);
gncp_new_user_finish ();
- break;
}
+ break;
default:
g_print ("DEBUG: Response: %d", result);
g_assert_not_reached ();
+ break;
}
g_object_unref(G_OBJECT(builder));
Modified: gnucash/trunk/src/gnome/dialog-sx-since-last-run.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-since-last-run.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome/dialog-sx-since-last-run.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -1094,7 +1094,7 @@
g_list_free(app_dialog->created_txns);
app_dialog->created_txns = NULL;
- /* FALLTHROUGH */
+ /* FALL THROUGH */
case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
gnc_close_gui_component(app_dialog->component_id);
Modified: gnucash/trunk/src/gnome-search/search-string.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-string.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome-search/search-string.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -348,13 +348,13 @@
{
case SEARCH_STRING_MATCHES_REGEX:
is_regex = TRUE;
- /* FALLTHROUGH */
+ /* FALL THROUGH */
case SEARCH_STRING_CONTAINS:
how = QOF_COMPARE_EQUAL;
break;
case SEARCH_STRING_NOT_MATCHES_REGEX:
is_regex = TRUE;
- /* FALLTHROUGH */
+ /* FALL THROUGH */
case SEARCH_STRING_NOT_CONTAINS:
how = QOF_COMPARE_NEQ;
break;
Modified: gnucash/trunk/src/gnome-utils/dialog-book-close.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-book-close.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome-utils/dialog-book-close.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -307,7 +307,7 @@
close_accounts_of_type(cbw, expense_acct, ACCT_TYPE_EXPENSE);
gnc_resume_gui_refresh();
- /* FALLTHROUGH */
+ /* FALL THROUGH */
default:
gtk_widget_destroy(GTK_WIDGET(dialog));
break;
Modified: gnucash/trunk/src/gnome-utils/dialog-object-references.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-object-references.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome-utils/dialog-object-references.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -50,6 +50,8 @@
GtkCellRenderer* renderer;
gint response;
+ ENTER("");
+
/* Open the dialog */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-object-references.glade", "Object references" );
@@ -86,4 +88,6 @@
response = gtk_dialog_run( GTK_DIALOG(dialog) );
g_object_unref(G_OBJECT(builder));
gtk_widget_destroy( dialog );
+
+ LEAVE("");
}
Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -1436,6 +1436,7 @@
{
gtk_widget_hide(window->dialog);
}
+ break;
}
}
Modified: gnucash/trunk/src/gnome-utils/dialog-preferences.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-preferences.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome-utils/dialog-preferences.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -85,9 +85,6 @@
static QofLogModule log_module = GNC_MOD_PREFS;
void gnc_preferences_response_cb(GtkDialog *dialog, gint response, GtkDialog *unused);
-void gnc_reset_warnings_select_all_cb (GtkButton *button, gpointer user_data);
-void gnc_reset_warnings_unselect_all_cb (GtkButton *button, gpointer user_data);
-void gnc_reset_warnings_response_cb (GtkDialog *dialog, gint arg1, gpointer user_data);
/** This data structure holds the information for a single addition to
Modified: gnucash/trunk/src/gnome-utils/gnc-dialog.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dialog.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome-utils/gnc-dialog.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -179,6 +179,7 @@
if (success)
gtk_widget_destroy(GTK_WIDGET(dlg));
+ break;
}
}
Modified: gnucash/trunk/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-file.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome-utils/gnc-file.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -596,7 +596,8 @@
default:
if (can_cancel)
return FALSE;
- /* No cancel function available. Fall through. */
+ /* No cancel function available. */
+ /* Fall through */
case GTK_RESPONSE_OK:
return TRUE;
Modified: gnucash/trunk/src/gnome-utils/gnc-frequency.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-frequency.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/gnome-utils/gnc-frequency.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -332,18 +332,6 @@
}
-static inline guint32 minn( guint32 a, guint32 b )
-{
- return a > b ? b : a;
-}
-
-
-static inline guint32 maxn( guint32 a, guint32 b )
-{
- return a > b ? a : b;
-}
-
-
static void
freq_combo_changed(GtkComboBox *b, gpointer d)
{
Modified: gnucash/trunk/src/html/gnc-html-webkit.c
===================================================================
--- gnucash/trunk/src/html/gnc-html-webkit.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/html/gnc-html-webkit.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -66,7 +66,7 @@
/* hashes for URLType -> protocol and protocol -> URLType */
//extern GHashTable* gnc_html_type_to_proto_hash;
-extern GHashTable* gnc_html_proto_to_type_hash;
+//extern GHashTable* gnc_html_proto_to_type_hash;
/* hashes an HTML <object classid="ID"> classid to a handler function */
extern GHashTable* gnc_html_object_handlers;
Modified: gnucash/trunk/src/import-export/aqbanking/dialog-ab-trans.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/dialog-ab-trans.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/import-export/aqbanking/dialog-ab-trans.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -191,6 +191,7 @@
default:
/* AB_Transaction_SetTransactionCode (trans, 51); */
AB_Transaction_SetTextKey (trans, 51);
+ break;
}
return trans;
@@ -324,6 +325,7 @@
default:
g_critical("gnc_ab_trans_dialog_new: Oops, unknown GncABTransType %d",
trans_type);
+ break;
}
gtk_label_set_text(GTK_LABEL(orig_name_label), ab_ownername);
@@ -644,6 +646,7 @@
case SINGLE_TRANSFER:
default:
job = AB_JobSingleTransfer_new(ab_acc);
+ break;
};
if (!job || AB_Job_CheckAvailability(job
@@ -687,6 +690,7 @@
case SINGLE_TRANSFER:
default:
AB_JobSingleTransfer_SetTransaction(job, ab_trans);
+ break;
};
}
return job;
Modified: gnucash/trunk/src/import-export/aqbanking/dialog-daterange.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/dialog-daterange.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/import-export/aqbanking/dialog-daterange.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -66,6 +66,8 @@
DaterangeInfo info;
gint result;
+ ENTER("");
+
xml = gnc_glade_xml_new("aqbanking.glade", "Date Range Dialog");
dialog = glade_xml_get_widget(xml, "Date Range Dialog");
@@ -133,6 +135,7 @@
gtk_widget_destroy(dialog);
+ LEAVE("");
return result == GTK_RESPONSE_OK;
}
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -165,7 +165,6 @@
static void setup_dialog(GncGWENGui *gui);
static void enable_password_cache(GncGWENGui *gui, gboolean enabled);
static void reset_dialog(GncGWENGui *gui);
-static void set_runing(GncGWENGui *gui);
static void set_finished(GncGWENGui *gui);
static void set_aborted(GncGWENGui *gui);
static void show_dialog(GncGWENGui *gui, gboolean clear_log);
Modified: gnucash/trunk/src/libqof/qof/gnc-date.c
===================================================================
--- gnucash/trunk/src/libqof/qof/gnc-date.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/libqof/qof/gnc-date.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -508,7 +508,7 @@
if (flen != 0)
break;
}
- /* FALLTHROUGH */
+ /* FALL THROUGH */
case QOF_DATE_FORMAT_ISO:
case QOF_DATE_FORMAT_UTC:
flen = g_snprintf (buff, len, "%04d-%02d-%02d", year, month, day);
Modified: gnucash/trunk/src/register/register-gnome/combocell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/combocell-gnome.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/register/register-gnome/combocell-gnome.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -614,7 +614,7 @@
return FALSE;
}
keep_on_going = TRUE;
- /* Fall through */
+ /* fall through */
case GDK_Tab:
case GDK_ISO_Left_Tab:
if (!(event->state & GDK_CONTROL_MASK) &&
Modified: gnucash/trunk/src/register/register-gnome/formulacell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/formulacell-gnome.c 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/register/register-gnome/formulacell-gnome.c 2011-12-08 17:11:21 UTC (rev 21687)
@@ -74,7 +74,7 @@
if (!(event->state &
(GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SHIFT_MASK)))
is_return = TRUE;
- /* FALL THROUGH TO NEXT CASE */
+ /* FALL THROUGH */
case GDK_KP_Enter:
{
Modified: gnucash/trunk/src/report/business-reports/owner-report.scm
===================================================================
--- gnucash/trunk/src/report/business-reports/owner-report.scm 2011-12-08 17:11:06 UTC (rev 21686)
+++ gnucash/trunk/src/report/business-reports/owner-report.scm 2011-12-08 17:11:21 UTC (rev 21687)
@@ -71,20 +71,20 @@
(define (owner-string owner-type)
(cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (N_ "Customer"))
((eqv? owner-type GNC-OWNER-EMPLOYEE) (N_ "Employee"))
- ;; FALLTHROUGH
+ ;; FALL THROUGH
(else (N_ "Company"))))
;; Error strings in case there is no (valid) selection (translated)
(define (invalid-selection-title-string owner-type)
(cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "No valid customer selected."))
((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "No valid employee selected."))
- ;; FALLTHROUGH
+ ;; FALL THROUGH
(else (_ "No valid company selected."))))
(define (invalid-selection-string owner-type)
(cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "This report requires a customer to be selected."))
((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "This report requires a employee to be selected."))
- ;; FALLTHROUGH
+ ;; FALL THROUGH
(else (_ "This report requires a company to be selected."))))
;; Html formatted error message documents
@@ -109,7 +109,7 @@
(define (doctype-str owner-type)
(cond ((eqv? owner-type GNC-OWNER-CUSTOMER) (_ "Customer"))
((eqv? owner-type GNC-OWNER-EMPLOYEE) (_ "Employee"))
- ;; FALLTHROUGH
+ ;; FALL THROUGH
(else (_ "Vendor"))))
(define-macro (addto! alist element)
More information about the gnucash-changes
mailing list