diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-01-11 16:40:05 +0100 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-11 15:41:36 +0100 |
| commit | 55745fccf0c4233c536d8bacead3443a8e431b8d (patch) | |
| tree | b39c55923aa611e651bf95aff165459554b057a4 | |
| parent | 2dec896b3f853d2e509c4eb15fe5dd6c28e0a1d7 (diff) | |
| download | libnitrokey-55745fccf0c4233c536d8bacead3443a8e431b8d.tar.gz libnitrokey-55745fccf0c4233c536d8bacead3443a8e431b8d.tar.bz2 | |
Use nullptr instead of NULL
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| -rw-r--r-- | NitrokeyManager.cc | 3 | ||||
| -rw-r--r-- | device.cc | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc index f71c362..73a704a 100644 --- a/NitrokeyManager.cc +++ b/NitrokeyManager.cc @@ -49,7 +49,8 @@ namespace nitrokey{ shared_ptr <NitrokeyManager> NitrokeyManager::_instance = nullptr; - NitrokeyManager::NitrokeyManager() { + NitrokeyManager::NitrokeyManager() : device(nullptr) + { set_debug(true); } NitrokeyManager::~NitrokeyManager() { @@ -22,7 +22,7 @@ Device::Device(const uint16_t vid, const uint16_t pid, const DeviceModel model, m_retry_sending_count(3), m_retry_receiving_count(retry_receiving_count), m_retry_timeout(retry_timeout), - mp_devhandle(NULL), + mp_devhandle(nullptr), last_command_status(0), m_model(model), m_send_receive_delay(send_receive_delay) @@ -34,7 +34,7 @@ bool Device::disconnect() { if(mp_devhandle == nullptr) return false; hid_close(mp_devhandle); - mp_devhandle = NULL; + mp_devhandle = nullptr; hid_exit(); return true; } @@ -43,15 +43,15 @@ bool Device::connect() { Log::instance()(__PRETTY_FUNCTION__, Loglevel::DEBUG_L2); // hid_init(); // done automatically on hid_open - mp_devhandle = hid_open(m_vid, m_pid, NULL); - return mp_devhandle != NULL; + mp_devhandle = hid_open(m_vid, m_pid, nullptr); + return mp_devhandle != nullptr; } int Device::send(const void *packet) { std::lock_guard<std::mutex> lock(mex_dev_com); Log::instance()(__PRETTY_FUNCTION__, Loglevel::DEBUG_L2); - if (mp_devhandle == NULL) + if (mp_devhandle == nullptr) throw std::runtime_error("Attempted HID send on an invalid descriptor."); //TODO migrate except to library_error return (hid_send_feature_report( @@ -65,7 +65,7 @@ int Device::recv(void *packet) { Log::instance()(__PRETTY_FUNCTION__, Loglevel::DEBUG_L2); - if (mp_devhandle == NULL) + if (mp_devhandle == nullptr) throw std::runtime_error("Attempted HID receive on an invalid descriptor."); //TODO migrate except to library_error // FIXME extract error handling and repeating to parent function in @@ -76,7 +76,7 @@ int Device::recv(void *packet) { // FIXME handle getting libhid error message somewhere else auto pwherr = hid_error(mp_devhandle); - std::wstring wherr = (pwherr != NULL) ? pwherr : L"No error message"; + std::wstring wherr = (pwherr != nullptr) ? pwherr : L"No error message"; std::string herr(wherr.begin(), wherr.end()); Log::instance()(std::string("libhid error message: ") + herr, Loglevel::DEBUG_L2); |