[Gnucash-changes] John Ellson's patch to fix some gcc4 warnings
(bug #162582).
Derek Atkins
warlord at cvs.gnucash.org
Fri Dec 31 13:38:05 EST 2004
Log Message:
-----------
John Ellson's patch to fix some gcc4 warnings (bug #162582).
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/backend/file/test:
test-string-converters.c
gnucash/src/engine:
gnc-numeric.c
kvp_frame.c
gnucash/src/engine/test:
test-book-merge.c
gnucash/src/gnome:
gnc-split-reg.c
mainwindow-account-tree.c
gnucash/src/gnome-utils:
gnc-account-sel.c
gnc-amount-edit.c
gnc-date-delta.c
gnc-date-edit.c
gnc-date-format.c
gnc-dense-cal.c
gnc-frequency.c
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1871
retrieving revision 1.1872
diff -LChangeLog -LChangeLog -u -r1.1871 -r1.1872
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2004-12-31 Derek Atkins <derek at ihtfp.com>
+
+ John Ellson's patch to fix some gcc4 warnings (bug #162582).
+
2004-12-29 Christian Stimming <stimming at tuhh.de>
* src/tax/us/txf-de_DE.scm: Add Tax TXF categories for the de_DE
Index: test-string-converters.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-string-converters.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/backend/file/test/test-string-converters.c -Lsrc/backend/file/test/test-string-converters.c -u -r1.4 -r1.5
--- src/backend/file/test/test-string-converters.c
+++ src/backend/file/test/test-string-converters.c
@@ -23,7 +23,7 @@
{
bin_data *test_data1;
void *test_data2;
- gint64 test_data2_len;
+ guint64 test_data2_len;
gchar *converted;
test_data1 = get_random_binary_data();
Index: kvp_frame.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/kvp_frame.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -Lsrc/engine/kvp_frame.c -Lsrc/engine/kvp_frame.c -u -r1.41 -r1.42
--- src/engine/kvp_frame.c
+++ src/engine/kvp_frame.c
@@ -496,7 +496,7 @@
KvpValue * new_value)
{
KvpValue * old_value;
- char *last_key;
+ char *last_key = NULL;
if (new_value)
{
Index: gnc-numeric.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/gnc-numeric.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -Lsrc/engine/gnc-numeric.c -Lsrc/engine/gnc-numeric.c -u -r1.60 -r1.61
--- src/engine/gnc-numeric.c
+++ src/engine/gnc-numeric.c
@@ -725,6 +725,9 @@
double sigfigs;
qofint128 nume, newm;
+ temp.num = 0;
+ temp.denom = 0;
+
if(gnc_numeric_check(in)) {
return gnc_numeric_error(GNC_ERROR_ARG);
}
Index: test-book-merge.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/test-book-merge.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/engine/test/test-book-merge.c -Lsrc/engine/test/test-book-merge.c -u -r1.2 -r1.3
--- src/engine/test/test-book-merge.c
+++ src/engine/test/test-book-merge.c
@@ -170,6 +170,10 @@
obj_getDate(myobj *g)
{
Timespec ts;
+
+ ts.tv_nsec = 0;
+ ts.tv_sec = 0;
+
if(!g) return ts;
ts = g->date;
return ts;
Index: mainwindow-account-tree.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/mainwindow-account-tree.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/gnome/mainwindow-account-tree.c -Lsrc/gnome/mainwindow-account-tree.c -u -r1.6 -r1.7
--- src/gnome/mainwindow-account-tree.c
+++ src/gnome/mainwindow-account-tree.c
@@ -38,7 +38,7 @@
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)
Index: gnc-split-reg.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/gnc-split-reg.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lsrc/gnome/gnc-split-reg.c -Lsrc/gnome/gnc-split-reg.c -u -r1.38 -r1.39
--- src/gnome/gnc-split-reg.c
+++ src/gnome/gnc-split-reg.c
@@ -254,7 +254,7 @@
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 )
Index: gnc-date-edit.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-date-edit.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/gnome-utils/gnc-date-edit.c -Lsrc/gnome-utils/gnc-date-edit.c -u -r1.11 -r1.12
--- src/gnome-utils/gnc-date-edit.c
+++ src/gnome-utils/gnc-date-edit.c
@@ -53,7 +53,7 @@
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 @@
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);
Index: gnc-date-delta.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-date-delta.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/gnome-utils/gnc-date-delta.c -Lsrc/gnome-utils/gnc-date-delta.c -u -r1.2 -r1.3
--- src/gnome-utils/gnc-date-delta.c
+++ src/gnome-utils/gnc-date-delta.c
@@ -53,7 +53,7 @@
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);
Index: gnc-frequency.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-frequency.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/gnome-utils/gnc-frequency.c -Lsrc/gnome-utils/gnc-frequency.c -u -r1.20 -r1.21
--- src/gnome-utils/gnc-frequency.c
+++ src/gnome-utils/gnc-frequency.c
@@ -44,7 +44,7 @@
LAST_SIGNAL
} GNCF_Signals;
-static gint gnc_frequency_signals[LAST_SIGNAL] = { 0 };
+static guint gnc_frequency_signals[LAST_SIGNAL] = { 0 };
/** Private Prototypes ********************/
Index: gnc-dense-cal.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-dense-cal.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/gnome-utils/gnc-dense-cal.c -Lsrc/gnome-utils/gnc-dense-cal.c -u -r1.13 -r1.14
--- src/gnome-utils/gnc-dense-cal.c
+++ src/gnome-utils/gnc-dense-cal.c
@@ -94,7 +94,7 @@
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_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 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 const inline int col_height( GncDenseCal *dcal );
-static const inline int num_cols( 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 @@
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_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;
Index: gnc-amount-edit.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-amount-edit.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/gnome-utils/gnc-amount-edit.c -Lsrc/gnome-utils/gnc-amount-edit.c -u -r1.3 -r1.4
--- src/gnome-utils/gnc-amount-edit.c
+++ src/gnome-utils/gnc-amount-edit.c
@@ -49,7 +49,7 @@
};
-static gint amount_edit_signals [LAST_SIGNAL] = { 0 };
+static guint amount_edit_signals [LAST_SIGNAL] = { 0 };
static void gnc_amount_edit_init (GNCAmountEdit *gae);
Index: gnc-date-format.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-date-format.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/gnome-utils/gnc-date-format.c -Lsrc/gnome-utils/gnc-date-format.c -u -r1.3 -r1.4
--- src/gnome-utils/gnc-date-format.c
+++ src/gnome-utils/gnc-date-format.c
@@ -67,7 +67,7 @@
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);
Index: gnc-account-sel.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-account-sel.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/gnome-utils/gnc-account-sel.c -Lsrc/gnome-utils/gnc-account-sel.c -u -r1.9 -r1.10
--- src/gnome-utils/gnc-account-sel.c
+++ src/gnome-utils/gnc-account-sel.c
@@ -42,7 +42,7 @@
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);
More information about the gnucash-changes
mailing list