root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migliorata lettura valori booleani da file di configurazione .ini

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22676 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2012-06-18 14:11:31 +00:00
parent ac5b4f39bc
commit bfa656a137
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config.cpp
View File

@ -892,7 +892,7 @@ bool ini_set_string(const char* file, const char* paragraph, const char* name, c
bool ini_get_bool(const char* file, const char* para, const char* name, bool defval, int idx) bool ini_get_bool(const char* file, const char* para, const char* name, bool defval, int idx)
{ {
const char b = ini_get_string(file, para, name, defval ? "1" : "0", idx)[0]; const char b = ini_get_string(file, para, name, defval ? "1" : "0", idx)[0];
return b ? (strchr("XY1", b) != NULL) : defval; return (b > ' ') && (strchr("1SXY", b) != NULL);
} }
bool ini_get_bool(int cfg, const char* para, const char* name, bool defval, int idx) bool ini_get_bool(int cfg, const char* para, const char* name, bool defval, int idx)

13
include/dongle.cpp
View File

@ -228,8 +228,7 @@ bool TDongle::hardlock_login(bool test_all_keys)
} }
} }
} }
else // else log_message("hardlock_login() failed");
log_message("hardlock_login() failed");
if (ok) if (ok)
{ {
@ -317,8 +316,7 @@ bool TDongle::eutron_login(bool /*test_all_keys*/) // AGA dongle pitifully died
_type = types[k]; _type = types[k];
break; break;
} }
else // else log_message("eutron_login(\"%s\") failed", labels[k]);
log_message("eutron_login(\"%s\") failed", labels[k]);
} }
if (ok) if (ok)
{ {
@ -411,8 +409,7 @@ bool TDongle::ssa_login(const char* mod)
else else
set_developer_permissions(); set_developer_permissions();
} }
else // else log_message("ssa_login() failed with code %d", err);
log_message("ssa_login() failed with code %d", err);
return _serno != 0xFFFF; return _serno != 0xFFFF;
} }
@ -448,8 +445,8 @@ bool TDongle::network_login(bool test_all_keys)
_year_assist = rpc_DongleYear(); _year_assist = rpc_DongleYear();
ok = rpc_DongleModules(_module); ok = rpc_DongleModules(_module);
if (ok && main_app().name() == "ba0100") if (ok && main_app().name() == "ba0100")
warning_box("ATTENZIONE! Il server di protezione non e' aggiornato:\n" warning_box(TR("ATTENZIONE! Il server di protezione non e' aggiornato:\n"
"Controllare la corretta installazione del servizio"); "Controllare la corretta installazione del servizio"));
} }
} }
else else