From 8d2cb86f8b9052e16f18db02b8822b7dce3589b1 Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Fri, 31 Dec 2004 18:38:03 +0000 Subject: [PATCH] John Ellson's patch to fix some gcc4 warnings (bug #162582). git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@10396 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 4 ++ .../file/test/test-string-converters.c | 2 +- src/engine/gnc-numeric.c | 3 + src/engine/kvp_frame.c | 2 +- src/engine/test/test-book-merge.c | 4 ++ src/gnome-utils/gnc-account-sel.c | 2 +- src/gnome-utils/gnc-amount-edit.c | 2 +- src/gnome-utils/gnc-date-delta.c | 2 +- src/gnome-utils/gnc-date-edit.c | 4 +- src/gnome-utils/gnc-date-format.c | 2 +- src/gnome-utils/gnc-dense-cal.c | 60 +++++++++---------- src/gnome-utils/gnc-frequency.c | 2 +- src/gnome/gnc-split-reg.c | 2 +- src/gnome/mainwindow-account-tree.c | 2 +- 14 files changed, 52 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c79b3d657..2249418d27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-31 Derek Atkins + + John Ellson's patch to fix some gcc4 warnings (bug #162582). + 2004-12-29 Christian Stimming * src/tax/us/txf-de_DE.scm: Add Tax TXF categories for the de_DE diff --git a/src/backend/file/test/test-string-converters.c b/src/backend/file/test/test-string-converters.c index 6b0a462dfe..23e28233d1 100644 --- a/src/backend/file/test/test-string-converters.c +++ b/src/backend/file/test/test-string-converters.c @@ -23,7 +23,7 @@ test_binary() { bin_data *test_data1; void *test_data2; - gint64 test_data2_len; + guint64 test_data2_len; gchar *converted; test_data1 = get_random_binary_data(); diff --git a/src/engine/gnc-numeric.c b/src/engine/gnc-numeric.c index 7f8e602fd6..b14a38fc3a 100644 --- a/src/engine/gnc-numeric.c +++ b/src/engine/gnc-numeric.c @@ -725,6 +725,9 @@ gnc_numeric_convert(gnc_numeric in, gint64 denom, gint how) double sigfigs; qofint128 nume, newm; + temp.num = 0; + temp.denom = 0; + if(gnc_numeric_check(in)) { return gnc_numeric_error(GNC_ERROR_ARG); } diff --git a/src/engine/kvp_frame.c b/src/engine/kvp_frame.c index 94ca148ab9..9fbcad7d24 100644 --- a/src/engine/kvp_frame.c +++ b/src/engine/kvp_frame.c @@ -496,7 +496,7 @@ kvp_frame_replace_value_nc (KvpFrame * frame, const char * key_path, KvpValue * new_value) { KvpValue * old_value; - char *last_key; + char *last_key = NULL; if (new_value) { diff --git a/src/engine/test/test-book-merge.c b/src/engine/test/test-book-merge.c index 82b9bd9a94..3eaaee8eea 100644 --- a/src/engine/test/test-book-merge.c +++ b/src/engine/test/test-book-merge.c @@ -170,6 +170,10 @@ Timespec obj_getDate(myobj *g) { Timespec ts; + + ts.tv_nsec = 0; + ts.tv_sec = 0; + if(!g) return ts; ts = g->date; return ts; diff --git a/src/gnome-utils/gnc-account-sel.c b/src/gnome-utils/gnc-account-sel.c index 8f5c21f66a..6861f113a1 100644 --- a/src/gnome-utils/gnc-account-sel.c +++ b/src/gnome-utils/gnc-account-sel.c @@ -42,7 +42,7 @@ enum LAST_SIGNAL }; -static gint account_sel_signals [LAST_SIGNAL] = { 0 }; +static guint account_sel_signals [LAST_SIGNAL] = { 0 }; static void gnc_account_sel_init (GNCAccountSel *gas); static void gnc_account_sel_class_init (GNCAccountSelClass *class); diff --git a/src/gnome-utils/gnc-amount-edit.c b/src/gnome-utils/gnc-amount-edit.c index e29c0b6352..e05a90130f 100644 --- a/src/gnome-utils/gnc-amount-edit.c +++ b/src/gnome-utils/gnc-amount-edit.c @@ -49,7 +49,7 @@ enum }; -static gint amount_edit_signals [LAST_SIGNAL] = { 0 }; +static guint amount_edit_signals [LAST_SIGNAL] = { 0 }; static void gnc_amount_edit_init (GNCAmountEdit *gae); diff --git a/src/gnome-utils/gnc-date-delta.c b/src/gnome-utils/gnc-date-delta.c index c778923928..0009cf74ab 100644 --- a/src/gnome-utils/gnc-date-delta.c +++ b/src/gnome-utils/gnc-date-delta.c @@ -53,7 +53,7 @@ enum LAST_SIGNAL }; -static gint date_delta_signals [LAST_SIGNAL] = { 0 }; +static guint date_delta_signals [LAST_SIGNAL] = { 0 }; static void gnc_date_delta_init (GNCDateDelta *gdd); diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c index 99af8c9949..d908a44805 100644 --- a/src/gnome-utils/gnc-date-edit.c +++ b/src/gnome-utils/gnc-date-edit.c @@ -53,7 +53,7 @@ enum { LAST_SIGNAL }; -static gint date_edit_signals [LAST_SIGNAL] = { 0 }; +static guint date_edit_signals [LAST_SIGNAL] = { 0 }; static void gnc_date_edit_init (GNCDateEdit *gde); @@ -140,7 +140,7 @@ static void day_selected (GtkCalendar *calendar, GNCDateEdit *gde) { char buffer [40]; - gint year, month, day; + guint year, month, day; gtk_calendar_get_date (calendar, &year, &month, &day); diff --git a/src/gnome-utils/gnc-date-format.c b/src/gnome-utils/gnc-date-format.c index 5149f4261f..764dc0904b 100644 --- a/src/gnome-utils/gnc-date-format.c +++ b/src/gnome-utils/gnc-date-format.c @@ -67,7 +67,7 @@ struct _GNCDateFormatPriv { GtkWidget* label_box; }; -static gint date_format_signals [LAST_SIGNAL] = { 0 }; +static guint date_format_signals [LAST_SIGNAL] = { 0 }; static void gnc_date_format_init (GNCDateFormat *gdf); diff --git a/src/gnome-utils/gnc-dense-cal.c b/src/gnome-utils/gnc-dense-cal.c index 79c378c1db..b72855e327 100644 --- a/src/gnome-utils/gnc-dense-cal.c +++ b/src/gnome-utils/gnc-dense-cal.c @@ -94,7 +94,7 @@ enum gnc_dense_cal_signal_enum { LAST_SIGNAL }; -static gint gnc_dense_cal_signals[LAST_SIGNAL] = { 0 }; +static guint gnc_dense_cal_signals[LAST_SIGNAL] = { 0 }; static short module = MOD_SX; @@ -119,29 +119,29 @@ static gint gnc_dense_cal_motion_notify( GtkWidget *widget, static gint gnc_dense_cal_button_press( GtkWidget *widget, GdkEventButton *evt ); -static const inline int day_width_at( GncDenseCal *dcal, guint xScale ); -static const inline int day_width( GncDenseCal *dcal ); -static const inline int day_height_at( GncDenseCal *dcal, guint yScale ); -static const inline int day_height( GncDenseCal *dcal ); -static const inline int week_width_at( GncDenseCal *dcal, guint xScale ); -static const inline int week_width( GncDenseCal *dcal ); -static const inline int week_height_at( GncDenseCal *dcal, guint yScale ); -static const inline int week_height( GncDenseCal *dcal ); -static const inline int col_width_at( GncDenseCal *dcal, guint xScale ); -static const inline int col_width( GncDenseCal *dcal ); - -static const inline int col_height( GncDenseCal *dcal ); -static const inline int num_cols( GncDenseCal *dcal ); +static inline int day_width_at( GncDenseCal *dcal, guint xScale ); +static inline int day_width( GncDenseCal *dcal ); +static inline int day_height_at( GncDenseCal *dcal, guint yScale ); +static inline int day_height( GncDenseCal *dcal ); +static inline int week_width_at( GncDenseCal *dcal, guint xScale ); +static inline int week_width( GncDenseCal *dcal ); +static inline int week_height_at( GncDenseCal *dcal, guint yScale ); +static inline int week_height( GncDenseCal *dcal ); +static inline int col_width_at( GncDenseCal *dcal, guint xScale ); +static inline int col_width( GncDenseCal *dcal ); + +static inline int col_height( GncDenseCal *dcal ); +static inline int num_cols( GncDenseCal *dcal ); /** * Returns the total number of weeks to display in the calendar [irrespective * of columns/weeks-per-col]. **/ -static const inline int num_weeks( GncDenseCal *dcal ); +static inline int num_weeks( GncDenseCal *dcal ); /** * Returns the number of weeks per column. Note that this is the number of * weeks needed to display the longest column. **/ -static const int num_weeks_per_col( GncDenseCal *dcal ); +static int num_weeks_per_col( GncDenseCal *dcal ); /** hotspot calculation **/ static gint wheres_this( GncDenseCal *dcal, int x, int y ); @@ -1087,55 +1087,55 @@ gnc_dense_cal_motion_notify( GtkWidget *widget, return TRUE; } -static const inline int +static inline int day_width_at( GncDenseCal *dcal, guint xScale ) { return xScale + MINOR_BORDER_SIZE; } -static const inline int +static inline int day_width( GncDenseCal *dcal ) { return day_width_at( dcal, dcal->x_scale ); } -static const inline int +static inline int day_height_at( GncDenseCal *dcal, guint yScale ) { return yScale + MINOR_BORDER_SIZE; } -static const inline int +static inline int day_height( GncDenseCal *dcal ) { return day_height_at( dcal, dcal->y_scale ); } -static const inline int +static inline int week_width_at( GncDenseCal *dcal, guint xScale ) { return day_width_at(dcal, xScale) * 7; } -static const inline int +static inline int week_width( GncDenseCal *dcal ) { return week_width_at( dcal, dcal->x_scale ); } -static const inline int +static inline int week_height_at( GncDenseCal *dcal, guint yScale ) { return day_height_at(dcal, yScale); } -static const inline int +static inline int week_height( GncDenseCal *dcal ) { return week_height_at(dcal, dcal->y_scale); } -static const inline int +static inline int col_width_at( GncDenseCal *dcal, guint xScale ) { return (week_width_at(dcal, xScale) @@ -1143,33 +1143,33 @@ col_width_at( GncDenseCal *dcal, guint xScale ) + COL_BORDER_SIZE); } -static const inline int +static inline int col_width( GncDenseCal *dcal ) { return col_width_at( dcal, dcal->x_scale ); } -static const inline int +static inline int col_height( GncDenseCal *dcal ) { return week_height(dcal) * num_weeks_per_col(dcal); } -static const inline int +static inline int num_cols( GncDenseCal *dcal ) { return ceil( (float)dcal->numMonths / (float)dcal->monthsPerCol ); } -static const inline int +static inline int num_weeks( GncDenseCal *dcal ) { /* FIXME: calculate, remove 'recompute_extents' */ return dcal->num_weeks; } -static const +static int num_weeks_per_col( GncDenseCal *dcal ) { int num_weeks_toRet, numCols, i; diff --git a/src/gnome-utils/gnc-frequency.c b/src/gnome-utils/gnc-frequency.c index 6c19206a17..747c315b36 100644 --- a/src/gnome-utils/gnc-frequency.c +++ b/src/gnome-utils/gnc-frequency.c @@ -44,7 +44,7 @@ typedef enum { LAST_SIGNAL } GNCF_Signals; -static gint gnc_frequency_signals[LAST_SIGNAL] = { 0 }; +static guint gnc_frequency_signals[LAST_SIGNAL] = { 0 }; /** Private Prototypes ********************/ diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c index 695af75d88..f86625e7f2 100644 --- a/src/gnome/gnc-split-reg.c +++ b/src/gnome/gnc-split-reg.c @@ -254,7 +254,7 @@ enum gnc_split_reg_signal_enum { LAST_SIGNAL }; -static gint gnc_split_reg_signals[LAST_SIGNAL] = { 0 }; +static guint gnc_split_reg_signals[LAST_SIGNAL] = { 0 }; static void gnc_split_reg_class_init( GNCSplitRegClass *class ) diff --git a/src/gnome/mainwindow-account-tree.c b/src/gnome/mainwindow-account-tree.c index c755d92fc0..fe1d0a2e5c 100644 --- a/src/gnome/mainwindow-account-tree.c +++ b/src/gnome/mainwindow-account-tree.c @@ -38,7 +38,7 @@ enum { LAST_SIGNAL }; -static gint mainwinaccounttree_signals[LAST_SIGNAL] = { 0 }; +static guint mainwinaccounttree_signals[LAST_SIGNAL] = { 0 }; static void unselect_account_callback(GNCAccountTree *tree, Account *account, gpointer user_data)