reader inline

src/DataAccess/ScReader.cpp

@@ -5,7 +5,6 @@
 #include <winscard.h>
 #include <vector>
 #include <string.h>
-#include <reader.h>
 #include "ScReader.h"
 
 thread_local LPSCARDCONTEXT ScReader::_context = nullptr;
@@ -90,42 +89,15 @@ std::vector<std::shared_ptr<ScReader>> ScReader::getReaders()
     return readers;
 }
 
-LONG ScReader::getLastStaticResult()
-{
-    return _lastStaticResult;
-}
-
-LONG ScReader::getLastResult()
-{
-    return _lastResult;
-}
-
 std::string ScReader::getAttribute(DWORD attr)
 {
     DWORD len = SCARD_AUTOALLOCATE;
     BYTE* data = nullptr;
     _lastResult = SCardGetAttrib(*_card, attr, (BYTE*)&data, &len);
+    std::string str((char*)data, len);
+    SCardFreeMemory(*_context, data);
     if (_lastResult == SCARD_S_SUCCESS)
-        return std::string((char*)data, len);
+        return str;
     return std::string();
 }
 
-std::string ScReader::getAtr()
-{
-    return getAttribute(SCARD_ATTR_ATR_STRING);
-}
-
-std::string ScReader::getResultString(const LONG& error)
-{
-    return pcsc_stringify_error(error);
-}
-
-std::string ScReader::getLastStaticResultString()
-{
-    return getResultString(_lastStaticResult);
-}
-
-std::string ScReader::getLastResultString()
-{
-    return getResultString(_lastResult);
-}

src/include/ScReader.h

@@ -8,7 +8,6 @@
 # include <wintypes.h>
 # include <pcsclite.h>
 # include <memory>
-#include <bits/stl_bvector.h>
 # include "ScCommand.h"
 # include "ScResult.h"
 
@@ -23,13 +22,13 @@ public:
 
     static LONG getLastStaticResult();
 
-    static std::string getLastStaticResultString();
+    static inline std::string getLastStaticResultString();
 
-    static std::string getResultString(const LONG& result);
+    static inline std::string getResultString(const LONG& result);
 
-    LONG getLastResult();
+    inline LONG getLastResult();
 
-    std::string getLastResultString();
+    inline std::string getLastResultString();
 
     static bool establishContext();
 
@@ -46,7 +45,7 @@ public:
 
     std::string getAttribute(DWORD attr);
 
-    std::string getAtr();
+    inline std::string getAtr();
 
 private:
     std::string _name;

src/include/ScReader.hxx

@@ -2,6 +2,8 @@
 // Created by robin on 6/28/15.
 //
 
+#include <reader.h>
+
 ScReader::ScReader(std::string name)
     : _name(name)
     , _card(nullptr)
@@ -12,4 +14,34 @@ ScReader::ScReader(std::string name)
 const std::string ScReader::getName() const
 {
     return _name;
-}
+}
+
+LONG ScReader::getLastStaticResult()
+{
+    return _lastStaticResult;
+}
+
+LONG ScReader::getLastResult()
+{
+    return _lastResult;
+}
+
+std::string ScReader::getAtr()
+{
+    return getAttribute(SCARD_ATTR_ATR_STRING);
+}
+
+std::string ScReader::getResultString(const LONG& error)
+{
+    return pcsc_stringify_error(error);
+}
+
+std::string ScReader::getLastStaticResultString()
+{
+    return getResultString(_lastStaticResult);
+}
+
+std::string ScReader::getLastResultString()
+{
+    return getResultString(_lastResult);
+}