nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix argument type for isspace

Browse source
This commit is contained in:
hexkyz 2019-07-01 20:29:43 +01:00
parent 382a0192f9
commit 09ab3efddd
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sept/sept-secondary/src/lib/vsprintf.c
View file

@ -71,7 +71,7 @@ static inline char *pack_hex_byte(char *buf, uint8_t byte)
*/ */
static char *skip_spaces(const char *str) static char *skip_spaces(const char *str)
{ {
while (isspace(*str)) while (isspace((unsigned char)*str))
++str; ++str;
return (char *)str; return (char *)str;
} }
@ -1456,7 +1456,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
/* white space in format matchs any amount of /* white space in format matchs any amount of
* white space, including none, in the input. * white space, including none, in the input.
*/ */
if (isspace(*fmt)) { if (isspace((unsigned char)*fmt)) {
fmt = skip_spaces(++fmt); fmt = skip_spaces(++fmt);
str = skip_spaces(str); str = skip_spaces(str);
} }
@ -1476,9 +1476,9 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
* advance both strings to next white space * advance both strings to next white space
*/ */
if (*fmt == '*') { if (*fmt == '*') {
while (!isspace(*fmt) && *fmt != '%' && *fmt) while (!isspace((unsigned char)*fmt) && *fmt != '%' && *fmt)
fmt++; fmt++;
while (!isspace(*str) && *str) while (!isspace((unsigned char)*str) && *str)
str++; str++;
continue; continue;
} }
@ -1531,7 +1531,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
str = skip_spaces(str); str = skip_spaces(str);
/* now copy until next white space */ /* now copy until next white space */
while (*str && !isspace(*str) && field_width--) while (*str && !isspace((unsigned char)*str) && field_width--)
*s++ = *str++; *s++ = *str++;
*s = '\0'; *s = '\0';
num++; num++;

2
stratosphere/ams_mitm/source/set_mitm/setsys_settings_items.cpp
View file

@ -141,7 +141,7 @@ static Result ParseValue(const char *name, const char *key, const char *val_tup)
return ResultSettingsItemValueInvalidFormat; return ResultSettingsItemValueInvalidFormat;
} }
while (isspace(*type) && type != delimiter) { while (isspace((unsigned char)*type) && type != delimiter) {
type++; type++;
} }

8
stratosphere/dmnt/source/dmnt_cheat_manager.cpp
View file

@ -298,7 +298,7 @@ bool DmntCheatManager::ParseCheats(const char *s, size_t len) {
g_needs_reload_vm_program = true; g_needs_reload_vm_program = true;
while (i < len) { while (i < len) {
if (isspace(s[i])) { if (isspace((unsigned char)s[i])) {
/* Just ignore space. */ /* Just ignore space. */
i++; i++;
} else if (s[i] == '[') { } else if (s[i] == '[') {
@ -445,7 +445,7 @@ bool DmntCheatManager::ParseCheatToggles(const char *s, size_t len) {
char toggle[8]; char toggle[8];
while (i < len) { while (i < len) {
if (isspace(s[i])) { if (isspace((unsigned char)s[i])) {
/* Just ignore space. */ /* Just ignore space. */
i++; i++;
} else if (s[i] == '[') { } else if (s[i] == '[') {
@ -468,13 +468,13 @@ bool DmntCheatManager::ParseCheatToggles(const char *s, size_t len) {
i = j + 1; i = j + 1;
/* Skip whitespace. */ /* Skip whitespace. */
while (isspace(s[i])) { while (isspace((unsigned char)s[i])) {
i++; i++;
} }
/* Parse whether to toggle. */ /* Parse whether to toggle. */
j = i + 1; j = i + 1;
while (!isspace(s[j])) { while (!isspace((unsigned char)s[j])) {
j++; j++;
if (j >= len || (j - i) >= sizeof(toggle)) { if (j >= len || (j - i) >= sizeof(toggle)) {
return false; return false;

10
thermosphere/src/lib/vsprintf.c
View file

@ -71,7 +71,7 @@ static inline char *pack_hex_byte(char *buf, uint8_t byte)
*/ */
static char *skip_spaces(const char *str) static char *skip_spaces(const char *str)
{ {
while (isspace(*str)) while (isspace((unsigned char)*str))
++str; ++str;
return (char *)str; return (char *)str;
} }
@ -1456,7 +1456,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
/* white space in format matchs any amount of /* white space in format matchs any amount of
* white space, including none, in the input. * white space, including none, in the input.
*/ */
if (isspace(*fmt)) { if (isspace((unsigned char)*fmt)) {
fmt = skip_spaces(++fmt); fmt = skip_spaces(++fmt);
str = skip_spaces(str); str = skip_spaces(str);
} }
@ -1476,9 +1476,9 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
* advance both strings to next white space * advance both strings to next white space
*/ */
if (*fmt == '*') { if (*fmt == '*') {
while (!isspace(*fmt) && *fmt != '%' && *fmt) while (!isspace((unsigned char)*fmt) && *fmt != '%' && *fmt)
fmt++; fmt++;
while (!isspace(*str) && *str) while (!isspace((unsigned char)*str) && *str)
str++; str++;
continue; continue;
} }
@ -1531,7 +1531,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
str = skip_spaces(str); str = skip_spaces(str);
/* now copy until next white space */ /* now copy until next white space */
while (*str && !isspace(*str) && field_width--) while (*str && !isspace((unsigned char)*str) && field_width--)
*s++ = *str++; *s++ = *str++;
*s = '\0'; *s = '\0';
num++; num++;