mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

got rid of booleans, initialized pointers with default values

Browse Source
This commit is contained in:
NightlyFox 2018-09-23 13:34:35 -05:00
parent d79d501bcb
commit 350fbda633
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/menu-entry.c
View File

@ -298,34 +298,23 @@ bool menuEntryLoad(menuEntry_s* me, const char* name, bool shortcut) {
config_t cfg = {0}; config_t cfg = {0};
config_init(&cfg); config_init(&cfg);
config_setting_t *themeInfo; config_setting_t *themeInfo;
const char *name, *author, *version; const char *name,
bool noAuth = false, noVers = false; *author = textGetString(StrId_DefaultPublisher),
*version = "1.0.0";
if(config_read_file(&cfg, me->path)) { if(config_read_file(&cfg, me->path)) {
themeInfo = config_lookup(&cfg, "themeInfo"); themeInfo = config_lookup(&cfg, "themeInfo");
if (themeInfo != NULL) { if (themeInfo != NULL) {
if(config_setting_lookup_string(themeInfo, "name", &name)) if(config_setting_lookup_string(themeInfo, "name", &name))
strncpy(me->name, name, sizeof(me->name)-1); strncpy(me->name, name, sizeof(me->name)-1);
if(!config_setting_lookup_string(themeInfo, "author", &author)) if(!config_setting_lookup_string(themeInfo, "author", &author))
noAuth = true; author = textGetString(StrId_DefaultPublisher);
if(!config_setting_lookup_string(themeInfo, "version", &version))\ if(!config_setting_lookup_string(themeInfo, "version", &version))\
noVers = true; version = "1.0.0";
}
else {
noAuth = true;
noVers = true;
} }
} }
else {
noAuth = true;
noVers = true;
}
if(noAuth)
strncpy(me->author, textGetString(StrId_DefaultPublisher), sizeof(me->author)-1);
else
strncpy(me->author, author, sizeof(me->author)-1); strncpy(me->author, author, sizeof(me->author)-1);
if(noVers)
strncpy(me->version, "1.0.0", sizeof(me->version)-1);
else
strncpy(me->version, version, sizeof(me->version)-1); strncpy(me->version, version, sizeof(me->version)-1);
config_destroy(&cfg); config_destroy(&cfg);
} }