[[ ReturnType ]] Turn return-type warnings into errors.

livecodesebastien · livecodesebastien · commit 28b7be172807 · 2015-10-14T11:11:37.000+01:00
Fix Linux compilation
diff --git a/config/android.gypi b/config/android.gypi
@@ -73,6 +73,7 @@
 						'-Wextra',
 						'-Wno-unused-parameter',	# Just contributes build noise
 						'-Werror=uninitialized',
+						'-Werror=return-type',
 					],
 					
 					'cflags_c':
diff --git a/config/ios.gypi b/config/ios.gypi
@@ -172,6 +172,7 @@
 							'-Werror=declaration-after-statement',
 							'-Wno-unused-parameter',
 							'-Werror=uninitialized',
+							'-Werror=return-type',
 						],
 					},
 				},
diff --git a/config/linux.gypi b/config/linux.gypi
@@ -90,6 +90,7 @@
 						'-Wextra',
 						'-Wno-unused-parameter',	# Just contributes build noise
 						'-Werror=uninitialized',
+						'-Werror=return-type',
 					],
 				},
 				{
diff --git a/config/mac.gypi b/config/mac.gypi
@@ -120,6 +120,7 @@
 							'-Werror=declaration-after-statement',
 							'-Wno-unused-parameter',
 							'-Werror=uninitialized',
+							'-Werror=return-type',
 						],
 					},
 				},
diff --git a/engine/src/chunk.cpp b/engine/src/chunk.cpp
@@ -5883,7 +5883,7 @@ bool MCTextChunkIterator::next(MCExecContext& ctxt)
             return true;
     
         default:
-            assert(false);
+            MCUnreachableReturn(false);
     }
 }
 
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -125,9 +125,9 @@ static MCCustomPrinterImageType MCCustomPrinterImageTypeFromMCGRasterFormat(MCGR
 		return kMCCustomPrinterImageRawXRGB;
 	case kMCGRasterFormat_A:
 	case kMCGRasterFormat_U_ARGB:
+    default:
 		// Unsupported
-		MCAssert(false);
-		return kMCCustomPrinterImageNone;
+        MCUnreachableReturn(kMCCustomPrinterImageNone);
 	}
 }
 
diff --git a/engine/src/graphicscontext.cpp b/engine/src/graphicscontext.cpp
@@ -75,6 +75,8 @@ static inline MCGBlendMode MCBitmapEffectBlendModeToMCGBlendMode(MCBitmapEffectB
 			return kMCGBlendModeColor;
 		case kMCBitmapEffectBlendModeLuminosity:
 			return kMCGBlendModeLuminosity;
+    default:
+        MCUnreachableReturn(kMCGBlendModeSourceOver);
 	}
 }
 
diff --git a/engine/src/lnxaudio.cpp b/engine/src/lnxaudio.cpp
@@ -107,6 +107,8 @@ int X11Audio::play(int1 * p_sample, uint4 p_samplesize, uint p_rate)
 		
 		return t_bytes_written ;
 	}
+
+    return 0;
 }
 
 
diff --git a/engine/src/mode_installer.cpp b/engine/src/mode_installer.cpp
@@ -323,6 +323,7 @@ class MCInternalPayloadOpen: public MCStatement
 	// MM-2011-03-23: Takes a file path and memory maps its contents to r_payload_data, also returning the file size.
 	static bool mmap_payload_from_file(const char *p_file_name, const void *&r_payload_data, uint32_t &r_payload_size)
 	{
+        bool t_success;
 #if defined(_MACOSX)
 		// The OS X code is just refactored from the method funciton.
 		s_payload_mapped_data = nil;
@@ -356,18 +357,19 @@ class MCInternalPayloadOpen: public MCStatement
 		}
 
 		if (s_payload_mapped_data == nil && s_payload_loaded_data == nil)
-			return false;
-
-		r_payload_data = s_payload_mapped_data != nil ? s_payload_mapped_data : s_payload_loaded_data;
-		r_payload_size = s_payload_mapped_size;
-		return true;
+            t_succes = false;
+        else
+        {
+            r_payload_data = s_payload_mapped_data != nil ? s_payload_mapped_data : s_payload_loaded_data;
+            r_payload_size = s_payload_mapped_size;
+            t_success = true;
+        }
 #elif defined(_WINDOWS)
 		s_payload_file_handle = nil;
 		s_payload_file_map = nil;
 		s_payload_mapped_data = nil;
 
-		// Fetch a handle to the file and map the contents to memory.
-		bool t_success;
+        // Fetch a handle to the file and map the contents to memory.
 		t_success = true;
 		if (t_success)
 		{
@@ -401,9 +403,12 @@ class MCInternalPayloadOpen: public MCStatement
 				CloseHandle(s_payload_file_map);
 			if (s_payload_file_handle != INVALID_HANDLE_VALUE)
 				CloseHandle(s_payload_file_handle);
-		}
-		return t_success;
+        }
+#else
+        t_success = false;
 #endif
+
+        return t_success;
 	}
 };
 
diff --git a/engine/src/stackview.cpp b/engine/src/stackview.cpp
@@ -313,6 +313,8 @@ MCGAffineTransform view_get_stack_transform(MCStackFullscreenMode p_mode, MCRect
 		t_rect = MCU_center_rect(p_screen_rect, p_stack_rect);
 		// IM-2013-12-19: [[ Bug 11590 ]] Adjust for screen rect origins other than 0,0
 		return MCGAffineTransformMakeTranslation(t_rect.x - p_screen_rect.x, t_rect.y - p_screen_rect.y);
+    default:
+        MCUnreachableReturn(MCGAffineTransformMakeIdentity());
 	}
 }
 
diff --git a/libgraphics/include/graphics.h b/libgraphics/include/graphics.h
@@ -82,6 +82,8 @@ static inline uint32_t MCGPixelPack(MCGPixelFormat p_format, uint8_t p_red, uint
 			
 		case kMCGPixelFormatARGB:
 			return __MCGPixelPackComponents(p_alpha, p_red, p_green, p_blue);
+        default:
+            MCUnreachableReturn(0);
 	}
 }
 
diff --git a/libgraphics/src/graphics-internal.h b/libgraphics/src/graphics-internal.h
@@ -325,7 +325,9 @@ inline SkPaint::Join MCGJoinStyleToSkJoinStyle(MCGJoinStyle p_style)
 		case kMCGJoinStyleRound:
 			return SkPaint::kRound_Join;
 		case kMCGJoinStyleMiter:
-			return SkPaint::kMiter_Join;			
+            return SkPaint::kMiter_Join;
+        default:
+            MCUnreachableReturn(SkPaint::kMiter_Join);
 	}
 }
 
@@ -353,6 +355,8 @@ inline SkPaint::Cap MCGCapStyleToSkCapStyle(MCGCapStyle p_style)
 			return SkPaint::kRound_Cap;
 		case kMCGCapStyleSquare:
 			return SkPaint::kSquare_Cap;
+        default:
+            MCUnreachableReturn(SkPaint::kButt_Cap);
 	}
 }
 
@@ -401,6 +405,8 @@ inline SkPath::FillType MCGFillRuleToSkFillType(MCGFillRule p_rule)
 			return SkPath::kWinding_FillType;
 		case kMCGFillRuleEvenOdd:
 			return SkPath::kEvenOdd_FillType;
+        default:
+            MCUnreachableReturn(SkPath::kEvenOdd_FillType);
 	}
 }
 
@@ -428,6 +434,8 @@ inline SkBitmap::Config MCGRasterFormatToSkBitmapConfig(MCGRasterFormat p_format
 	case kMCGRasterFormat_U_ARGB:
 	case kMCGRasterFormat_xRGB:
 		return SkBitmap::kARGB_8888_Config;
+    default:
+        MCUnreachableReturn(SkBitmap::kA8_Config);
 	}
 }
 
@@ -440,6 +448,8 @@ inline MCGRasterFormat MCGRasterFormatFromSkBitmapConfig(SkBitmap::Config p_conf
 		return kMCGRasterFormat_A;
 	case SkBitmap::kARGB_8888_Config:
 		return p_opaque ? kMCGRasterFormat_xRGB : kMCGRasterFormat_ARGB;
+    default:
+        MCUnreachableReturn(kMCGRasterFormat_A);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@`
`90`	`90`	`'-Wextra',`
`91`	`91`	`'-Wno-unused-parameter', # Just contributes build noise`
`92`	`92`	`'-Werror=uninitialized',`
	`93`	`+ '-Werror=return-type',`
`93`	`94`	`],`
`94`	`95`	`},`
`95`	`96`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5883,7 +5883,7 @@ bool MCTextChunkIterator::next(MCExecContext& ctxt)`
`5883`	`5883`	`return true;`
`5884`	`5884`
`5885`	`5885`	`default:`
`5886`		`- assert(false);`
	`5886`	`+ MCUnreachableReturn(false);`
`5887`	`5887`	`}`
`5888`	`5888`	`}`
`5889`	`5889`
Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,9 @@ static MCCustomPrinterImageType MCCustomPrinterImageTypeFromMCGRasterFormat(MCGR`
`125`	`125`	`return kMCCustomPrinterImageRawXRGB;`
`126`	`126`	`case kMCGRasterFormat_A:`
`127`	`127`	`case kMCGRasterFormat_U_ARGB:`
	`128`	`+ default:`
`128`	`129`	`// Unsupported`
`129`		`- MCAssert(false);`
`130`		`- return kMCCustomPrinterImageNone;`
	`130`	`+ MCUnreachableReturn(kMCCustomPrinterImageNone);`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ static inline MCGBlendMode MCBitmapEffectBlendModeToMCGBlendMode(MCBitmapEffectB`
`75`	`75`	`return kMCGBlendModeColor;`
`76`	`76`	`case kMCBitmapEffectBlendModeLuminosity:`
`77`	`77`	`return kMCGBlendModeLuminosity;`
	`78`	`+ default:`
	`79`	`+ MCUnreachableReturn(kMCGBlendModeSourceOver);`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ int X11Audio::play(int1 * p_sample, uint4 p_samplesize, uint p_rate)`
`107`	`107`
`108`	`108`	`return t_bytes_written ;`
`109`	`109`	`}`
	`110`	`+`
	`111`	`+ return 0;`
`110`	`112`	`}`
`111`	`113`
`112`	`114`
Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,8 @@ MCGAffineTransform view_get_stack_transform(MCStackFullscreenMode p_mode, MCRect`
`313`	`313`	`t_rect = MCU_center_rect(p_screen_rect, p_stack_rect);`
`314`	`314`	`// IM-2013-12-19: [[ Bug 11590 ]] Adjust for screen rect origins other than 0,0`
`315`	`315`	`return MCGAffineTransformMakeTranslation(t_rect.x - p_screen_rect.x, t_rect.y - p_screen_rect.y);`
	`316`	`+ default:`
	`317`	`+ MCUnreachableReturn(MCGAffineTransformMakeIdentity());`
`316`	`318`	`}`
`317`	`319`	`}`
`318`	`320`