summaryrefslogtreecommitdiff
path: root/debian/patches/clang_FTBFS_Wreturn-type.patch
blob: b85dac845cb1dba36debbc1bb503a312961651f1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
From: Maximiliano Curia <maxy@debian.org>
Date: Sat, 7 Nov 2015 16:00:53 +0100
Subject: clang_FTBFS_Wreturn-type

---
 src/model/item-data.c   | 4 ++--
 src/plot-add-function.c | 2 +-
 src/splash.c            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/model/item-data.c b/src/model/item-data.c
index c8d71c7..973db0d 100644
--- a/src/model/item-data.c
+++ b/src/model/item-data.c
@@ -514,8 +514,8 @@ item_data_has_properties (ItemData *data)
 {
 	ItemDataClass *id_class;
 
-	g_return_if_fail (data != NULL);
-	g_return_if_fail (IS_ITEM_DATA (data));
+	g_return_val_if_fail (data != NULL, NULL);
+	g_return_val_if_fail (IS_ITEM_DATA (data), NULL);
 
 	id_class = ITEM_DATA_CLASS (G_OBJECT_GET_CLASS (data));
 	if (id_class->has_properties) {
diff --git a/src/plot-add-function.c b/src/plot-add-function.c
index 478595d..92d827f 100644
--- a/src/plot-add-function.c
+++ b/src/plot-add-function.c
@@ -104,7 +104,7 @@ int plot_add_function_show (OreganoEngine *engine, SimulationData *current)
 									gtk_widget_destroy (GTK_WIDGET (warning));
 									plot_add_function_show (engine, current);
 									gtk_widget_destroy (GTK_WIDGET (dialog));
-									return;
+									return 0;
 						}
 		}
 		if  ((result == GTK_RESPONSE_OK) &&
diff --git a/src/splash.c b/src/splash.c
index 65094f2..ff08de0 100644
--- a/src/splash.c
+++ b/src/splash.c
@@ -58,12 +58,12 @@ oregano_splash_new ()
 			OREGANO_GLADEDIR "/splash.glade",  OREGANO_GLADEDIR "/splash.xpm");
 		oregano_error_with_title (_("Could not create textbox properties dialog"), msg);
 		g_free (msg);
-		return;
+		return NULL;
 	}
 	gui = glade_xml_new (OREGANO_GLADEDIR "/splash.glade", NULL, NULL);
 	if (!gui) {
 		oregano_error (_("Could not create textbox properties dialog"));
-		return;
+		return NULL;
 	}
 
 	sp = g_new0 (Splash, 1);