Build with clang

Changed files (5)

• modified libbirdfont/BirdFontFile.vala
• modified libbirdfont/PenTool.vala
• modified libbirdfont/Renderer/TextArea.vala
• modified libbirdfont/StrokeTool.vala
• modified libbirdgems/fit_cubic.c

Diff

diff --git a/libbirdfont/BirdFontFile.vala b/libbirdfont/BirdFontFile.valaindex 5241295..8a32984 100644--- a/libbirdfont/BirdFontFile.vala+++ b/libbirdfont/BirdFontFile.vala@@ -1581,7 +1581,7 @@ class BirdFontFile : GLib.Object { 			return; 		} 		-		return_val_if_fail (d.length > 1, path);+		return_if_fail (d.length > 1); 		 		if (!(d[0] == "S" || d[0] == "B")) { 			warning ("No start point.");@@ -1592,13 +1592,13 @@ class BirdFontFile : GLib.Object { 		 		if (instruction == "S") { 			p = d[i++].split (",");-			return_val_if_fail (p.length == 2, path);+			return_if_fail (p.length == 2); 			line (path, p[0], p[1]); 		}  		if (instruction == "B") { 			p = d[i++].split (",");-			return_val_if_fail (p.length == 2, path);+			return_if_fail (p.length == 2); 			cubic_line (path, p[0], p[1]); 		} 		@@ -1611,47 +1611,47 @@ class BirdFontFile : GLib.Object { 			} 			 			if (instruction == "L") {-				return_val_if_fail (i < d.length, path);+				return_if_fail (i < d.length); 				p = d[i++].split (",");-				return_val_if_fail (p.length == 2, path);+				return_if_fail (p.length == 2); 				line (path, p[0], p[1]); 			}else if (instruction == "M") {-				return_val_if_fail (i < d.length, path);+				return_if_fail (i < d.length); 				p = d[i++].split (",");-				return_val_if_fail (p.length == 2, path);+				return_if_fail (p.length == 2); 				cubic_line (path, p[0], p[1]); 			} else if (instruction == "Q") {-				return_val_if_fail (i + 1 < d.length, path);+				return_if_fail (i + 1 < d.length); 				 				p = d[i++].split (","); 				p1 = d[i++].split (","); 				-				return_val_if_fail (p.length == 2, path);-				return_val_if_fail (p1.length == 2, path);+				return_if_fail (p.length == 2);+				return_if_fail (p1.length == 2); 				 				quadratic (path, p[0], p[1], p1[0], p1[1]); 			} else if (instruction == "D") {-				return_val_if_fail (i + 2 < d.length, path);+				return_if_fail (i + 2 < d.length); 				 				p = d[i++].split (","); 				p1 = d[i++].split (","); 				p2 = d[i++].split (","); -				return_val_if_fail (p.length == 2, path);-				return_val_if_fail (p1.length == 2, path);-				return_val_if_fail (p2.length == 2, path);+				return_if_fail (p.length == 2);+				return_if_fail (p1.length == 2);+				return_if_fail (p2.length == 2); 				 				double_curve (path, p[0], p[1], p1[0], p1[1], p2[0], p2[1]); 			} else if (instruction == "C") {-				return_val_if_fail (i + 2 < d.length, path);+				return_if_fail (i + 2 < d.length); 				 				p = d[i++].split (","); 				p1 = d[i++].split (","); 				p2 = d[i++].split (","); -				return_val_if_fail (p.length == 2, path);-				return_val_if_fail (p1.length == 2, path);-				return_val_if_fail (p2.length == 2, path);+				return_if_fail (p.length == 2);+				return_if_fail (p1.length == 2);+				return_if_fail (p2.length == 2); 				 				cubic (path, p[0], p[1], p1[0], p1[1], p2[0], p2[1]); 			} else if (instruction == "T") {diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex af34618..8075151 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -462,7 +462,7 @@ public class PenTool : Tool { 		EditPoint next, prev; 		double step, distance; 				-		return_if_fail (p.path.points.size > 0);+		return_val_if_fail (p.path.points.size > 0, 0); 		 		if (p.path.points.size <= 2) { 			p.point.deleted = true;@@ -588,7 +588,7 @@ public class PenTool : Tool { 		EditPoint next, prev; 		double step, distance; 				-		return_if_fail (p.path.points.size > 0);+		return_val_if_fail (p.path.points.size > 0, 0); 		 		if (p.path.points.size <= 2) { 			p.point.deleted = true;@@ -1369,7 +1369,7 @@ public class PenTool : Tool { 			return null; 		} 		-		return_if_fail (path.points.size > 0);+		return_val_if_fail (path.points.size > 0, null); 		 		px = Glyph.reverse_path_coordinate_x (end_point.x); 		py = Glyph.reverse_path_coordinate_y (end_point.y);@@ -1455,7 +1455,7 @@ public class PenTool : Tool { 				direction_changed = !direction_changed; 			} -			return_if_fail (merge.points.size > 0);+			return_val_if_fail (merge.points.size > 0, null);  			if (is_close_to_point (merge.points.get (0), px, py)) {				 				if (path.points.size == 1) {@@ -1749,7 +1749,7 @@ public class PenTool : Tool { 		selected_point = new_point.point; 		active_edit_point = new_point.point; 		-		return_if_fail (glyph.active_paths.size > 0);		+		return_val_if_fail (glyph.active_paths.size > 0, new PointSelection.empty ()); 		add_selected_point (selected_point, glyph.active_paths.get (glyph.active_paths.size - 1));  		active_path = new_point.path;diff --git a/libbirdfont/Renderer/TextArea.vala b/libbirdfont/Renderer/TextArea.valaindex 1fb04ac..ef7ba16 100644--- a/libbirdfont/Renderer/TextArea.vala+++ b/libbirdfont/Renderer/TextArea.vala@@ -360,7 +360,7 @@ public class TextArea : Widget { 		sb.append (pg.text.substring (selection_start.character_index)); 		 		for (i = selection_start.paragraph + 1; i < selection_stop.paragraph; i++) {-			return_if_fail (0 <= i < paragraphs.size);+			return_val_if_fail (0 <= i < paragraphs.size, "".dup ()); 			pg = paragraphs.get (i); 			sb.append (pg.text); 		}@@ -524,7 +524,7 @@ public class TextArea : Widget { 			paragraph.set_text (np);  			if (np == "") {-				return_if_fail (carret.paragraph > 0);+				return_val_if_fail (carret.paragraph > 0, ui); 				carret.paragraph--; 				paragraph = paragraphs.get (carret.paragraph); 				carret.character_index = paragraph.text_length;@@ -564,7 +564,7 @@ public class TextArea : Widget { 		int index; 		unichar c; 		-		return_if_fail (0 <= carret.paragraph < paragraphs.size);+		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0'); 		paragraph = paragraphs.get (carret.paragraph); 		 		index = carret.character_index;@@ -603,7 +603,7 @@ public class TextArea : Widget { 		int index, last_index; 		unichar c; 		-		return_if_fail (0 <= carret.paragraph < paragraphs.size);+		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0'); 		paragraph = paragraphs.get (carret.paragraph); 		 		index = 0;@@ -616,7 +616,7 @@ public class TextArea : Widget { 		if (last_index <= 0 && carret.paragraph > 0) { 			carret.paragraph--; 			-			return_if_fail (0 <= carret.paragraph < paragraphs.size);+			return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0'); 			paragraph = paragraphs.get (carret.paragraph); 			carret.character_index = paragraph.text_length; 			@@ -632,7 +632,7 @@ public class TextArea : Widget { 			c = ' '; 		} 		-		return_if_fail (0 <= carret.paragraph < paragraphs.size);+		return_val_if_fail (0 <= carret.paragraph < paragraphs.size, '\0'); 		 		return c; 	}diff --git a/libbirdfont/StrokeTool.vala b/libbirdfont/StrokeTool.valaindex b46ca1f..cd75907 100644--- a/libbirdfont/StrokeTool.vala+++ b/libbirdfont/StrokeTool.vala@@ -1462,8 +1462,8 @@ public class StrokeTool : Tool { 			pl1 = get_remaining_points (path1.copy ()); 			pl2 = get_remaining_points (path2.copy ()); 			-			return_if_fail (pl1.paths.size == 2);-			return_if_fail (pl2.paths.size == 2);+			return_val_if_fail (pl1.paths.size == 2, false);+			return_val_if_fail (pl2.paths.size == 2, false); 			 			a1 = pl1.paths.get (0); 			a2 = pl1.paths.get (1);diff --git a/libbirdgems/fit_cubic.c b/libbirdgems/fit_cubic.cindex 2817711..ed2e3ce 100644--- a/libbirdgems/fit_cubic.c+++ b/libbirdgems/fit_cubic.c@@ -118,7 +118,7 @@ void fit_bezier_curve_to_line ( 	free (points); } -DrawBezierCurve(int n, Point2* curve)+void DrawBezierCurve(int n, Point2* curve) { 	int i;