[gnumeric] compilation: quiet clang.



commit 5a6d6f8d5774a31f606a8c186c2eb7475f840ecc
Author: Morten Welinder <terra gnome org>
Date:   Wed Aug 11 23:36:22 2010 -0400

    compilation: quiet clang.

 ChangeLog          |    4 ++++
 plugins/mps/mps.c  |    6 ++++++
 src/xml-sax-read.c |    2 +-
 3 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4acdc00..3dfdbbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-11  Morten Welinder  <terra gnome org>
+
+	* src/xml-sax-read.c (xml_sax_colrow): Set "pos" initially.
+
 2010-08-11  Jean Brefort  <jean brefort normalesup org>
 
 	* src/gnm-pane.c (cb_update_ctrl_pts), (set_item_x_y),
diff --git a/plugins/mps/mps.c b/plugins/mps/mps.c
index 942dcb8..1b193bd 100644
--- a/plugins/mps/mps.c
+++ b/plugins/mps/mps.c
@@ -254,6 +254,12 @@ mps_parse_rows (MpsState *state)
 			is_objfunc = TRUE;
 			seen_objfunc = TRUE;
 			g_ptr_array_index (state->rows, 0) = row;
+		} else {
+			mps_mark_error (state,
+					_("Invalid row type %s"),
+					type);
+			ignore_section (state);
+			return;
 		}
 
 		row->name = g_strdup (name);
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index 85db58f..aaafea1 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -1283,7 +1283,7 @@ xml_sax_colrow (GsfXMLIn *xin, xmlChar const **attrs)
 
 	ColRowInfo *cri = NULL;
 	double size = -1.;
-	int pos, val;
+	int pos = -1, val;
 	int hidden = 0, hard_size = 0, is_collapsed = 0, outline_level = 0;
 	int count = 1;
 	gboolean const is_col = xin->node->user_data.v_bool;



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