shithub: choc

Download patch

ref: 51ab62f6fb06b42c80c98ea71ab29d208d10e422
parent: e1f905cd3c481d561f2faf8c80e800cffe4d2035
author: Fabian Greffrath <fabian@greffrath.com>
date: Tue Feb 17 07:00:04 EST 2015

setup: fix "control reaches end of non-void function" compiler warning

Actually, it is impossible to reach the end of these two functions
without return()ing earlier from one of the switch() statements'
branches. But since the compiler cannot know this and warns about it,
and since this warning can be escalated into an error in later
compiler versions, silence it by return()ing a dummy value at the end
of each function.

Fixes #508

--- a/src/setup/txt_joyaxis.c

+++ b/src/setup/txt_joyaxis.c

@@ -63,6 +63,8 @@

                        "right, and press the button.";

             }

     }

+

+    return NULL;

 }

 static void SetCalibrationLabel(txt_joystick_axis_t *joystick_axis)

@@ -265,6 +267,8 @@

         case CONFIG_STAGE2:

             return CONFIG_CENTER;

     }

+

+    return -1;

 }

 static int EventCallback(SDL_Event *event, TXT_UNCAST_ARG(joystick_axis))