rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-13 22:53:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3362

Browse Source 
49c70962 device: remove dependency on readline (stoffu)
This commit is contained in:
Riccardo Spagni 2018-03-08 18:43:37 +02:00
commit f4cf613e34
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/CMakeLists.txt
View File

@ -70,8 +70,6 @@ target_link_libraries(device
cncrypto cncrypto
ringct ringct
${OPENSSL_CRYPTO_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES}
${GNU_READLINE_LIBRARY}
${EPEE_READLINE}
PRIVATE PRIVATE
${Blocks} ${Blocks}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})

9
src/device/device.cpp
View File

@ -32,7 +32,7 @@
#ifdef HAVE_PCSC #ifdef HAVE_PCSC
#include "device_ledger.hpp" #include "device_ledger.hpp"
#endif #endif
#include "common/scoped_message_writer.h" #include "misc_log_ex.h"
namespace hw { namespace hw {
@ -56,12 +56,11 @@ namespace hw {
auto device = devices.registry.find(device_descriptor); auto device = devices.registry.find(device_descriptor);
if (device == devices.registry.end()) { if (device == devices.registry.end()) {
auto logger = tools::fail_msg_writer(); MERROR("device not found in registry: '" << device_descriptor << "'\n" <<
logger << "device not found in registry '"<<device_descriptor<<"'\n" << "known devices:");
"known devices:"<<device_descriptor<<"'";
for( const auto& sm_pair : devices.registry ) { for( const auto& sm_pair : devices.registry ) {
logger<< " - " << sm_pair.first ; MERROR(" - " << sm_pair.first);
} }
throw std::runtime_error("device not found: "+ device_descriptor); throw std::runtime_error("device not found: "+ device_descriptor);
} }