[gnumeric] fix warning: 'return' with no value, in function returning non-void [-Wreturn-type]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] fix warning: 'return' with no value, in function returning non-void [-Wreturn-type]
- Date: Thu, 30 May 2013 04:45:14 +0000 (UTC)
commit 44b28142c45dd118dfaccce967eda9839481d01d
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Wed May 29 22:40:51 2013 -0600
fix warning: 'return' with no value, in function returning non-void [-Wreturn-type]
2013-05-29 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-cell-format.c (dialog_cell_format_select_style): fix returns
without value
src/dialogs/ChangeLog | 5 +++++
src/dialogs/dialog-cell-format.c | 15 ++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 21b37f4..39c6de5 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-29 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * dialog-cell-format.c (dialog_cell_format_select_style): fix returns
+ without value
+
2013-05-29 Morten Welinder <mwelinder gmail com>
* dialog-about.c (create_animation): Avoid creating a GList with
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 58835d6..68589ed 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -579,7 +579,7 @@ fmt_dialog_init_align_radio (char const *const name,
}
static void
-cb_rotation_changed (GORotationSel *grs, int angle, FormatState *state)
+cb_rotation_changed (G_GNUC_UNUSED GORotationSel *grs, int angle, FormatState *state)
{
if (angle < 0)
angle += 360;
@@ -602,7 +602,7 @@ fmt_dialog_init_align_page (FormatState *state)
{ "halign_fill", GNM_HALIGN_FILL },
{ "halign_center_across_selection", GNM_HALIGN_CENTER_ACROSS_SELECTION },
{ "halign_distributed", GNM_HALIGN_DISTRIBUTED },
- { NULL }
+ { NULL, 0}
};
static struct {
char const *const name;
@@ -613,7 +613,7 @@ fmt_dialog_init_align_page (FormatState *state)
{ "valign_bottom", GNM_VALIGN_BOTTOM },
{ "valign_justify", GNM_VALIGN_JUSTIFY },
{ "valign_distributed", GNM_VALIGN_DISTRIBUTED },
- { NULL }
+ { NULL, 0}
};
GtkWidget *w;
@@ -2205,7 +2205,7 @@ fmt_dialog_impl (FormatState *state, FormatDialogPosition_t pageno)
{ "line_pattern_thin", GNM_STYLE_BORDER_THIN },
{ "line_pattern_double", GNM_STYLE_BORDER_DOUBLE },
- { NULL }
+ { NULL, 0}
};
static char const *const pattern_buttons[] = {
"gp_solid", "gp_75grey", "gp_50grey",
@@ -2591,12 +2591,9 @@ dialog_cell_format_select_style (WBCGtk *wbcg, gint pages,
FormatState *state;
gint i;
- g_return_if_fail (wbcg != NULL);
-
+ g_return_val_if_fail (wbcg != NULL, NULL);
state = dialog_cell_format_init (wbcg);
-
- if (state == NULL)
- return;
+ g_return_val_if_fail (state != NULL, NULL);
state->style_selector.is_selector = TRUE;
state->style_selector.w = w;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]