[gnumeric] Compilation: avoid double ;;
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Compilation: avoid double ;;
- Date: Tue, 19 Mar 2013 13:10:42 +0000 (UTC)
commit 749929f2192adc03955d4af1624c8000ec7359b9
Author: Morten Welinder <terra gnome org>
Date: Tue Mar 19 09:10:27 2013 -0400
Compilation: avoid double ;;
plugins/excel/xlsx-read-drawing.c | 4 ++--
plugins/excel/xlsx-write.c | 2 +-
plugins/fn-r/extra.c | 2 +-
plugins/fn-random/functions.c | 2 +-
plugins/perl-loader/perl-cc-wrapper | 2 +-
src/commands.c | 12 ++++++------
src/dialogs/dialog-define-names.c | 2 +-
src/gnm-random.c | 2 +-
src/rendered-value.c | 2 +-
src/sheet-object-component.c | 2 +-
src/sheet.c | 2 +-
src/tools/analysis-tools.c | 2 +-
src/tools/dao.c | 2 +-
src/tools/tabulate.c | 2 +-
src/wbc-gtk-actions.c | 4 ++--
src/workbook-cmd-format.c | 2 +-
test/GnumericTest.pm | 2 +-
17 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 5bf0d73..dbcf61d 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -2581,7 +2581,7 @@ xlsx_vml_client_data (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
double coords[4];
int default_size = sheet_col_get_default_size_pixels (state->sheet);
int pos, sum, size;
- for (pos = 0, sum = 0;;pos++) {
+ for (pos = 0, sum = 0; /* no test */; pos++) {
cri = sheet_col_get (state->sheet, pos);
size = (cri)? cri->size_pixels: default_size;
if (sum + size > state->chart_pos[0])
@@ -2601,7 +2601,7 @@ xlsx_vml_client_data (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
r.end.col = pos;
coords[2] = (state->chart_pos[2] - sum) / size;
default_size = sheet_row_get_default_size_pixels (state->sheet);
- for (pos = 0, sum = 0;;pos++) {
+ for (pos = 0, sum = 0; /* no test */; pos++) {
cri = sheet_row_get (state->sheet, pos);
size = (cri)? cri->size_pixels: default_size;
if (sum + size > state->chart_pos[1])
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index b1452c6..c7a791b 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -1141,7 +1141,7 @@ xlsx_write_init_row (gboolean *needs_row, GsfXMLOut *xml, int r, char const *spa
if (*needs_row) {
gsf_xml_out_start_element (xml, "row");
gsf_xml_out_add_int (xml, "r", r+1);
- gsf_xml_out_add_cstr_unchecked (xml, "spans", span);;
+ gsf_xml_out_add_cstr_unchecked (xml, "spans", span);
*needs_row = FALSE;
}
}
diff --git a/plugins/fn-r/extra.c b/plugins/fn-r/extra.c
index 758a945..6366b79 100644
--- a/plugins/fn-r/extra.c
+++ b/plugins/fn-r/extra.c
@@ -100,7 +100,7 @@ gnm_owent (gnm_float h, gnm_float a)
{
gnm_float h1 = 0.5 * a;
as *= 0.25;
- for (;;)
+ while (1)
{
gnm_float rt = as + 1.0;
h2 = h1 + (hs * as + LIM3 - log(rt))
diff --git a/plugins/fn-random/functions.c b/plugins/fn-random/functions.c
index 9e38999..2d28c8e 100644
--- a/plugins/fn-random/functions.c
+++ b/plugins/fn-random/functions.c
@@ -957,7 +957,7 @@ gnumeric_randstdist (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
gnm_float alpha = argv[1] ? value_get_as_float (argv[1]) : 0.;
return ((alpha == 0.) ? value_new_float (random_tdist (nu))
- : value_new_float (random_skew_tdist (nu, alpha)));;
+ : value_new_float (random_skew_tdist (nu, alpha)));
}
/***************************************************************************/
diff --git a/plugins/perl-loader/perl-cc-wrapper b/plugins/perl-loader/perl-cc-wrapper
index 7ef48b0..fe6de82 100644
--- a/plugins/perl-loader/perl-cc-wrapper
+++ b/plugins/perl-loader/perl-cc-wrapper
@@ -25,7 +25,7 @@ while (@ARGV) {
push @cmd, $arg;
if ($arg eq '-o') {
- $target = shift @ARGV;;
+ $target = shift @ARGV;
if ($target =~ /\.lo$/) {
$tmptarget = $target;
$tmptarget =~ s/\.lo$/-tmp.o/;
diff --git a/src/commands.c b/src/commands.c
index d0ec65f..9d3b3c9 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -2070,7 +2070,7 @@ cmd_resize_colrow (WorkbookControl *wbc, Sheet *sheet,
}
g_string_free (list, TRUE);
- saved_state = colrow_get_sizes (sheet, is_cols, selection, new_size);;
+ saved_state = colrow_get_sizes (sheet, is_cols, selection, new_size);
undo = gnm_undo_colrow_restore_state_group_new
(sheet, is_cols, colrow_index_list_copy (selection), saved_state);
@@ -2098,7 +2098,7 @@ cmd_autofit_selection (WorkbookControl *wbc, SheetView *sv, Sheet *sheet, gboole
g_free (names);
- saved_state = colrow_get_sizes (sheet, fit_width, selectionlist, -1);;
+ saved_state = colrow_get_sizes (sheet, fit_width, selectionlist, -1);
undo = gnm_undo_colrow_restore_state_group_new
(sheet, fit_width, colrow_index_list_copy (selectionlist), saved_state);
@@ -2908,8 +2908,8 @@ typedef struct {
gboolean only_objects;
ColRowStateGroup *saved_sizes_rows;
ColRowStateGroup *saved_sizes_cols;
- ColRowIndexList *saved_list_rows;;
- ColRowIndexList *saved_list_cols;;
+ ColRowIndexList *saved_list_rows;
+ ColRowIndexList *saved_list_cols;
gboolean single_merge_to_single_merge;
} CmdPasteCopy;
@@ -6986,7 +6986,7 @@ cmd_so_graph_config (WorkbookControl *wbc, SheetObject *so,
me->old_graph = GOG_GRAPH (o_graph);
g_object_ref (me->old_graph);
- me->cmd.sheet = sheet_object_get_sheet (so);;
+ me->cmd.sheet = sheet_object_get_sheet (so);
me->cmd.size = 10;
me->cmd.cmd_descriptor = g_strdup (_("Reconfigure Graph"));
@@ -7056,7 +7056,7 @@ cmd_so_component_config (WorkbookControl *wbc, SheetObject *so,
me->new_obj = GO_COMPONENT (g_object_ref (n_obj));
me->old_obj = GO_COMPONENT (g_object_ref (o_obj));
- me->cmd.sheet = sheet_object_get_sheet (so);;
+ me->cmd.sheet = sheet_object_get_sheet (so);
me->cmd.size = 10;
me->cmd.cmd_descriptor = g_strdup (_("Reconfigure Object"));
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index 77016b5..9071d72 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -1037,7 +1037,7 @@ cb_name_guru_selection_function (G_GNUC_UNUSED GtkTreeSelection *selection,
if (path_currently_selected)
return TRUE;
if (gtk_tree_model_get_iter (model, &iter, path)) {
- gboolean is_pastable, is_editable;;
+ gboolean is_pastable, is_editable;
gtk_tree_model_get (model,
&iter,
ITEM_PASTABLE, &is_pastable,
diff --git a/src/gnm-random.c b/src/gnm-random.c
index b60e532..b651a1d 100644
--- a/src/gnm-random.c
+++ b/src/gnm-random.c
@@ -1455,7 +1455,7 @@ gnm_float
random_skew_tdist (gnm_float nu, gnm_float a)
{
gnm_float chi = random_chisq (nu);
- gnm_float z = random_skew_normal (a);;
+ gnm_float z = random_skew_normal (a);
return (z * gnm_sqrt(nu/chi));
}
diff --git a/src/rendered-value.c b/src/rendered-value.c
index e7bddfd..db45a65 100644
--- a/src/rendered-value.c
+++ b/src/rendered-value.c
@@ -599,7 +599,7 @@ gnm_rendered_value_get_text (GnmRenderedValue const *rv)
GOColor
gnm_rendered_value_get_color (GnmRenderedValue const * rv)
{
- return rv->go_fore_color;;
+ return rv->go_fore_color;
}
/* ------------------------------------------------------------------------- */
diff --git a/src/sheet-object-component.c b/src/sheet-object-component.c
index 867bf6d..f6629ba 100644
--- a/src/sheet-object-component.c
+++ b/src/sheet-object-component.c
@@ -321,7 +321,7 @@ static void
gnm_soc_copy (SheetObject *dst, SheetObject const *src)
{
SheetObjectComponent *soc = SHEET_OBJECT_COMPONENT (src);
- GOComponent *component = go_component_duplicate (soc->component);;
+ GOComponent *component = go_component_duplicate (soc->component);
sheet_object_component_set_component (dst, component);
g_object_unref (component);
}
diff --git a/src/sheet.c b/src/sheet.c
index ed9514e..231a3f4 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -5346,7 +5346,7 @@ sheet_move_range (GnmExprRelocateInfo const *rinfo,
else
invalid = g_slist_append (NULL, gnm_range_dup (&dst));
- reloc_info.origin_sheet = reloc_info.target_sheet = rinfo->target_sheet;;
+ reloc_info.origin_sheet = reloc_info.target_sheet = rinfo->target_sheet;
/* send to infinity to invalidate, but try to assist
* the relocation heuristics only move in 1
diff --git a/src/tools/analysis-tools.c b/src/tools/analysis-tools.c
index 05580d8..ec1954c 100644
--- a/src/tools/analysis-tools.c
+++ b/src/tools/analysis-tools.c
@@ -2695,7 +2695,7 @@ analysis_tool_ftest_engine_run (data_analysis_output_t *dao,
/* P two-tail */
{
- GnmFunc *fd_min = gnm_func_lookup_or_add_placeholder ("MIN");;
+ GnmFunc *fd_min = gnm_func_lookup_or_add_placeholder ("MIN");
gnm_func_ref (fd_min);
diff --git a/src/tools/dao.c b/src/tools/dao.c
index 29cd50f..e258b10 100644
--- a/src/tools/dao.c
+++ b/src/tools/dao.c
@@ -190,7 +190,7 @@ dao_command_descriptor (data_analysis_output_t *dao, char const *format,
rangename = dao_range_name (dao);
*text = g_strdup_printf (format, rangename);
g_free (rangename);
- break;;
+ break;
}
return *text;
}
diff --git a/src/tools/tabulate.c b/src/tools/tabulate.c
index c93ad80..2f83558 100644
--- a/src/tools/tabulate.c
+++ b/src/tools/tabulate.c
@@ -221,7 +221,7 @@ do_tabulation (WorkbookControl *wbc,
range.start.col = 0;
range.start.row = 0;
range.end.col = 0;
- range.end.row = counts[0];;
+ range.end.row = counts[0];
border = gnm_style_border_fetch (GNM_STYLE_BORDER_MEDIUM,
style_color_black (),
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 468bcbf..20af87c 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -239,7 +239,7 @@ static GNM_ACTION_DEF (cb_file_print_area_set)
char *message;
char * selection;
GnmRange const *r = selection_first_range (sv,
- GO_CMD_CONTEXT (wbcg), _("Set Print Area"));;
+ GO_CMD_CONTEXT (wbcg), _("Set Print Area"));
if (r != NULL) {
parse_pos_init_sheet (&pp, sheet);
selection = undo_range_name (sheet, r);
@@ -399,7 +399,7 @@ static GNM_ACTION_DEF (cb_edit_delete_links)
gchar const *format;
gchar *name;
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
- Sheet *sheet = wb_control_cur_sheet (wbc);;
+ Sheet *sheet = wb_control_cur_sheet (wbc);
for (l = scg_view (scg)->selections; l != NULL; l = l->next) {
GnmRange const *r = l->data;
diff --git a/src/workbook-cmd-format.c b/src/workbook-cmd-format.c
index 845eb39..4559841 100644
--- a/src/workbook-cmd-format.c
+++ b/src/workbook-cmd-format.c
@@ -165,7 +165,7 @@ workbook_cmd_wrap_sort (WorkbookControl *wbc, int type)
struct workbook_cmd_wrap_sort_t cl = {NULL, NULL, NULL};
cl.r = selection_first_range
- (sv, GO_CMD_CONTEXT (wbc), _("Wrap SORT"));;
+ (sv, GO_CMD_CONTEXT (wbc), _("Wrap SORT"));
cl.wb = wb_control_get_workbook (wbc);
if (g_slist_length (l) > 1) {
diff --git a/test/GnumericTest.pm b/test/GnumericTest.pm
index 9d5ea57..a689a81 100644
--- a/test/GnumericTest.pm
+++ b/test/GnumericTest.pm
@@ -474,7 +474,7 @@ sub test_ssindex {
}
}
- local $_ = \ items;;
+ local $_ = \ items;
if (&$test ($_)) {
print STDERR "Pass\n";
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
