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
This commit is contained in:
Sylvain Becker
2022-11-27 17:38:43 +01:00
committed by GitHub
parent 4958dafdc3
commit 6a2200823c
387 changed files with 6094 additions and 4633 deletions

View File

@@ -172,8 +172,7 @@ GL_ClearErrors(SDL_Renderer *renderer)
{
GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
if (!data->debug_enabled)
{
if (!data->debug_enabled) {
return;
}
if (data->GL_ARB_debug_output_supported) {
@@ -200,8 +199,7 @@ GL_CheckAllErrors (const char *prefix, SDL_Renderer *renderer, const char *file,
GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
int ret = 0;
if (!data->debug_enabled)
{
if (!data->debug_enabled) {
return 0;
}
if (data->GL_ARB_debug_output_supported) {
@@ -312,7 +310,7 @@ GL_GetFBO(GL_RenderData *data, Uint32 w, Uint32 h)
result = result->next;
}
if (!result) {
if (result == NULL) {
result = SDL_malloc(sizeof(GL_FBOList));
if (result) {
result->w = w;
@@ -477,7 +475,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
}
data = (GL_TextureData *) SDL_calloc(1, sizeof(*data));
if (!data) {
if (data == NULL) {
return SDL_OutOfMemory();
}
@@ -579,8 +577,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
renderdata->glTexImage2D(textype, 0, internalFormat, texture_w,
texture_h, 0, format, type, data->pixels);
renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE);
}
else
} else
#endif
{
renderdata->glTexImage2D(textype, 0, internalFormat, texture_w,
@@ -937,7 +934,7 @@ GL_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FP
GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, count * 2 * sizeof (GLfloat), 0, &cmd->data.draw.first);
int i;
if (!verts) {
if (verts == NULL) {
return -1;
}
@@ -958,7 +955,7 @@ GL_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FPo
const size_t vertlen = (sizeof (GLfloat) * 2) * count;
GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, vertlen, 0, &cmd->data.draw.first);
if (!verts) {
if (verts == NULL) {
return -1;
}
cmd->data.draw.count = count;
@@ -1004,7 +1001,7 @@ GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
size_t sz = 2 * sizeof(GLfloat) + 4 * sizeof(Uint8) + (texture ? 2 : 0) * sizeof(GLfloat);
verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, count * sz, 0, &cmd->data.draw.first);
if (!verts) {
if (verts == NULL) {
return -1;
}
@@ -1458,7 +1455,7 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format);
temp_pixels = SDL_malloc(rect->h * temp_pitch);
if (!temp_pixels) {
if (temp_pixels == NULL) {
return SDL_OutOfMemory();
}
@@ -1525,7 +1522,7 @@ GL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
renderdata->drawstate.target = NULL;
}
if (!data) {
if (data == NULL) {
return;
}
if (data->texture) {
@@ -1759,13 +1756,13 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
#endif
renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
if (!renderer) {
if (renderer == NULL) {
SDL_OutOfMemory();
goto error;
}
data = (GL_RenderData *) SDL_calloc(1, sizeof(*data));
if (!data) {
if (data == NULL) {
SDL_free(renderer);
SDL_OutOfMemory();
goto error;
@@ -1860,7 +1857,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
}
hint = SDL_getenv("GL_ARB_texture_non_power_of_two");
if (!hint || *hint != '0') {
if (hint == NULL || *hint != '0') {
SDL_bool isGL2 = SDL_FALSE;
const char *verstr = (const char *)data->glGetString(GL_VERSION);
if (verstr) {