Update for SDL3 coding style (#6717)
I updated .clang-format and ran clang-format 14 over the src and test directories to standardize the code base.
In general I let clang-format have it's way, and added markup to prevent formatting of code that would break or be completely unreadable if formatted.
The script I ran for the src directory is added as build-scripts/clang-format-src.sh
This fixes:
#6592
#6593
#6594
(cherry picked from commit 5750bcb174)
This commit is contained in:
Sam Lantinga
parent
5c4bc807f7
commit
b8d85c6939
764 changed files with 50598 additions and 54407 deletions
|
|
@ -65,7 +65,7 @@ static SDL_Windows_Sensor *SDL_sensors;
|
|||
static int ConnectSensor(ISensor *sensor);
|
||||
static int DisconnectSensor(ISensor *sensor);
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_QueryInterface(ISensorManagerEvents * This, REFIID riid, void **ppvObject)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_QueryInterface(ISensorManagerEvents *This, REFIID riid, void **ppvObject)
|
||||
{
|
||||
if (ppvObject == NULL) {
|
||||
return E_INVALIDARG;
|
||||
|
|
@ -79,17 +79,17 @@ static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_QueryInterface(ISensor
|
|||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_AddRef(ISensorManagerEvents * This)
|
||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_AddRef(ISensorManagerEvents *This)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_Release(ISensorManagerEvents * This)
|
||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_Release(ISensorManagerEvents *This)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_OnSensorEnter(ISensorManagerEvents * This, ISensor *pSensor, SensorState state)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_OnSensorEnter(ISensorManagerEvents *This, ISensor *pSensor, SensorState state)
|
||||
{
|
||||
ConnectSensor(pSensor);
|
||||
return S_OK;
|
||||
|
|
@ -105,7 +105,7 @@ static ISensorManagerEvents sensor_manager_events = {
|
|||
&sensor_manager_events_vtbl
|
||||
};
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_QueryInterface(ISensorEvents * This, REFIID riid, void **ppvObject)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_QueryInterface(ISensorEvents *This, REFIID riid, void **ppvObject)
|
||||
{
|
||||
if (ppvObject == NULL) {
|
||||
return E_INVALIDARG;
|
||||
|
|
@ -119,17 +119,17 @@ static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_QueryInterface(ISensorEvents
|
|||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_AddRef(ISensorEvents * This)
|
||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_AddRef(ISensorEvents *This)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_Release(ISensorEvents * This)
|
||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_Release(ISensorEvents *This)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnStateChanged(ISensorEvents * This, ISensor *pSensor, SensorState state)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnStateChanged(ISensorEvents *This, ISensor *pSensor, SensorState state)
|
||||
{
|
||||
#ifdef DEBUG_SENSORS
|
||||
int i;
|
||||
|
|
@ -145,7 +145,7 @@ static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnStateChanged(ISensorEvents
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnDataUpdated(ISensorEvents * This, ISensor *pSensor, ISensorDataReport *pNewData)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnDataUpdated(ISensorEvents *This, ISensor *pSensor, ISensorDataReport *pNewData)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -202,7 +202,7 @@ static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnDataUpdated(ISensorEvents *
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnEvent(ISensorEvents * This, ISensor *pSensor, REFGUID eventID, IPortableDeviceValues *pEventData)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnEvent(ISensorEvents *This, ISensor *pSensor, REFGUID eventID, IPortableDeviceValues *pEventData)
|
||||
{
|
||||
#ifdef DEBUG_SENSORS
|
||||
int i;
|
||||
|
|
@ -218,7 +218,7 @@ static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnEvent(ISensorEvents * This,
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnLeave(ISensorEvents * This, REFSENSOR_ID ID)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnLeave(ISensorEvents *This, REFSENSOR_ID ID)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -343,8 +343,7 @@ static int DisconnectSensor(ISensor *sensor)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_WINDOWS_SensorInit(void)
|
||||
static int SDL_WINDOWS_SensorInit(void)
|
||||
{
|
||||
HRESULT hr;
|
||||
ISensorCollection *sensor_collection = NULL;
|
||||
|
|
@ -353,7 +352,7 @@ SDL_WINDOWS_SensorInit(void)
|
|||
SDL_windowscoinit = SDL_TRUE;
|
||||
}
|
||||
|
||||
hr = CoCreateInstance(&SDL_CLSID_SensorManager, NULL, CLSCTX_INPROC_SERVER, &SDL_IID_SensorManager, (LPVOID *) &SDL_sensor_manager);
|
||||
hr = CoCreateInstance(&SDL_CLSID_SensorManager, NULL, CLSCTX_INPROC_SERVER, &SDL_IID_SensorManager, (LPVOID *)&SDL_sensor_manager);
|
||||
if (FAILED(hr)) {
|
||||
/* If we can't create a sensor manager (i.e. on Wine), we won't have any sensors, but don't fail the init */
|
||||
return 0; /* WIN_SetErrorFromHRESULT("Couldn't create the sensor manager", hr); */
|
||||
|
|
@ -392,55 +391,46 @@ SDL_WINDOWS_SensorInit(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_WINDOWS_SensorGetCount(void)
|
||||
static int SDL_WINDOWS_SensorGetCount(void)
|
||||
{
|
||||
return SDL_num_sensors;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_WINDOWS_SensorDetect(void)
|
||||
static void SDL_WINDOWS_SensorDetect(void)
|
||||
{
|
||||
}
|
||||
|
||||
static const char *
|
||||
SDL_WINDOWS_SensorGetDeviceName(int device_index)
|
||||
static const char *SDL_WINDOWS_SensorGetDeviceName(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].name;
|
||||
}
|
||||
|
||||
static SDL_SensorType
|
||||
SDL_WINDOWS_SensorGetDeviceType(int device_index)
|
||||
static SDL_SensorType SDL_WINDOWS_SensorGetDeviceType(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].type;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_WINDOWS_SensorGetDeviceNonPortableType(int device_index)
|
||||
static int SDL_WINDOWS_SensorGetDeviceNonPortableType(int device_index)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
static SDL_SensorID
|
||||
SDL_WINDOWS_SensorGetDeviceInstanceID(int device_index)
|
||||
static SDL_SensorID SDL_WINDOWS_SensorGetDeviceInstanceID(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].id;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_WINDOWS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static int SDL_WINDOWS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
SDL_sensors[device_index].sensor_opened = sensor;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_WINDOWS_SensorUpdate(SDL_Sensor *sensor)
|
||||
static void SDL_WINDOWS_SensorUpdate(SDL_Sensor *sensor)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_WINDOWS_SensorClose(SDL_Sensor *sensor)
|
||||
static void SDL_WINDOWS_SensorClose(SDL_Sensor *sensor)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -452,8 +442,7 @@ SDL_WINDOWS_SensorClose(SDL_Sensor *sensor)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_WINDOWS_SensorQuit(void)
|
||||
static void SDL_WINDOWS_SensorQuit(void)
|
||||
{
|
||||
while (SDL_num_sensors > 0) {
|
||||
DisconnectSensor(SDL_sensors[0].sensor);
|
||||
|
|
@ -470,8 +459,7 @@ SDL_WINDOWS_SensorQuit(void)
|
|||
}
|
||||
}
|
||||
|
||||
SDL_SensorDriver SDL_WINDOWS_SensorDriver =
|
||||
{
|
||||
SDL_SensorDriver SDL_WINDOWS_SensorDriver = {
|
||||
SDL_WINDOWS_SensorInit,
|
||||
SDL_WINDOWS_SensorGetCount,
|
||||
SDL_WINDOWS_SensorDetect,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue