From a6e3a65a2ede5176b0c1fb7c080ebb1af7a79fc5 Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Sun, 2 Jul 2023 14:38:59 +0200
Subject: [PATCH] Use SDL functions instead of stdlib
---
playmus.c | 30 +++++++++++++++---------------
playwave.c | 20 ++++++++++----------
src/codecs/music_cmd.c | 4 ++--
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/playmus.c b/playmus.c
index a68ee930..54751609 100644
--- a/playmus.c
+++ b/playmus.c
@@ -92,7 +92,7 @@ static void Menu(void)
Mix_HaltMusic();
break;
case 'v': case 'V':
- Mix_VolumeMusic(atoi(buf+1));
+ Mix_VolumeMusic(SDL_atoi(buf+1));
break;
}
}
@@ -139,38 +139,38 @@ int main(int argc, char *argv[])
/* Check command line usage */
for (i=1; argv[i] && (*argv[i] == '-'); ++i) {
- if ((strcmp(argv[i], "-r") == 0) && argv[i+1]) {
+ if ((SDL_strcmp(argv[i], "-r") == 0) && argv[i+1]) {
++i;
- audio_rate = atoi(argv[i]);
+ audio_rate = SDL_atoi(argv[i]);
} else
- if (strcmp(argv[i], "-m") == 0) {
+ if (SDL_strcmp(argv[i], "-m") == 0) {
audio_channels = 1;
} else
- if ((strcmp(argv[i], "-c") == 0) && argv[i+1]) {
+ if ((SDL_strcmp(argv[i], "-c") == 0) && argv[i+1]) {
++i;
- audio_channels = atoi(argv[i]);
+ audio_channels = SDL_atoi(argv[i]);
} else
- if ((strcmp(argv[i], "-b") == 0) && argv[i+1]) {
+ if ((SDL_strcmp(argv[i], "-b") == 0) && argv[i+1]) {
++i;
- audio_buffers = atoi(argv[i]);
+ audio_buffers = SDL_atoi(argv[i]);
} else
- if ((strcmp(argv[i], "-v") == 0) && argv[i+1]) {
+ if ((SDL_strcmp(argv[i], "-v") == 0) && argv[i+1]) {
++i;
- audio_volume = atoi(argv[i]);
+ audio_volume = SDL_atoi(argv[i]);
} else
- if (strcmp(argv[i], "-l") == 0) {
+ if (SDL_strcmp(argv[i], "-l") == 0) {
looping = -1;
} else
- if (strcmp(argv[i], "-i") == 0) {
+ if (SDL_strcmp(argv[i], "-i") == 0) {
interactive = 1;
} else
- if (strcmp(argv[i], "-8") == 0) {
+ if (SDL_strcmp(argv[i], "-8") == 0) {
audio_format = SDL_AUDIO_U8;
} else
- if (strcmp(argv[i], "-f32") == 0) {
+ if (SDL_strcmp(argv[i], "-f32") == 0) {
audio_format = SDL_AUDIO_F32;
} else
- if (strcmp(argv[i], "-rwops") == 0) {
+ if (SDL_strcmp(argv[i], "-rwops") == 0) {
rwops = 1;
} else {
Usage(argv[0]);
diff --git a/playwave.c b/playwave.c
index 117a5509..82011057 100644
--- a/playwave.c
+++ b/playwave.c
@@ -380,30 +380,30 @@ int main(int argc, char *argv[])
/* Check command line usage */
for (i=1; argv[i] && (*argv[i] == '-'); ++i) {
- if ((strcmp(argv[i], "-r") == 0) && argv[i+1]) {
+ if ((SDL_strcmp(argv[i], "-r") == 0) && argv[i+1]) {
++i;
- audio_rate = atoi(argv[i]);
+ audio_rate = SDL_atoi(argv[i]);
} else
- if (strcmp(argv[i], "-m") == 0) {
+ if (SDL_strcmp(argv[i], "-m") == 0) {
audio_channels = 1;
} else
- if ((strcmp(argv[i], "-c") == 0) && argv[i+1]) {
+ if ((SDL_strcmp(argv[i], "-c") == 0) && argv[i+1]) {
++i;
- audio_channels = atoi(argv[i]);
+ audio_channels = SDL_atoi(argv[i]);
} else
- if (strcmp(argv[i], "-l") == 0) {
+ if (SDL_strcmp(argv[i], "-l") == 0) {
loops = -1;
} else
- if (strcmp(argv[i], "-8") == 0) {
+ if (SDL_strcmp(argv[i], "-8") == 0) {
audio_format = SDL_AUDIO_U8;
} else
- if (strcmp(argv[i], "-f32") == 0) {
+ if (SDL_strcmp(argv[i], "-f32") == 0) {
audio_format = SDL_AUDIO_F32;
} else
- if (strcmp(argv[i], "-f") == 0) { /* rcg06122001 flip stereo */
+ if (SDL_strcmp(argv[i], "-f") == 0) { /* rcg06122001 flip stereo */
reverse_stereo = 1;
} else
- if (strcmp(argv[i], "-F") == 0) { /* rcg06172001 flip sample */
+ if (SDL_strcmp(argv[i], "-F") == 0) { /* rcg06172001 flip sample */
reverse_sample = 1;
} else {
Usage(argv[0]);
diff --git a/src/codecs/music_cmd.c b/src/codecs/music_cmd.c
index 8ea0bba9..a577aae4 100644
--- a/src/codecs/music_cmd.c
+++ b/src/codecs/music_cmd.c
@@ -85,7 +85,7 @@ static int ParseCommandLine(char *cmdline, char **argv)
argc = 0;
for (bufp = cmdline; *bufp;) {
/* Skip leading whitespace */
- while (isspace(*bufp)) {
+ while (SDL_isspace(*bufp)) {
++bufp;
}
/* Skip over argument */
@@ -109,7 +109,7 @@ static int ParseCommandLine(char *cmdline, char **argv)
++argc;
}
/* Skip over word */
- while (*bufp && ! isspace(*bufp)) {
+ while (*bufp && ! SDL_isspace(*bufp)) {
++bufp;
}
}