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

Patch level : 12.0 nopatch

Browse Source 
Files correlati     :
Commento        :

aggiornate costanti NULL in nullptr
This commit is contained in:
smen 2021-07-20 16:17:57 +02:00
parent 162c24c545
commit 771f13d5f0
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/include/dongle.cpp
View File

@ -22,24 +22,19 @@
// Current dongle // Current dongle
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
static TDongle* _dongle = NULL; static TDongle* _dongle = nullptr;
TDongle& dongle() TDongle& dongle()
{ {
if (_dongle == NULL) if (_dongle == nullptr)
_dongle = new TDongle; _dongle = new TDongle;
return *_dongle; return *_dongle;
} }
bool destroy_dongle() bool destroy_dongle()
{ {
bool ok = _dongle != NULL; safe_delete(_dongle);
if (ok) return true;
{
delete _dongle;
_dongle = NULL;
}
return ok;
} }
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -137,9 +132,10 @@ bool TDongle::ssa_login(const char* mod)
_module.reset(); // Disattiva tutti i moduli ... _module.reset(); // Disattiva tutti i moduli ...
_module.set(long(BAAUT)); // ... tranne la base _module.set(long(BAAUT)); // ... tranne la base
const int err = xvt_dongle_sa_login(NULL); const int err = xvt_dongle_sa_login(nullptr);
_serno = (err >= 0) ? err : 0xFFFF; _serno = (err >= 0) ? err : 0xFFFF;
if (_serno == 0xFFFF && is_power_station()) if (//_serno == 0xFFFF &&
is_power_station())
_serno = 0; _serno = 0;
if (_serno != 0xFFFF) if (_serno != 0xFFFF)
{ {

3
src/include/utility.cpp
View File

@ -750,8 +750,7 @@ static bool is_sirio_station(const char* hostname)
"NBKPEREGOW10", // Stefano "NBKPEREGOW10", // Stefano
"NBKPEREGOW8", // Stefano "NBKPEREGOW8", // Stefano
"NBCALDERONIW10", // Simone "NBCALDERONIW10", // Simone
nullptr
NULL
}; };
for (int i = 0; ranger[i]; i++) for (int i = 0; ranger[i]; i++)
if (xvt_str_same(hostname, ranger[i])) if (xvt_str_same(hostname, ranger[i]))

6
src/xvaga/xvt_ssa.cpp
View File

@ -174,16 +174,16 @@ TSSA_Pinger::TSSA_Pinger()
int xvt_dongle_sa_login(const char* module) int xvt_dongle_sa_login(const char* module)
{ {
if (_ssa_timer == NULL) if (_ssa_timer == nullptr)
_ssa_timer = new TSSA_Pinger; _ssa_timer = new TSSA_Pinger;
return _ssa_timer->Login(module); return _ssa_timer->Login(module);
} }
int xvt_dongle_sa_crypt(unsigned short* data) int xvt_dongle_sa_crypt(unsigned short* data)
{ {
if (_ssa_timer == NULL) if (_ssa_timer == nullptr)
return SSA_UTENTE_NON_LOGGATO; return SSA_UTENTE_NON_LOGGATO;
if (data == NULL) if (data == nullptr)
return -EACCES; return -EACCES;
data[0] ^= 0xDEAD; data[0] ^= 0xDEAD;