[[ Cleanup ]] Non-void functions should return a value or fail.

peter-b · peter-b · commit c028d2b964c3 · 2014-11-20T16:40:31.000Z
There are several cases where non-void functions dispatch on a switch
statement which does not cover all possible values.  Add a default
clause which aborts in order to ensure that the switch statement does
not fall through.
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -128,6 +128,8 @@ static MCCustomPrinterImageType MCCustomPrinterImageTypeFromMCGRasterFormat(MCGR
 		// Unsupported
 		MCAssert(false);
 		return kMCCustomPrinterImageNone;
+	default:
+		MCUnreachable();
 	}
 }
 
diff --git a/engine/src/graphicscontext.cpp b/engine/src/graphicscontext.cpp
@@ -59,6 +59,8 @@ static inline MCGBlendMode MCBitmapEffectBlendModeToMCGBlendMode(MCBitmapEffectB
 			return kMCGBlendModeColor;
 		case kMCBitmapEffectBlendModeLuminosity:
 			return kMCGBlendModeLuminosity;
+		default:
+			MCUnreachable();
 	}
 }
 
diff --git a/engine/src/stackview.cpp b/engine/src/stackview.cpp
@@ -313,6 +313,9 @@ 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:
+		MCUnreachable();
 	}
 }
 
diff --git a/libgraphics/include/graphics.h b/libgraphics/include/graphics.h
@@ -82,6 +82,9 @@ 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:
+			MCUnreachable();
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,8 @@ static MCCustomPrinterImageType MCCustomPrinterImageTypeFromMCGRasterFormat(MCGR`
`128`	`128`	`// Unsupported`
`129`	`129`	`MCAssert(false);`
`130`	`130`	`return kMCCustomPrinterImageNone;`
	`131`	`+ default:`
	`132`	`+ MCUnreachable();`
`131`	`133`	`}`
`132`	`134`	`}`
`133`	`135`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ static inline MCGBlendMode MCBitmapEffectBlendModeToMCGBlendMode(MCBitmapEffectB`
`59`	`59`	`return kMCGBlendModeColor;`
`60`	`60`	`case kMCBitmapEffectBlendModeLuminosity:`
`61`	`61`	`return kMCGBlendModeLuminosity;`
	`62`	`+ default:`
	`63`	`+ MCUnreachable();`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`
Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,9 @@ 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`	`+`
	`317`	`+ default:`
	`318`	`+ MCUnreachable();`
`316`	`319`	`}`
`317`	`320`	`}`
`318`	`321`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ static inline uint32_t MCGPixelPack(MCGPixelFormat p_format, uint8_t p_red, uint`
`82`	`82`
`83`	`83`	`case kMCGPixelFormatARGB:`
`84`	`84`	`return __MCGPixelPackComponents(p_alpha, p_red, p_green, p_blue);`
	`85`	`+`
	`86`	`+ default:`
	`87`	`+ MCUnreachable();`
`85`	`88`	`}`
`86`	`89`	`}`
`87`	`90`