Merge pull request #3362

49c70962 device: remove dependency on readline (stoffu)

src/device/CMakeLists.txt

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

src/device/device.cpp

@@ -32,7 +32,7 @@
 #ifdef HAVE_PCSC
 #include "device_ledger.hpp"
 #endif
-#include "common/scoped_message_writer.h"
+#include "misc_log_ex.h"
 
 
 namespace hw {
@@ -56,12 +56,11 @@ namespace hw {
 
         auto device = devices.registry.find(device_descriptor);
         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 ) {
-             logger<< " - " << sm_pair.first ;
+                MERROR(" - " << sm_pair.first);
             }
             throw std::runtime_error("device not found: "+ device_descriptor);
         }