r22649 - gnucash/trunk/src - Fix some warnings generated by Eclipse's static code analysis plugin
Geert Janssens
gjanssens at code.gnucash.org
Sat Dec 15 05:30:36 EST 2012
Author: gjanssens
Date: 2012-12-15 05:30:35 -0500 (Sat, 15 Dec 2012)
New Revision: 22649
Trac: http://svn.gnucash.org/trac/changeset/22649
Modified:
gnucash/trunk/src/app-utils/QuickFill.c
gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
gnucash/trunk/src/backend/xml/gnc-backend-xml.c
gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c
gnucash/trunk/src/engine/gnc-commodity.c
gnucash/trunk/src/engine/test-core/test-engine-stuff.c
gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c
gnucash/trunk/src/gnome-utils/dialog-transfer.c
gnucash/trunk/src/gnome-utils/gnc-file.c
gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c
gnucash/trunk/src/gnome/dialog-print-check.c
gnucash/trunk/src/gnome/gnc-split-reg.c
gnucash/trunk/src/gnome/gnc-split-reg2.c
gnucash/trunk/src/import-export/import-backend.c
gnucash/trunk/src/import-export/import-main-matcher.c
gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
gnucash/trunk/src/libqof/qof/gnc-date.c
gnucash/trunk/src/libqof/qof/kvp_frame.c
gnucash/trunk/src/libqof/qof/qofquery.c
gnucash/trunk/src/register/ledger-core/split-register-model.c
gnucash/trunk/src/register/ledger-core/split-register.c
gnucash/trunk/src/register/register-gnome/gnucash-cursor.c
gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
Log:
Fix some warnings generated by Eclipse's static code analysis plugin
Modified: gnucash/trunk/src/app-utils/QuickFill.c
===================================================================
--- gnucash/trunk/src/app-utils/QuickFill.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/app-utils/QuickFill.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -211,15 +211,15 @@
count = g_hash_table_size (qf->matches);
if (count != 1)
- {
- return qf;
- }
+ break;
g_hash_table_foreach (qf->matches, unique_len_helper, &qf);
if (length != NULL)
(*length)++;
}
+
+ return qf;
}
/********************************************************************\
@@ -278,6 +278,7 @@
case QUICKFILL_ALPHA:
if (old_text && (g_utf8_collate (text, old_text) >= 0))
break;
+ /* fall through */
case QUICKFILL_LIFO:
default:
Modified: gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
===================================================================
--- gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -1458,6 +1458,7 @@
case drop_backup:
result = dbi_conn_queryf( conn->conn, "DROP TABLE %s",
new_name );
+ break;
default:
break;
}
Modified: gnucash/trunk/src/backend/xml/gnc-backend-xml.c
===================================================================
--- gnucash/trunk/src/backend/xml/gnc-backend-xml.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/backend/xml/gnc-backend-xml.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -822,6 +822,7 @@
break;
default:
be_err = ERR_BACKEND_MISC;
+ break;
}
qof_backend_set_error(be, be_err);
PWARN("unable to unlink temp_filename %s: %s",
Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerLoad.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -53,8 +53,9 @@
case '2':
return _("%");
default:
- return "?";
+ break;
};
+ return "?";
}
const char * gnc_entry_ledger_how_string_getter (char flag)
@@ -68,8 +69,9 @@
case '3':
return _(">");
default:
+ break;
+ };
return "?";
- };
}
static void load_discount_type_cells (GncEntryLedger *ledger)
@@ -295,6 +297,7 @@
break;
default:
shared_quickfill = gnc_get_shared_entry_desc_quickfill(ledger->book, DESC_QF_KEY_BILLS, FALSE);
+ break;
};
cell = (QuickFillCell *)
Modified: gnucash/trunk/src/engine/gnc-commodity.c
===================================================================
--- gnucash/trunk/src/engine/gnc-commodity.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/engine/gnc-commodity.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -367,6 +367,7 @@
LEAVE("found %s", source->user_name);
return source;
}
+ break;
}
LEAVE("not found");
Modified: gnucash/trunk/src/engine/test-core/test-engine-stuff.c
===================================================================
--- gnucash/trunk/src/engine/test-core/test-engine-stuff.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/engine/test-core/test-engine-stuff.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -1580,6 +1580,7 @@
break;
default:
g_assert_not_reached();
+ break;
};
if (gnc_engine_debug_random) printf ("op = %d (int was %d), ", op, op_num);
return op;
@@ -1691,6 +1692,7 @@
default:
g_slist_free (standard);
g_return_if_fail (FALSE);
+ break;
}
qof_query_set_sort_order (q, p1, p2, p3);
Modified: gnucash/trunk/src/gnome/dialog-print-check.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-print-check.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/gnome/dialog-print-check.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -130,7 +130,7 @@
* NULL for the custom check format and for
* separator lines. */
COL_SEP, /**< This column contains the value TRUE if
- * this enry specifies a separator line. */
+ * this entry specifies a separator line. */
} format_combo_col;
void gnc_ui_print_check_response_cb (GtkDialog *dialog, gint response, PrintCheckDialog *pcd);
@@ -1122,6 +1122,7 @@
g_debug("Check file %s, group %s, key %s, value: %s",
file, KF_GROUP_ITEMS, key, data->text);
g_free(key);
+ break;
case DATE:
/* no error if the date_format is not present */
key = g_strdup_printf("%s_%d", KF_KEY_DATE_FORMAT, item_num);
Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -164,10 +164,6 @@
static void gnc_split_reg_init( GNCSplitReg *gsr );
static void gnc_split_reg_init2( GNCSplitReg *gsr );
-void gnc_split_register_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation,
- gpointer user_data);
-
FROM_STRING_FUNC(SortType, ENUM_LIST_SORTTYPE)
AS_STRING_FUNC(SortType, ENUM_LIST_SORTTYPE)
@@ -1638,6 +1634,7 @@
default:
g_slist_free (standard);
g_return_if_fail (FALSE);
+ break;
}
qof_query_set_sort_order( query, p1, p2, p3 );
Modified: gnucash/trunk/src/gnome/gnc-split-reg2.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg2.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/gnome/gnc-split-reg2.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -173,10 +173,6 @@
static void gnc_split_reg2_init( GNCSplitReg2 *gsr );
static void gnc_split_reg2_init2( GNCSplitReg2 *gsr );
-void gnc_split_register_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation,
- gpointer user_data);
-
#ifdef SKIP
FROM_STRING_FUNC(SortType, ENUM_LIST_SORTTYPE)
AS_STRING_FUNC(SortType, ENUM_LIST_SORTTYPE)
@@ -1722,6 +1718,7 @@
default:
g_slist_free (standard);
g_return_if_fail (FALSE);
+ break;
}
qof_query_set_sort_order( query, p1, p2, p3 );
Modified: gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -228,6 +228,7 @@
gnc_unregister_gui_component_by_data(DIALOG_RESET_WARNINGS_CM_CLASS,
rw_dialog);
gtk_widget_destroy(GTK_WIDGET(rw_dialog->dialog));
+ break;
}
LEAVE("");
}
Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -2178,6 +2178,7 @@
}
g_assert_not_reached();
+ return FALSE; /* to satisfy static code analysis */
}
Modified: gnucash/trunk/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-file.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/gnome-utils/gnc-file.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -811,6 +811,7 @@
* they can click "Exit" on.
*/
gnc_file_new ();
+ break;
}
}
/* if the database doesn't exist, ask the user ... */
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -838,6 +838,7 @@
default:
g_assert_not_reached ();
+ break;
}
LEAVE(" ");
}
Modified: gnucash/trunk/src/import-export/import-backend.c
===================================================================
--- gnucash/trunk/src/import-export/import-backend.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/import-export/import-backend.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -1065,6 +1065,7 @@
return TRUE;
default:
DEBUG("Invalid GNCImportAction for this imported transaction.");
+ break;
}
/*DEBUG("End");*/
return FALSE;
Modified: gnucash/trunk/src/import-export/import-main-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-main-matcher.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/import-export/import-main-matcher.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -385,6 +385,7 @@
break;
default:
PERR("I don't know what to do! (Yet...)");
+ break;
}
refresh_model_row(gui, model, &iter, trans_info);
}
@@ -818,6 +819,7 @@
default:
color = "white";
ro_text = "WRITEME, this is an unknown action";
+ break;
}
gtk_list_store_set(store, iter,
Modified: gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -830,6 +830,7 @@
break;
default:
PERR("WRITEME: ofx_proc_account() This is an unknown account type!");
+ break;
}
}
Modified: gnucash/trunk/src/libqof/qof/gnc-date.c
===================================================================
--- gnucash/trunk/src/libqof/qof/gnc-date.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/libqof/qof/gnc-date.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -796,8 +796,9 @@
return "%Y-%m-%d";
case QOF_DATE_FORMAT_LOCALE:
default:
- return GNC_D_FMT;
+ break;
};
+ return GNC_D_FMT;
}
/* get the date format string for the current format
@@ -824,8 +825,9 @@
return "%Y-%b-%d";
case QOF_DATE_FORMAT_LOCALE:
default:
- return GNC_D_FMT;
+ break;
};
+ return GNC_D_FMT;
}
/* Convert day, month and year values to a date string
@@ -1260,6 +1262,7 @@
if (!isdigit(*s))
return (locale_separator = *s);
}
+ break;
}
return '\0';
Modified: gnucash/trunk/src/libqof/qof/kvp_frame.c
===================================================================
--- gnucash/trunk/src/libqof/qof/kvp_frame.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/libqof/qof/kvp_frame.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -886,17 +886,18 @@
const char *key = key_path->data;
KvpValue *value;
- if (!key) return NULL;
+ if (!key) break;
value = kvp_frame_get_slot (frame, key);
- if (!value) return NULL;
+ if (!value) break;
key_path = key_path->next;
if (!key_path) return value;
frame = kvp_value_get_frame (value);
- if (!frame) return NULL;
+ if (!frame) break;
}
+ return NULL;
}
/* *******************************************************************
Modified: gnucash/trunk/src/libqof/qof/qofquery.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofquery.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/libqof/qof/qofquery.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -571,9 +571,10 @@
static int param_list_cmp (const QofQueryParamList *l1, const QofQueryParamList *l2)
{
+ int ret;
+
while (1)
{
- int ret;
/* Check the easy stuff */
if (!l1 && !l2) return 0;
@@ -582,11 +583,12 @@
ret = g_strcmp0 (l1->data, l2->data);
if (ret)
- return ret;
+ break;
l1 = l1->next;
l2 = l2->next;
}
+ return ret;
}
static GList * merge_books (GList *l1, GList *l2)
Modified: gnucash/trunk/src/register/ledger-core/split-register-model.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-model.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/register/ledger-core/split-register-model.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -983,6 +983,7 @@
break;
default:
help = _("Enter a description of the transaction");
+ break;
}
return g_strdup (help);
}
@@ -1466,6 +1467,7 @@
break;
default:
total = get_trans_total_amount (reg, xaccSplitGetParent (split));
+ break;
}
if (gnc_numeric_zero_p (total))
@@ -1710,15 +1712,14 @@
break;
default:
- {
if (commodity && !gnc_commodity_equal (commodity, currency))
/* Convert this to the "local" value */
amount = xaccSplitConvertAmount(split, account);
else
amount = xaccSplitGetValue (split);
print_info = gnc_account_print_info (account, FALSE);
+ break;
}
- }
}
if (gnc_numeric_zero_p (amount))
Modified: gnucash/trunk/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/register/ledger-core/split-register.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -184,6 +184,7 @@
}
}
LEAVE(" ");
+ return FALSE; /* to satisfy static code analysis */
}
void
Modified: gnucash/trunk/src/register/register-gnome/gnucash-cursor.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-cursor.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/register/register-gnome/gnucash-cursor.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -267,6 +267,7 @@
gdk_draw_rectangle (drawable, cursor->gc, FALSE,
dx, dy, dw, dh);
+ break;
}
}
Modified: gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-sheet.c 2012-12-14 17:37:26 UTC (rev 22648)
+++ gnucash/trunk/src/register/register-gnome/gnucash-sheet.c 2012-12-15 10:30:35 UTC (rev 22649)
@@ -1805,7 +1805,7 @@
case GDK_KEY_Down:
case GDK_KEY_Menu:
if (event->keyval == GDK_Menu ||
- event->state & GDK_CONTROL_MASK)
+ (event->state & GDK_CONTROL_MASK))
{
GncItemEdit *item_edit;
More information about the gnucash-changes
mailing list