[gnumeric] quieten some warnings



commit 2a469b5ce557cb10daa3455ab90ee35653ec4696
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Tue Sep 6 22:47:15 2011 -0600

    quieten some warnings
    
    2011-09-06  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* ms-excel-read.c (gnm_xl_get_codepage): use guint

 plugins/excel/ChangeLog           |    4 ++++
 plugins/excel/ms-excel-read.c     |    7 +++----
 src/tools/analysis-kaplan-meier.c |    8 ++++----
 src/tools/dao.c                   |    2 +-
 src/tools/gnm-solver.c            |    2 +-
 src/tools/tabulate.c              |    2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index bdfc812..ac1cc6b 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-06  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* ms-excel-read.c (gnm_xl_get_codepage): use guint
+
 2011-08-29  Jean Brefort  <jean brefort normalesup org>
 
 	* xlsx-read-drawing.c (xlsx_ser_labels_show_val),
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 8b9b7ee..84ceb33 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -384,7 +384,8 @@ ms_sheet_map_color (ExcelReadSheet const *esheet, MSObj const *obj, MSObjAttrID
  * preceding.
  */
 static gboolean
-ms_sheet_obj_anchor_to_pos (Sheet const * sheet, MsBiffVersion const ver,
+ms_sheet_obj_anchor_to_pos (Sheet const * sheet, 
+			    G_GNUC_UNUSED MsBiffVersion const ver,
 			    guint8 const *raw_anchor,
 			    GnmRange *range, double offset[4])
 {
@@ -1272,8 +1273,6 @@ sst_read_string (BiffQuery *q, MSContainer const *c,
 		get_len = (chars_left > total_len) ? total_len : chars_left;
 		total_len -= get_len;
 
-		XL_CHECK_CONDITION_VAL (get_len >= 0, 0);
-
 		str = excel_get_chars (c->importer,
 				       q->data + offset, get_len, use_utf16, NULL);
 		offset += get_len * (use_utf16 ? 2 : 1);
@@ -3262,7 +3261,7 @@ gnm_xl_get_codepage (char const *enc)
 		{"x-imap4-modified-utf7", 0},
 		{"x-u-escaped",           0}
 	};
-	int i;
+	guint i;
 
 	if (enc == NULL)
 		return 0;
diff --git a/src/tools/analysis-kaplan-meier.c b/src/tools/analysis-kaplan-meier.c
index 1a8a2db..4a83cdf 100644
--- a/src/tools/analysis-kaplan-meier.c
+++ b/src/tools/analysis-kaplan-meier.c
@@ -70,10 +70,10 @@ analysis_tool_kaplan_meier_engine_run (data_analysis_output_t *dao,
 	GnmFunc *fd_sqrt = NULL;
 	GnmFunc *fd_min = NULL;
 
-	GogGraph     *graph;
-	GogPlot	     *plot;
-	SheetObject *so;
-	GOData *times;
+	GogGraph     *graph = NULL;
+	GogPlot	     *plot  = NULL;
+	SheetObject  *so;
+	GOData       *times = NULL;
 
 	GSList *gl = info->group_list;
 
diff --git a/src/tools/dao.c b/src/tools/dao.c
index a0e2a8c..cbd2b3d 100644
--- a/src/tools/dao.c
+++ b/src/tools/dao.c
@@ -1051,7 +1051,7 @@ dao_put_formulas (data_analysis_output_t *dao)
 }
 
 static GnmValue *
-cb_convert_to_value (GnmCellIter const *iter, gpointer user)
+cb_convert_to_value (GnmCellIter const *iter, G_GNUC_UNUSED gpointer user)
 {
 	GnmCell *cell = iter->cell;
 	if (!cell || !gnm_cell_has_expr (cell))
diff --git a/src/tools/gnm-solver.c b/src/tools/gnm-solver.c
index 66e5a2a..3a8250e 100644
--- a/src/tools/gnm-solver.c
+++ b/src/tools/gnm-solver.c
@@ -1370,7 +1370,7 @@ gnm_sub_solver_init (GnmSubSolver *subsol)
 }
 
 static void
-cb_child_exit (GPid pid, gint status, GnmSubSolver *subsol)
+cb_child_exit (G_GNUC_UNUSED GPid pid, gint status, GnmSubSolver *subsol)
 {
 	gboolean normal = WIFEXITED (status);
 	int code;
diff --git a/src/tools/tabulate.c b/src/tools/tabulate.c
index 8da887c..244288c 100644
--- a/src/tools/tabulate.c
+++ b/src/tools/tabulate.c
@@ -47,7 +47,7 @@
 
 
 static GnmValue *
-tabulation_eval (Workbook *wb, int dims, gnm_float const *x,
+tabulation_eval (G_GNUC_UNUSED Workbook *wb, int dims, gnm_float const *x,
 		 GnmCell **xcells, GnmCell *ycell)
 {
 	int i;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]