gex/gex-core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug in ini parsing

Browse Source
This commit is contained in:
MightyPork
2017-12-28 21:29:42 +01:00
parent a54726bd5c
commit 9873d18298
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/settings.c
+6 -3
View File
@@ -270,7 +270,7 @@ void settings_load_ini_begin(void)
void settings_load_ini_key(const char *restrict section, const char *restrict key, const char *restrict value) void settings_load_ini_key(const char *restrict section, const char *restrict key, const char *restrict value)
{ {
// dbg("[%s] %s = %s", section, key, value); //dbg("[%s] %s = %s", section, key, value);
static char namebuf[INI_KEY_MAX]; static char namebuf[INI_KEY_MAX];
// SYSTEM and UNITS files must be separate. // SYSTEM and UNITS files must be separate.
@@ -303,10 +303,13 @@ void settings_load_ini_key(const char *restrict section, const char *restrict ke
const char *nameptr = strchr(section, ':'); const char *nameptr = strchr(section, ':');
const char *csptr = strchr(section, '@'); const char *csptr = strchr(section, '@');
if (nameptr && csptr) { if (nameptr != NULL && csptr != NULL) {
strncpy(namebuf, nameptr+1, csptr - nameptr - 1); strncpy(namebuf, nameptr+1, csptr - nameptr - 1);
namebuf[csptr - nameptr - 1] = 0;
uint8_t cs = (uint8_t) avr_atoi(csptr + 1); uint8_t cs = (uint8_t) avr_atoi(csptr + 1);
ureg_load_unit_ini_key(namebuf, key, value, cs);
bool res = ureg_load_unit_ini_key(namebuf, key, value, cs);
if (!res) dbg("!! error loading %s@%d.%s = %s", namebuf, (int)cs, key, value);
} else { } else {
dbg("! Bad config key: [%s] %s = %s", section, key, value); dbg("! Bad config key: [%s] %s = %s", section, key, value);
} }
framework/unit_registry.c
+2 -2
View File
@@ -305,8 +305,8 @@ bool ureg_load_unit_ini_key(const char *restrict name,
{ {
UlistEntry *li = ulist_head; UlistEntry *li = ulist_head;
while (li != NULL) { while (li != NULL) {
if (streq(li->unit.name, name)) { Unit *const pUnit = &li->unit;
Unit *const pUnit = &li->unit; if (streq(pUnit->name, name)) {
pUnit->callsign = callsign; pUnit->callsign = callsign;
return pUnit->driver->cfgLoadIni(pUnit, key, value); return pUnit->driver->cfgLoadIni(pUnit, key, value);
} }