feat(error-handling): add ScardCardCommunicationFailedError and map more error codes for improved error handling

mrts · mrts · commit 8787be3d5f48 · 2021-04-14T18:48:00.000+03:00
Signed-off-by: Mart Somermaa &lt;mrts@users.noreply.github.com&gt;
diff --git a/.github/temporarily-disabled-workflows/codeql-analysis.yml b/.github/temporarily-disabled-workflows/codeql-analysis.yml
diff --git a/include/pcsc-cpp/pcsc-cpp-utils.hpp b/include/pcsc-cpp/pcsc-cpp-utils.hpp
@@ -41,7 +41,7 @@ inline std::string int2hexstr(const T value)
     return hexStringBuilder.str();
 }
 
-/** Remove absolute path prefix until "src" from the given path, '/path/to/src/main.cpp' becomes
+/** Remove absolute path prefix until 'src' from the given path, '/path/to/src/main.cpp' becomes
  * 'src/main.cpp'. */
 inline std::string removeAbsolutePathPrefix(const std::string& filePath)
 {
diff --git a/include/pcsc-cpp/pcsc-cpp.hpp b/include/pcsc-cpp/pcsc-cpp.hpp
@@ -352,6 +352,13 @@ class ScardNoCardError : public ScardError
     using ScardError::ScardError;
 };
 
+/** Thrown when communication with the card or reader fails. */
+class ScardCardCommunicationFailedError : public ScardError
+{
+public:
+    using ScardError::ScardError;
+};
+
 /** Thrown when the card is removed from the selected reader. */
 class ScardCardRemovedError : public ScardError
 {
diff --git a/src/SCardCall.hpp b/src/SCardCall.hpp
@@ -54,11 +54,17 @@ void SCardCall(const char* callerFunctionName, const char* file, int line,
         throw ScardServiceNotRunningError(
             buildErrorMessage(callerFunctionName, scardFunctionName, result, file, line));
     case SCARD_E_NO_READERS_AVAILABLE:
+    case SCARD_E_READER_UNAVAILABLE:
         throw ScardNoReadersError(
             buildErrorMessage(callerFunctionName, scardFunctionName, result, file, line));
     case SCARD_E_NO_SMARTCARD:
         throw ScardNoCardError(
             buildErrorMessage(callerFunctionName, scardFunctionName, result, file, line));
+    case SCARD_E_NOT_READY:
+    case SCARD_E_INVALID_VALUE:
+    case SCARD_E_COMM_DATA_LOST:
+        throw ScardCardCommunicationFailedError(
+            buildErrorMessage(callerFunctionName, scardFunctionName, result, file, line));
     case SCARD_W_REMOVED_CARD:
         throw ScardCardRemovedError(
             buildErrorMessage(callerFunctionName, scardFunctionName, result, file, line));

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ inline std::string int2hexstr(const T value)`
`41`	`41`	`return hexStringBuilder.str();`
`42`	`42`	`}`
`43`	`43`
`44`		`-/** Remove absolute path prefix until "src" from the given path, '/path/to/src/main.cpp' becomes`
	`44`	`+/** Remove absolute path prefix until 'src' from the given path, '/path/to/src/main.cpp' becomes`
`45`	`45`	`* 'src/main.cpp'. */`
`46`	`46`	`inline std::string removeAbsolutePathPrefix(const std::string& filePath)`
`47`	`47`	`{`