mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-14 05:46:00 +00:00
Cleanup add brace (#6545)
* Add braces after if conditions
* More add braces after if conditions
* Add braces after while() conditions
* Fix compilation because of macro being modified
* Add braces to for loop
* Add braces after if/goto
* Move comments up
* Remove extra () in the 'return ...;' statements
* More remove extra () in the 'return ...;' statements
* More remove extra () in the 'return ...;' statements after merge
* Fix inconsistent patterns are xxx == NULL vs !xxx
* More "{}" for "if() break;" and "if() continue;"
* More "{}" after if() short statement
* More "{}" after "if () return;" statement
* More fix inconsistent patterns are xxx == NULL vs !xxx
* Revert some modificaion on SDL_RLEaccel.c
* SDL_RLEaccel: no short statement
* Cleanup 'if' where the bracket is in a new line
* Cleanup 'while' where the bracket is in a new line
* Cleanup 'for' where the bracket is in a new line
* Cleanup 'else' where the bracket is in a new line
(cherry picked from commit 6a2200823c
to reduce conflicts merging between SDL2 and SDL3)
This commit is contained in:

committed by
Sam Lantinga

parent
0739d237ad
commit
fb0ce375f0
@@ -79,7 +79,7 @@ SDL_SensorInit(void)
|
||||
int i, status;
|
||||
|
||||
/* Create the sensor list lock */
|
||||
if (!SDL_sensor_lock) {
|
||||
if (SDL_sensor_lock == NULL) {
|
||||
SDL_sensor_lock = SDL_CreateMutex();
|
||||
}
|
||||
|
||||
|
@@ -56,14 +56,14 @@ SDL_ANDROID_SensorInit(void)
|
||||
ASensorList sensors;
|
||||
|
||||
SDL_sensor_manager = ASensorManager_getInstance();
|
||||
if (!SDL_sensor_manager) {
|
||||
if (SDL_sensor_manager == NULL) {
|
||||
return SDL_SetError("Couldn't create sensor manager");
|
||||
}
|
||||
|
||||
SDL_sensor_looper = ALooper_forThread();
|
||||
if (!SDL_sensor_looper) {
|
||||
if (SDL_sensor_looper == NULL) {
|
||||
SDL_sensor_looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
|
||||
if (!SDL_sensor_looper) {
|
||||
if (SDL_sensor_looper == NULL) {
|
||||
return SDL_SetError("Couldn't create sensor event loop");
|
||||
}
|
||||
}
|
||||
@@ -72,7 +72,7 @@ SDL_ANDROID_SensorInit(void)
|
||||
sensors_count = ASensorManager_getSensorList(SDL_sensor_manager, &sensors);
|
||||
if (sensors_count > 0) {
|
||||
SDL_sensors = (SDL_AndroidSensor *)SDL_calloc(sensors_count, sizeof(*SDL_sensors));
|
||||
if (!SDL_sensors) {
|
||||
if (SDL_sensors == NULL) {
|
||||
return SDL_OutOfMemory();
|
||||
}
|
||||
|
||||
|
@@ -55,7 +55,7 @@ SDL_VITA_SensorInit(void)
|
||||
SDL_sensors_count = 2;
|
||||
|
||||
SDL_sensors = (SDL_VitaSensor *)SDL_calloc(SDL_sensors_count, sizeof(*SDL_sensors));
|
||||
if (!SDL_sensors) {
|
||||
if (SDL_sensors == NULL) {
|
||||
return SDL_OutOfMemory();
|
||||
}
|
||||
|
||||
@@ -145,15 +145,12 @@ SDL_VITA_SensorUpdate(SDL_Sensor *sensor)
|
||||
SDL_memset(motionState, 0, sizeof(motionState));
|
||||
|
||||
err = sceMotionGetSensorState(motionState, SCE_MOTION_MAX_NUM_STATES);
|
||||
if (err != 0)
|
||||
{
|
||||
if (err != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i = 0; i < SCE_MOTION_MAX_NUM_STATES; i++)
|
||||
{
|
||||
if (sensor->hwdata->counter < motionState[i].counter)
|
||||
{
|
||||
for (int i = 0; i < SCE_MOTION_MAX_NUM_STATES; i++) {
|
||||
if (sensor->hwdata->counter < motionState[i].counter) {
|
||||
unsigned int timestamp = motionState[i].timestamp;
|
||||
|
||||
sensor->hwdata->counter = motionState[i].counter;
|
||||
|
@@ -67,7 +67,7 @@ static int DisconnectSensor(ISensor *sensor);
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_QueryInterface(ISensorManagerEvents * This, REFIID riid, void **ppvObject)
|
||||
{
|
||||
if (!ppvObject) {
|
||||
if (ppvObject == NULL) {
|
||||
return E_INVALIDARG;
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ static ISensorManagerEvents sensor_manager_events = {
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_QueryInterface(ISensorEvents * This, REFIID riid, void **ppvObject)
|
||||
{
|
||||
if (!ppvObject) {
|
||||
if (ppvObject == NULL) {
|
||||
return E_INVALIDARG;
|
||||
}
|
||||
|
||||
@@ -286,7 +286,7 @@ static int ConnectSensor(ISensor *sensor)
|
||||
if (bstr_name != NULL) {
|
||||
SysFreeString(bstr_name);
|
||||
}
|
||||
if (!name) {
|
||||
if (name == NULL) {
|
||||
return SDL_OutOfMemory();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user