mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-09-13 23:08:13 +00:00
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:
@@ -34,8 +34,7 @@
|
||||
#include "SDL_filesystem.h"
|
||||
|
||||
/* Wrapper around __unixify_std that uses SDL's memory allocators */
|
||||
static char *
|
||||
SDL_unixify_std(const char *ro_path, char *buffer, size_t buf_len, int filetype)
|
||||
static char *SDL_unixify_std(const char *ro_path, char *buffer, size_t buf_len, int filetype)
|
||||
{
|
||||
const char *const in_buf = buffer; /* = NULL if we allocate the buffer. */
|
||||
|
||||
@@ -73,8 +72,7 @@ SDL_unixify_std(const char *ro_path, char *buffer, size_t buf_len, int filetype)
|
||||
return buffer;
|
||||
}
|
||||
|
||||
static char *
|
||||
canonicalisePath(const char *path, const char *pathVar)
|
||||
static char *canonicalisePath(const char *path, const char *pathVar)
|
||||
{
|
||||
_kernel_oserror *error;
|
||||
_kernel_swi_regs regs;
|
||||
@@ -109,8 +107,7 @@ canonicalisePath(const char *path, const char *pathVar)
|
||||
return buf;
|
||||
}
|
||||
|
||||
static _kernel_oserror *
|
||||
createDirectoryRecursive(char *path)
|
||||
static _kernel_oserror *createDirectoryRecursive(char *path)
|
||||
{
|
||||
char *ptr = NULL;
|
||||
_kernel_oserror *error;
|
||||
@@ -119,7 +116,7 @@ createDirectoryRecursive(char *path)
|
||||
regs.r[1] = (int)path;
|
||||
regs.r[2] = 0;
|
||||
|
||||
for (ptr = path+1; *ptr; ptr++) {
|
||||
for (ptr = path + 1; *ptr; ptr++) {
|
||||
if (*ptr == '.') {
|
||||
*ptr = '\0';
|
||||
error = _kernel_swi(OS_File, ®s, ®s);
|
||||
@@ -181,7 +178,7 @@ SDL_GetPrefPath(const char *org, const char *app)
|
||||
}
|
||||
|
||||
len = SDL_strlen(canon) + SDL_strlen(org) + SDL_strlen(app) + 4;
|
||||
dir = (char *) SDL_malloc(len);
|
||||
dir = (char *)SDL_malloc(len);
|
||||
if (dir == NULL) {
|
||||
SDL_OutOfMemory();
|
||||
SDL_free(canon);
|
||||
|
Reference in New Issue
Block a user