Fixed whitespace Whitespace inconsistencies reported in https://github.com/libsdl-org/SDL/pull/5673
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
diff --git a/build-scripts/androidbuildlibs.sh b/build-scripts/androidbuildlibs.sh
index 3e57b47..dc72172 100755
--- a/build-scripts/androidbuildlibs.sh
+++ b/build-scripts/androidbuildlibs.sh
@@ -33,22 +33,21 @@ lib=
ndk_args=
# Allow an external caller to specify locations.
-for arg in $*
-do
- if [ "${arg:0:8}" == "NDK_OUT=" ]; then
- obj=${arg#NDK_OUT=}
- elif [ "${arg:0:13}" == "NDK_LIBS_OUT=" ]; then
- lib=${arg#NDK_LIBS_OUT=}
- else
- ndk_args="$ndk_args $arg"
- fi
+for arg in $*; do
+ if [ "${arg:0:8}" == "NDK_OUT=" ]; then
+ obj=${arg#NDK_OUT=}
+ elif [ "${arg:0:13}" == "NDK_LIBS_OUT=" ]; then
+ lib=${arg#NDK_LIBS_OUT=}
+ else
+ ndk_args="$ndk_args $arg"
+ fi
done
if [ -z $obj ]; then
- obj=$buildandroid/obj
+ obj=$buildandroid/obj
fi
if [ -z $lib ]; then
- lib=$buildandroid/lib
+ lib=$buildandroid/lib
fi
for dir in $build $buildandroid $obj $lib; do
@@ -64,11 +63,11 @@ done
# ndk-build makefile segments that use them, e.g., default-application.mk.
# For consistency, pass all values on the command line.
ndk-build \
- NDK_PROJECT_PATH=null \
- NDK_OUT=$obj \
- NDK_LIBS_OUT=$lib \
- APP_BUILD_SCRIPT=Android.mk \
- APP_ABI="armeabi-v7a arm64-v8a x86 x86_64" \
- APP_PLATFORM=android-16 \
- APP_MODULES="SDL2 SDL2_main" \
- $ndk_args
+ NDK_PROJECT_PATH=null \
+ NDK_OUT=$obj \
+ NDK_LIBS_OUT=$lib \
+ APP_BUILD_SCRIPT=Android.mk \
+ APP_ABI="armeabi-v7a arm64-v8a x86 x86_64" \
+ APP_PLATFORM=android-16 \
+ APP_MODULES="SDL2 SDL2_main" \
+ $ndk_args
diff --git a/build-scripts/update-copyright.sh b/build-scripts/update-copyright.sh
index ea1f798..c69ec72 100755
--- a/build-scripts/update-copyright.sh
+++ b/build-scripts/update-copyright.sh
@@ -1,8 +1,7 @@
#!/bin/sh
-find . -type f -exec grep -Il "Copyright" {} \; \
-| grep -v \.git \
-| while read file; \
-do \
- LC_ALL=C sed -b -i "s/\(.*Copyright.*\)[0-9]\{4\}\( *Sam Lantinga\)/\1`date +%Y`\2/" "$file"; \
+find . -type f -exec grep -Il "Copyright" {} \; \
+| grep -v \.git \
+| while read file; do \
+ LC_ALL=C sed -b -i "s/\(.*Copyright.*\)[0-9]\{4\}\( *Sam Lantinga\)/\1`date +%Y`\2/" "$file"; \
done
diff --git a/src/filesystem/psp/SDL_sysfilesystem.c b/src/filesystem/psp/SDL_sysfilesystem.c
index e9c6ee4..4abb90a 100644
--- a/src/filesystem/psp/SDL_sysfilesystem.c
+++ b/src/filesystem/psp/SDL_sysfilesystem.c
@@ -34,44 +34,44 @@
char *
SDL_GetBasePath(void)
{
- char *retval = NULL;
- size_t len;
- char cwd[FILENAME_MAX];
-
- getcwd(cwd, sizeof(cwd));
- len = SDL_strlen(cwd) + 2;
- retval = (char *) SDL_malloc(len);
- SDL_snprintf(retval, len, "%s/", cwd);
-
- return retval;
+ char *retval = NULL;
+ size_t len;
+ char cwd[FILENAME_MAX];
+
+ getcwd(cwd, sizeof(cwd));
+ len = SDL_strlen(cwd) + 2;
+ retval = (char *) SDL_malloc(len);
+ SDL_snprintf(retval, len, "%s/", cwd);
+
+ return retval;
}
char *
SDL_GetPrefPath(const char *org, const char *app)
{
- char *retval = NULL;
- size_t len;
- char *base = SDL_GetBasePath();
- if (!app) {
- SDL_InvalidParamError("app");
- return NULL;
- }
- if(!org) {
- org = "";
- }
-
- len = SDL_strlen(base) + SDL_strlen(org) + SDL_strlen(app) + 4;
- retval = (char *) SDL_malloc(len);
-
- if (*org) {
- SDL_snprintf(retval, len, "%s%s/%s/", base, org, app);
- } else {
- SDL_snprintf(retval, len, "%s%s/", base, app);
- }
- free(base);
-
- mkdir(retval, 0755);
- return retval;
+ char *retval = NULL;
+ size_t len;
+ char *base = SDL_GetBasePath();
+ if (!app) {
+ SDL_InvalidParamError("app");
+ return NULL;
+ }
+ if(!org) {
+ org = "";
+ }
+
+ len = SDL_strlen(base) + SDL_strlen(org) + SDL_strlen(app) + 4;
+ retval = (char *) SDL_malloc(len);
+
+ if (*org) {
+ SDL_snprintf(retval, len, "%s%s/%s/", base, org, app);
+ } else {
+ SDL_snprintf(retval, len, "%s%s/", base, app);
+ }
+ free(base);
+
+ mkdir(retval, 0755);
+ return retval;
}
#endif /* SDL_FILESYSTEM_PSP */