Add new feature and 2 enum values for USB secure element

[platform/core/api/smartcard.git] / src / Session.cpp

diff --git a/src/Session.cpp b/src/Session.cpp
index a600e1d..266ee61 100755 (executable)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -23,7 +23,7 @@
 /* SLP library header */
 
 /* local header */
-#include "Debug.h"
+#include "smartcard_debug.h"
 #include "Session.h"
 #include "Reader.h"
 #include "ClientChannel.h"
@@ -62,8 +62,10 @@ namespace smartcard_service_api
                        NULL, &error);
                if (proxy == NULL)
                {
-                       _ERR("Can not create proxy : %s", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               _ERR("Can not create proxy : %s", error->message);
+                               g_error_free(error);
+                       }
                        return;
                }
 
@@ -126,8 +128,10 @@ namespace smartcard_service_api
                                _ERR("smartcard_service_session_call_get_atr failed, [%d]", result);
                        }
                } else {
-                       _ERR("smartcard_service_session_call_get_atr failed, [%s]", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               _ERR("smartcard_service_session_call_get_atr failed, [%s]", error->message);
+                               g_error_free(error);
+                       }
 
                        result = SCARD_ERROR_IPC_FAILED;
                }
@@ -188,8 +192,10 @@ namespace smartcard_service_api
                                _ERR("smartcard_service_session_call_open_channel failed, [%d]", result);
                        }
                } else {
-                       _ERR("smartcard_service_session_call_open_channel failed, [%s]", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               _ERR("smartcard_service_session_call_open_channel failed, [%s]", error->message);
+                               g_error_free(error);
+                       }
 
                        result = SCARD_ERROR_IPC_FAILED;
                }
@@ -229,8 +235,10 @@ namespace smartcard_service_api
                                _ERR("smartcard_service_session_call_close_session failed, [%d]", result);
                        }
                } else {
-                       _ERR("smartcard_service_session_call_close_session failed, [%s]", error->message);
-                       g_error_free(error);
+                       if (error != NULL) {
+                               _ERR("smartcard_service_session_call_close_session failed, [%s]", error->message);
+                               g_error_free(error);
+                       }
 
                        result = SCARD_ERROR_IPC_FAILED;
                }
@@ -268,8 +276,10 @@ namespace smartcard_service_api
                                                THROW_ERROR(ret);
                                        }
                                } else {
-                                       _ERR("smartcard_service_session_call_get_atr_sync failed, [%s]", error->message);
-                                       g_error_free(error);
+                                       if (error != NULL) {
+                                               _ERR("smartcard_service_session_call_get_atr_sync failed, [%s]", error->message);
+                                               g_error_free(error);
+                                       }
 
                                        THROW_ERROR(SCARD_ERROR_IPC_FAILED);
                                }
@@ -341,8 +351,10 @@ namespace smartcard_service_api
                                        THROW_ERROR(ret);
                                }
                        } else {
-                               _ERR("smartcard_service_session_call_get_atr_sync failed, [%s]", error->message);
-                               g_error_free(error);
+                               if (error != NULL) {
+                                       _ERR("smartcard_service_session_call_get_atr_sync failed, [%s]", error->message);
+                                       g_error_free(error);
+                               }
 
                                THROW_ERROR(SCARD_ERROR_IPC_FAILED);
                        }
@@ -434,8 +446,10 @@ namespace smartcard_service_api
                                        THROW_ERROR(ret);
                                }
                        } else {
-                               _ERR("smartcard_service_session_call_open_channel_sync failed, [%s]", error->message);
-                               g_error_free(error);
+                               if (error != NULL) {
+                                       _ERR("smartcard_service_session_call_open_channel_sync failed, [%s]", error->message);
+                                       g_error_free(error);
+                               }
 
                                THROW_ERROR(SCARD_ERROR_IPC_FAILED);
                        }