[goffice] Fixed some gcc-4.6 warnings. [#649355]
- From: Jean Bréfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Fixed some gcc-4.6 warnings. [#649355]
- Date: Sun, 15 May 2011 13:19:08 +0000 (UTC)
commit e529d0f8250945f588e8add881d8b3f29ce208f3
Author: Jean Brefort <jean brefort normalesup org>
Date: Sun May 15 15:18:30 2011 +0200
Fixed some gcc-4.6 warnings. [#649355]
ChangeLog | 7 +++++++
goffice/utils/go-format.c | 11 -----------
2 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ce4bd78..94b50a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-15 Jean Brefort <jean brefort normalesup org>
+
+ * goffice/utils/go-format.c (go_format_parse_sequential),
+ (go_format_output_date_to_odf),
+ (go_format_output_scientific_number_to_odf): fixed some gcc-4.6 warnings.
+ [#649355]
+
2011-05-10 Morten Welinder <terra gnome org>
* goffice/math/go-regression.c (general_linear_regression): Always
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index 95e1820..fa5c358 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -1229,7 +1229,6 @@ go_format_parse_sequential (const char *str, GString *prg,
gboolean seen_hour = FALSE;
gboolean seen_ampm = FALSE;
gboolean seen_minute = FALSE;
- gboolean seen_second = FALSE;
gboolean seen_elapsed = FALSE;
gboolean m_is_minutes = FALSE;
gboolean seconds_trigger_minutes = TRUE;
@@ -1356,7 +1355,6 @@ go_format_parse_sequential (const char *str, GString *prg,
seen_time = TRUE;
ADD_OP (n == 1 ? OP_TIME_SECOND : OP_TIME_SECOND_2);
- seen_second = TRUE;
break;
}
@@ -1423,7 +1421,6 @@ go_format_parse_sequential (const char *str, GString *prg,
goto error;
seen_time = TRUE;
seen_elapsed = TRUE;
- seen_second = TRUE;
if (seconds_trigger_minutes) {
m_is_minutes = TRUE;
seconds_trigger_minutes = FALSE;
@@ -5605,7 +5602,6 @@ go_format_output_date_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
gboolean seen_month = FALSE;
gboolean seen_day = FALSE;
gboolean seen_weekday = FALSE;
- gboolean seen_time = FALSE;
gboolean seen_hour = FALSE;
gboolean seen_ampm = FALSE;
gboolean seen_minute = FALSE;
@@ -5862,7 +5858,6 @@ go_format_output_date_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
case TOK_ELAPSED_S:
if (seen_elapsed || seen_ampm || seen_second) break;
- seen_time = TRUE;
seen_elapsed = TRUE;
seen_second = TRUE;
if (seconds_trigger_minutes) {
@@ -6552,7 +6547,6 @@ go_format_output_scientific_number_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
gboolean dot_seen = FALSE;
gboolean number_completed = FALSE;
- gboolean number_seen = FALSE;
gboolean color_completed = FALSE;
gboolean string_is_open = FALSE;
@@ -6575,7 +6569,6 @@ go_format_output_scientific_number_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
if (number_completed) break;
/* ODF allows only for a single number specification */
ODF_CLOSE_STRING;
- number_seen = TRUE;
dot_seen = TRUE;
break;
@@ -6583,7 +6576,6 @@ go_format_output_scientific_number_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
if (number_completed) break;
/* ODF allows only for a single number specification */
ODF_CLOSE_STRING;
- number_seen = TRUE;
comma_seen = TRUE;
break;
@@ -6591,7 +6583,6 @@ go_format_output_scientific_number_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
if (number_completed) break;
/* ODF allows only for a single number specification */
ODF_CLOSE_STRING;
- number_seen = TRUE;
if (dot_seen)
min_decimal_digits++;
else
@@ -6602,14 +6593,12 @@ go_format_output_scientific_number_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
if (number_completed) break;
/* ODF allows only for a single number specification */
ODF_CLOSE_STRING;
- number_seen = TRUE;
break;
case '#':
if (number_completed) break;
/* ODF allows only for a single number specification */
ODF_CLOSE_STRING;
- number_seen = TRUE;
if (!dot_seen)
hashes++;
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]