Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed useless stack clearing and whitespace

Browse Source
This commit is contained in:
Wolfvak 2019-05-26 15:06:13 -03:00 committed by d0k3
parent ca7944ce04
commit f179caaef3
2 changed files with 84 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/source/common/swkbd.c
View File

@ -235,7 +235,7 @@ bool ShowKeyboard(char* inputstr, const u32 max_size, const char *format, ...) {
if (!BuildKeyboard(swkbd_numpad, keys_numpad, layout_numpad)) return false; if (!BuildKeyboard(swkbd_numpad, keys_numpad, layout_numpad)) return false;
// (instructional) text // (instructional) text
char str[512] = { 0 }; // arbitrary limit, should be more than enough char str[512]; // arbitrary limit, should be more than enough
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, 512, format, va); vsnprintf(str, 512, format, va);

33
arm9/source/common/ui.c
View File

@ -254,7 +254,7 @@ void DrawString(u16 *screen, const char *str, int x, int y, u32 color, u32 bgcol
void DrawStringF(u16 *screen, int x, int y, u32 color, u32 bgcolor, const char *format, ...) void DrawStringF(u16 *screen, int x, int y, u32 color, u32 bgcolor, const char *format, ...)
{ {
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -266,7 +266,7 @@ void DrawStringF(u16 *screen, int x, int y, u32 color, u32 bgcolor, const char *
void DrawStringCenter(u16 *screen, u32 color, u32 bgcolor, const char *format, ...) void DrawStringCenter(u16 *screen, u32 color, u32 bgcolor, const char *format, ...)
{ {
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -379,7 +379,7 @@ void FormatBytes(char* str, u64 bytes) { // str should be 32 byte in size, just
void ShowString(const char *format, ...) void ShowString(const char *format, ...)
{ {
if (format && *format) { // only if there is something in there if (format && *format) { // only if there is something in there
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -399,7 +399,7 @@ void ShowIconString(u16* icon, int w, int h, const char *format, ...)
ClearScreenF(true, false, COLOR_STD_BG); ClearScreenF(true, false, COLOR_STD_BG);
if (!format || !*format) return; // only if there is something in there if (!format || !*format) return; // only if there is something in there
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -421,7 +421,7 @@ bool ShowPrompt(bool ask, const char *format, ...)
{ {
bool ret = true; bool ret = true;
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -462,8 +462,7 @@ bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
u32 str_width, str_height; u32 str_width, str_height;
u32 x, y; u32 x, y;
char str[STRBUF_SIZE];
char str[STRBUF_SIZE] = { 0 };
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -545,7 +544,6 @@ bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
#endif #endif
ClearScreenF(true, false, COLOR_STD_BG); ClearScreenF(true, false, COLOR_STD_BG);
return (lvl >= seqlen); return (lvl >= seqlen);
} }
#endif #endif
@ -555,7 +553,7 @@ u32 ShowSelectPrompt(u32 n, const char** options, const char *format, ...) {
u32 x, y, yopt; u32 x, y, yopt;
u32 sel = 0; u32 sel = 0;
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -603,7 +601,7 @@ u32 ShowFileScrollPrompt(u32 n, const DirEntry** options, bool hide_ext, const c
int sel = 0, scroll = 0; int sel = 0, scroll = 0;
u32 n_show = min(n, 10); u32 n_show = min(n, 10);
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -687,7 +685,7 @@ u32 ShowFileScrollPrompt(u32 n, const DirEntry** options, bool hide_ext, const c
} }
u32 ShowHotkeyPrompt(u32 n, const char** options, const u32* keys, const char *format, ...) { u32 ShowHotkeyPrompt(u32 n, const char** options, const u32* keys, const char *format, ...) {
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
char* ptr = str; char* ptr = str;
va_list va; va_list va;
va_start(va, format); va_start(va, format);
@ -729,7 +727,7 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
u32 str_width, str_height; u32 str_width, str_height;
u32 x, y; u32 x, y;
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
// check / fix up the input string if required // check / fix up the input string if required
@ -879,7 +877,7 @@ bool ShowStringPrompt(char* inputstr, u32 max_size, const char *format, ...) {
u64 ShowHexPrompt(u64 start_val, u32 n_digits, const char *format, ...) { u64 ShowHexPrompt(u64 start_val, u32 n_digits, const char *format, ...) {
const char* alphabet = "0123456789ABCDEF"; const char* alphabet = "0123456789ABCDEF";
char inputstr[16 + 1] = { 0 }; char inputstr[16 + 1];
u64 ret = 0; u64 ret = 0;
va_list va; va_list va;
@ -897,7 +895,7 @@ u64 ShowHexPrompt(u64 start_val, u32 n_digits, const char *format, ...) {
u64 ShowNumberPrompt(u64 start_val, const char *format, ...) { u64 ShowNumberPrompt(u64 start_val, const char *format, ...) {
const char* alphabet = "0123456789"; const char* alphabet = "0123456789";
char inputstr[20 + 1] = { 0 }; char inputstr[20 + 1];
u64 ret = 0; u64 ret = 0;
va_list va; va_list va;
@ -914,7 +912,7 @@ u64 ShowNumberPrompt(u64 start_val, const char *format, ...) {
bool ShowDataPrompt(u8* data, u32* size, const char *format, ...) { bool ShowDataPrompt(u8* data, u32* size, const char *format, ...) {
const char* alphabet = "0123456789ABCDEF"; const char* alphabet = "0123456789ABCDEF";
char inputstr[128 + 1] = { 0 }; // maximum size of data: 64 byte char inputstr[128 + 1]; // maximum size of data: 64 byte
bool ret = false; bool ret = false;
va_list va; va_list va;
@ -926,7 +924,7 @@ bool ShowDataPrompt(u8* data, u32* size, const char *format, ...) {
if (ShowInputPrompt(inputstr, 128 + 1, 2, alphabet, format, va)) { if (ShowInputPrompt(inputstr, 128 + 1, 2, alphabet, format, va)) {
*size = strnlen(inputstr, 128) / 2; *size = strnlen(inputstr, 128) / 2;
for (u32 i = 0; i < *size; i++) { for (u32 i = 0; i < *size; i++) {
char bytestr[2 + 1] = { 0 }; char bytestr[2 + 1];
unsigned int byte; unsigned int byte;
strncpy(bytestr, inputstr + (2*i), 2); strncpy(bytestr, inputstr + (2*i), 2);
sscanf(bytestr, "%02X", &byte); sscanf(bytestr, "%02X", &byte);
@ -945,7 +943,7 @@ bool ShowRtcSetterPrompt(void* time, const char *format, ...) {
u32 str_width, str_height; u32 str_width, str_height;
u32 x, y; u32 x, y;
char str[STRBUF_SIZE] = { 0 }; char str[STRBUF_SIZE];
va_list va; va_list va;
va_start(va, format); va_start(va, format);
vsnprintf(str, STRBUF_SIZE, format, va); vsnprintf(str, STRBUF_SIZE, format, va);
@ -1005,7 +1003,6 @@ bool ShowRtcSetterPrompt(void* time, const char *format, ...) {
} }
ClearScreenF(true, false, COLOR_STD_BG); ClearScreenF(true, false, COLOR_STD_BG);
return ret; return ret;
} }