DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix struct to remove need for c_shift().

Browse Source
This commit is contained in:
Kartik 2017-04-04 19:00:02 +05:30 committed by GitHub
parent 700360e0d3
commit 757c83d395
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libctru/source/applets/error.c
View File

@ -1,8 +1,6 @@
#include <3ds.h> #include <3ds.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <3ds/types.h> #include <3ds/types.h>
#include <3ds/svc.h>
#include <3ds/synchronization.h> #include <3ds/synchronization.h>
#include <3ds/services/apt.h> #include <3ds/services/apt.h>
#include <3ds/services/cfgu.h> #include <3ds/services/cfgu.h>
@ -12,14 +10,19 @@
void errorInit(errorConf* err, errorType type, CFG_Language lang) void errorInit(errorConf* err, errorType type, CFG_Language lang)
{ {
memset(err, 0, sizeof(*err)); memset(err, 0, sizeof(*err));
err->errorType=type; err->errorType = type;
err->useLanguage=lang; err->useLanguage = lang;
err->upperScreenFlag= ERROR_NORMAL; err->upperScreenFlag = ERROR_NORMAL;
err->eulaVersion = 0; err->eulaVersion = 0;
err->homeButton = true; err->homeButton = true;
err->softwareReset = false; err->softwareReset = false;
err->appJump = false; err->appJump = false;
err-> returnCode = ERROR_UNKNOWN; err->returnCode = ERROR_UNKNOWN;
}
void errorCode(errorConf* err, int error)
{
err->errorCode = error;
} }
static void errorConvertToUTF16(u16* out, const char* in, size_t max) static void errorConvertToUTF16(u16* out, const char* in, size_t max)
@ -37,30 +40,12 @@ static void errorConvertToUTF16(u16* out, const char* in, size_t max)
return; return;
} }
out[units] = 0; out[units] = 0;
}
static char* c_shift(const char *text)
{
size_t len = strlen(text);
char *str = (char*)malloc(len + 2);
if (str)
{
str[0] = text[0];
strcpy(&str[1], text);
}
return str;
}
void errorCode(errorConf* err, int error)
{
err->errorCode = error;
} }
void errorText(errorConf *err, const char* text) void errorText(errorConf *err, const char* text)
{ char *tex = c_shift(text); {
errorConvertToUTF16(err->Text, tex, 1900); errorConvertToUTF16(err->Text, text, 1900);
free(tex);
} }
void errorDisp(errorConf* err) void errorDisp(errorConf* err)