revise exported headers and cleanup headers

Change-Id: Ic71fe2a51345f1dec9696294ad598d7090a40cbe

diff --git a/client/ClientChannel.cpp b/client/ClientChannel.cpp
index 596d044..7ecab0f 100644 (file)
--- a/client/ClientChannel.cpp
+++ b/client/ClientChannel.cpp
@@ -14,15 +14,11 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "ClientChannel.h"
 #include "ReaderHelper.h"

diff --git a/client/ClientGDBus.cpp b/client/ClientGDBus.cpp
index 5e755dd..f2c572e 100644 (file)
--- a/client/ClientGDBus.cpp
+++ b/client/ClientGDBus.cpp
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <glib.h>
 
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
 #include "Debug.h"
 #include "ByteArray.h"

diff --git a/client/Reader.cpp b/client/Reader.cpp
index f4260ee..1b1d0e5 100644 (file)
--- a/client/Reader.cpp
+++ b/client/Reader.cpp
@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "Reader.h"
 #include "Session.h"

diff --git a/client/include/ClientChannel.h b/client/include/ClientChannel.h
index cfca093..bd0fcf6 100644 (file)
--- a/client/include/ClientChannel.h
+++ b/client/include/ClientChannel.h
@@ -17,14 +17,10 @@
 #ifndef CLIENTCHANNEL_H_
 #define CLIENTCHANNEL_H_
 
-/* standard library header */
 #ifdef USE_AUTOSTART
 #include <gio/gio.h>
 #endif
 
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
 #ifdef __cplusplus
 #include "Channel.h"
@@ -34,7 +30,7 @@
 #ifdef __cplusplus
 namespace smartcard_service_api
 {
-       class ClientChannel: public Channel
+       class EXPORT ClientChannel: public Channel
        {
        private:
                void *context;

diff --git a/client/include/ClientGDBus.h b/client/include/ClientGDBus.h
index c111874..6630d14 100644 (file)
--- a/client/include/ClientGDBus.h
+++ b/client/include/ClientGDBus.h
@@ -17,12 +17,8 @@
 #ifndef CLIENTGDBUS_H_
 #define CLIENTGDBUS_H_
 
-/* standard library header */
 #include <glib.h>
 
-/* SLP library header */
-
-/* local header */
 #include "GDBusHelper.h"
 #include "smartcard-service-gdbus.h"
 

diff --git a/client/include/Reader.h b/client/include/Reader.h
index 92fe0bf..f913446 100644 (file)
--- a/client/include/Reader.h
+++ b/client/include/Reader.h
@@ -17,15 +17,11 @@
 #ifndef READER_H_
 #define READER_H_
 
-/* standard library header */
 #ifdef USE_AUTOSTART
 #include <glib.h>
 #include <gio/gio.h>
 #endif
 
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
 #ifdef __cplusplus
 #include "ReaderHelper.h"
@@ -35,7 +31,7 @@
 #ifdef __cplusplus
 namespace smartcard_service_api
 {
-       class Reader: public ReaderHelper
+       class EXPORT Reader: public ReaderHelper
        {
        private:
                void *context;

diff --git a/client/include/SEService.h b/client/include/SEService.h
index bfbd4b8..4ecda27 100644 (file)
--- a/client/include/SEService.h
+++ b/client/include/SEService.h
@@ -17,15 +17,11 @@
 #ifndef SESERVICE_H_
 #define SESERVICE_H_
 
-/* standard library header */
 #ifdef USE_AUTOSTART
 #include <glib.h>
 #include <gio/gio.h>
 #endif
 
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
 #ifdef __cplusplus
 #include "SEServiceListener.h"
@@ -39,7 +35,7 @@ namespace smartcard_service_api
 {
        typedef void (*serviceConnected)(SEServiceHelper *service, void *context);
 
-       class SEService : public SEServiceHelper
+       class EXPORT SEService : public SEServiceHelper
        {
        private:
                unsigned int handle;

diff --git a/client/include/SEServiceListener.h b/client/include/SEServiceListener.h
index 9cfc01b..21c53f4 100644 (file)
--- a/client/include/SEServiceListener.h
+++ b/client/include/SEServiceListener.h
@@ -17,17 +17,11 @@
 #ifndef SESERVICELISTENER_H_
 #define SESERVICELISTENER_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
-
 namespace smartcard_service_api
 {
        class SEServiceHelper;
 
-       class SEServiceListener
+       class EXPORT SEServiceListener
        {
        public:
                virtual void serviceConnected(SEServiceHelper *service,

diff --git a/client/include/Session.h b/client/include/Session.h
index 7fc3aa8..0117d7c 100644 (file)
--- a/client/include/Session.h
+++ b/client/include/Session.h
@@ -17,14 +17,10 @@
 #ifndef SESSION_H_
 #define SESSION_H_
 
-/* standard library header */
 #ifdef USE_AUTOSTART
 #include <gio/gio.h>
 #endif
 
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
 #ifdef __cplusplus
 #include "SessionHelper.h"
@@ -35,7 +31,7 @@ namespace smartcard_service_api
 {
        class Reader;
 
-       class Session : public SessionHelper
+       class EXPORT Session : public SessionHelper
        {
        private:
                void *context;

diff --git a/client/smartcard-service.pc.in b/client/smartcard-service.pc.in
index 5b3d1d7..3590877 100644 (file)
--- a/client/smartcard-service.pc.in
+++ b/client/smartcard-service.pc.in
@@ -6,6 +6,6 @@ includedir=@INCLUDE_INSTALL_DIR@/@PROJECT_NAME@
 Name: @PROJECT_NAME@
 Description: library of Smartcard service
 Version: @FULLVER@
-Requires: glib-2.0
+Requires: glib-2.0 dlog
 Libs: -L${libdir} -l@PROJECT_NAME@
 Cflags: -I${includedir}

diff --git a/common/AccessCondition.cpp b/common/AccessCondition.cpp
index 10593d5..d6831c8 100644 (file)
--- a/common/AccessCondition.cpp
+++ b/common/AccessCondition.cpp
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <stdio.h>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "SimpleTLV.h"
 #include "AccessControlList.h"

diff --git a/common/ByteArray.cpp b/common/ByteArray.cpp
index 0f26704..181125c 100644 (file)
--- a/common/ByteArray.cpp
+++ b/common/ByteArray.cpp
@@ -14,15 +14,11 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <cstdio>
 #include <cstring>
 #include <cerrno>
 #include <sstream>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "ByteArray.h"
 

diff --git a/common/EFDIR.cpp b/common/EFDIR.cpp
index e6035e5..3735d75 100644 (file)
--- a/common/EFDIR.cpp
+++ b/common/EFDIR.cpp
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <stdio.h>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "EFDIR.h"
 #include "APDUHelper.h"

diff --git a/common/FCI.cpp b/common/FCI.cpp
index 11d2279..d4d1bf2 100644 (file)
--- a/common/FCI.cpp
+++ b/common/FCI.cpp
@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <cstdio>
 #include <cstring>
 #include <sstream>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "FCI.h"
 #include "SimpleTLV.h"

diff --git a/common/FileObject.cpp b/common/FileObject.cpp
index 46112f1..b56c696 100644 (file)
--- a/common/FileObject.cpp
+++ b/common/FileObject.cpp
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <stdio.h>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "FileObject.h"
 #include "APDUHelper.h"

diff --git a/common/GPACE.cpp b/common/GPACE.cpp
index 3aa3ba7..ca1d0d7 100644 (file)
--- a/common/GPACE.cpp
+++ b/common/GPACE.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "GPACE.h"
 #include "GPARAACL.h"

diff --git a/common/GPARAACL.cpp b/common/GPARAACL.cpp
index 31c082d..0f3b8fc 100644 (file)
--- a/common/GPARAACL.cpp
+++ b/common/GPARAACL.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "GPARAACL.h"
 #include "GPARAM.h"

diff --git a/common/GPARAM.cpp b/common/GPARAM.cpp
index ac0081b..2990cf9 100644 (file)
--- a/common/GPARAM.cpp
+++ b/common/GPARAM.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "GPARAM.h"
 #include "APDUHelper.h"

diff --git a/common/GPARFACL.cpp b/common/GPARFACL.cpp
index 9c27935..1f45cb2 100644 (file)
--- a/common/GPARFACL.cpp
+++ b/common/GPARFACL.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "GPARFACL.h"
 #include "PKCS15ODF.h"

diff --git a/common/ISO7816BERTLV.cpp b/common/ISO7816BERTLV.cpp
index 3ea9054..babd635 100644 (file)
--- a/common/ISO7816BERTLV.cpp
+++ b/common/ISO7816BERTLV.cpp
@@ -14,13 +14,9 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <stdio.h>
 #include <string.h>
 
-/* SLP library header */
-
-/* local header */
 #include "ISO7816BERTLV.h"
 
 namespace smartcard_service_api

diff --git a/common/OpensslHelper.cpp b/common/OpensslHelper.cpp
index c4f670c..17f485d 100644 (file)
--- a/common/OpensslHelper.cpp
+++ b/common/OpensslHelper.cpp
@@ -14,16 +14,12 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <stdio.h>
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "ByteArray.h"
 #include "OpensslHelper.h"

diff --git a/common/PKCS15.cpp b/common/PKCS15.cpp
index 729d209..674c684 100644 (file)
--- a/common/PKCS15.cpp
+++ b/common/PKCS15.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "APDUHelper.h"
 #include "EFDIR.h"

diff --git a/common/PKCS15DODF.cpp b/common/PKCS15DODF.cpp
index 86514c7..50cf11a 100644 (file)
--- a/common/PKCS15DODF.cpp
+++ b/common/PKCS15DODF.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "PKCS15DODF.h"
 #include "SimpleTLV.h"

diff --git a/common/PKCS15ODF.cpp b/common/PKCS15ODF.cpp
index 4ca414b..a0beb7c 100644 (file)
--- a/common/PKCS15ODF.cpp
+++ b/common/PKCS15ODF.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "PKCS15ODF.h"
 #include "SimpleTLV.h"

diff --git a/common/PKCS15OID.cpp b/common/PKCS15OID.cpp
index 088a3fa..a927fd8 100644 (file)
--- a/common/PKCS15OID.cpp
+++ b/common/PKCS15OID.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "PKCS15.h"
 #include "PKCS15OID.h"

diff --git a/common/PKCS15Object.cpp b/common/PKCS15Object.cpp
index 6c4c790..8559aa7 100644 (file)
--- a/common/PKCS15Object.cpp
+++ b/common/PKCS15Object.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "SimpleTLV.h"
 #include "PKCS15Object.h"

diff --git a/common/PKCS15Path.cpp b/common/PKCS15Path.cpp
index 0e28b13..a219c3d 100644 (file)
--- a/common/PKCS15Path.cpp
+++ b/common/PKCS15Path.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "PKCS15Path.h"
 
 namespace smartcard_service_api

diff --git a/common/PKCS15TokenInfo.cpp b/common/PKCS15TokenInfo.cpp
index 259d939..37722b8 100644 (file)
--- a/common/PKCS15TokenInfo.cpp
+++ b/common/PKCS15TokenInfo.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "PKCS15TokenInfo.h"
 
 namespace smartcard_service_api

diff --git a/common/Serializable.cpp b/common/Serializable.cpp
index f4daec8..b5ac3ed 100644 (file)
--- a/common/Serializable.cpp
+++ b/common/Serializable.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Serializable.h"
 
 namespace smartcard_service_api

diff --git a/common/include/APDUHelper.h b/common/include/APDUHelper.h
index 732c186..94ffd0a 100644 (file)
--- a/common/include/APDUHelper.h
+++ b/common/include/APDUHelper.h
@@ -17,11 +17,7 @@
 #ifndef APDUHELPER_H_
 #define APDUHELPER_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
+#include "Debug.h"
 #include "ByteArray.h"
 
 namespace smartcard_service_api

diff --git a/common/include/AccessCondition.h b/common/include/AccessCondition.h
index 787bdd0..5ab978d 100644 (file)
--- a/common/include/AccessCondition.h
+++ b/common/include/AccessCondition.h
@@ -17,13 +17,9 @@
 #ifndef ACCESSCONDITION_H_
 #define ACCESSCONDITION_H_
 
-/* standard library header */
 #include <map>
 #include <vector>
 
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 
 using namespace std;

diff --git a/common/include/AccessControlList.h b/common/include/AccessControlList.h
index df98c75..6f2b56f 100644 (file)
--- a/common/include/AccessControlList.h
+++ b/common/include/AccessControlList.h
@@ -17,13 +17,9 @@
 #ifndef ACCESSCONTROLLIST_H_
 #define ACCESSCONTROLLIST_H_
 
-/* standard library header */
 #include <vector>
 #include <map>
 
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 #include "Channel.h"
 #include "AccessCondition.h"

diff --git a/common/include/ByteArray.h b/common/include/ByteArray.h
index cbcd9dd..c6e1052 100644 (file)
--- a/common/include/ByteArray.h
+++ b/common/include/ByteArray.h
@@ -17,7 +17,6 @@
 #ifndef BYTEARRAY_H_
 #define BYTEARRAY_H_
 
-/* standard library header */
 #include <string>
 #include <stdint.h>
 #include <stddef.h>

diff --git a/common/include/Channel.h b/common/include/Channel.h
index e2b6899..102606c 100644 (file)
--- a/common/include/Channel.h
+++ b/common/include/Channel.h
@@ -17,11 +17,6 @@
 #ifndef CHANNEL_H_
 #define CHANNEL_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Synchronous.h"
 #include "ByteArray.h"
 #include "Exception.h"
@@ -34,7 +29,7 @@ namespace smartcard_service_api
                unsigned int length, int error, void *userParam);
        typedef void (*closeChannelCallback)(int error, void *userParam);
 
-       class Channel : public Synchronous
+       class EXPORT Channel : public Synchronous
        {
        protected :
                ByteArray selectResponse;

diff --git a/common/include/Debug.h b/common/include/Debug.h
index a171592..edcf921 100644 (file)
--- a/common/include/Debug.h
+++ b/common/include/Debug.h
@@ -17,18 +17,14 @@
 #ifndef DEBUG_H_
 #define DEBUG_H_
 
-/* standard library header */
 #include <iostream>
 
-/* SLP library header */
 #include "dlog.h"
 
 #ifndef EXPORT
 #define EXPORT __attribute__((visibility("default")))
 #endif
 
-/* local header */
-
 #define COLOR_BLACK    "\033[0;30m"
 #define COLOR_RED      "\033[0;31m"
 #define COLOR_GREEN    "\033[0;32m"

diff --git a/common/include/EFDIR.h b/common/include/EFDIR.h
index c19eec9..9314fe4 100644 (file)
--- a/common/include/EFDIR.h
+++ b/common/include/EFDIR.h
@@ -17,12 +17,8 @@
 #ifndef EFDIR_H_
 #define EFDIR_H_
 
-/* standard library header */
 #include <vector>
 
-/* SLP library header */
-
-/* local header */
 #include "FileObject.h"
 
 using namespace std;

diff --git a/common/include/Exception.h b/common/include/Exception.h
index cb59d1d..8b33ae2 100644 (file)
--- a/common/include/Exception.h
+++ b/common/include/Exception.h
@@ -20,6 +20,7 @@
 #include <exception>
 #include <stddef.h>
 
+#include "Debug.h"
 #include "smartcard-types.h"
 
 #define THROW_ERROR(errorCode) \
@@ -66,7 +67,7 @@
 
 namespace smartcard_service_api
 {
-       class ExceptionBase : public std::exception
+       class EXPORT ExceptionBase : public std::exception
        {
        protected :
                int errorCode;
@@ -83,7 +84,7 @@ namespace smartcard_service_api
                }
        };
 
-       class ErrorIO : public ExceptionBase
+       class EXPORT ErrorIO : public ExceptionBase
        {
        private :
                unsigned char sw[2];
@@ -130,7 +131,7 @@ namespace smartcard_service_api
                }
        };
 
-       class ErrorSecurity : public ExceptionBase
+       class EXPORT ErrorSecurity : public ExceptionBase
        {
        public :
                ErrorSecurity(int errorCode) throw()
@@ -156,7 +157,7 @@ namespace smartcard_service_api
                }
        };
 
-       class ErrorIllegalState : public ExceptionBase
+       class EXPORT ErrorIllegalState : public ExceptionBase
        {
        public :
                ErrorIllegalState(int errorCode) throw()
@@ -190,7 +191,7 @@ namespace smartcard_service_api
                }
        };
 
-       class ErrorIllegalParameter : public ExceptionBase
+       class EXPORT ErrorIllegalParameter : public ExceptionBase
        {
        public :
                ErrorIllegalParameter(int errorCode) throw()
@@ -216,7 +217,7 @@ namespace smartcard_service_api
                }
        };
 
-       class ThrowError
+       class EXPORT ThrowError
        {
        public :
                static void throwError(int errorCode)

diff --git a/common/include/FCI.h b/common/include/FCI.h
index 1b303e5..a0e6d8a 100644 (file)
--- a/common/include/FCI.h
+++ b/common/include/FCI.h
@@ -17,12 +17,8 @@
 #ifndef FCI_H_
 #define FCI_H_
 
-/* standard library header */
 #include <string>
 
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 
 namespace smartcard_service_api

diff --git a/common/include/FileObject.h b/common/include/FileObject.h
index 27e56a8..cf6be8c 100644 (file)
--- a/common/include/FileObject.h
+++ b/common/include/FileObject.h
@@ -17,12 +17,8 @@
 #ifndef FILEOBJECT_H_
 #define FILEOBJECT_H_
 
-/* standard library header */
 #include <vector>
 
-/* SLP library header */
-
-/* local header */
 #include "ProviderHelper.h"
 #include "ByteArray.h"
 #include "FCI.h"

diff --git a/common/include/GPACE.h b/common/include/GPACE.h
index 1720e7c..128d55e 100644 (file)
--- a/common/include/GPACE.h
+++ b/common/include/GPACE.h
@@ -17,11 +17,6 @@
 #ifndef GPACE_H_
 #define GPACE_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
 #ifdef __cplusplus
 #include "AccessControlList.h"

diff --git a/common/include/GPARAACL.h b/common/include/GPARAACL.h
index 4038b41..dbfb5f3 100644 (file)
--- a/common/include/GPARAACL.h
+++ b/common/include/GPARAACL.h
@@ -17,11 +17,6 @@
 #ifndef GPARAACL_H_
 #define GPARAACL_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
 #ifdef __cplusplus
 #include "AccessControlList.h"

diff --git a/common/include/GPARAM.h b/common/include/GPARAM.h
index d4b3116..2cf6621 100644 (file)
--- a/common/include/GPARAM.h
+++ b/common/include/GPARAM.h
@@ -17,12 +17,8 @@
 #ifndef GPARAM_H_
 #define GPARAM_H_
 
-/* standard library header */
 #include <vector>
 
-/* SLP library header */
-
-/* local header */
 #include "FileObject.h"
 
 using namespace std;

diff --git a/common/include/GPARFACL.h b/common/include/GPARFACL.h
index 396adbe..c612e22 100644 (file)
--- a/common/include/GPARFACL.h
+++ b/common/include/GPARFACL.h
@@ -17,11 +17,6 @@
 #ifndef GPARFACL_H_
 #define GPARFACL_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
 #ifdef __cplusplus
 #include "AccessControlList.h"

diff --git a/common/include/ISO7816BERTLV.h b/common/include/ISO7816BERTLV.h
index d5a0cd7..82cb043 100644 (file)
--- a/common/include/ISO7816BERTLV.h
+++ b/common/include/ISO7816BERTLV.h
@@ -17,11 +17,6 @@
 #ifndef ISO7816BERTLV_H_
 #define ISO7816BERTLV_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 #include "TLVHelper.h"
 

diff --git a/common/include/Lock.h b/common/include/Lock.h
index 4d9e0e4..19974d9 100644 (file)
--- a/common/include/Lock.h
+++ b/common/include/Lock.h
@@ -17,16 +17,11 @@
 #ifndef LOCK_H_
 #define LOCK_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
-#include "pthread.h"
+#include <pthread.h>
 
 namespace smartcard_service_api
 {
-       class Lock
+       class EXPORT Lock
        {
        public:
                virtual ~Lock() {};
@@ -51,7 +46,7 @@ namespace smartcard_service_api
 #define SCOPE_LOCK(X) \
        if (const AutoLockHelper& TOKENPASTE2(lock_, __LINE__) = makeAutoLock(X))
 
-       class AutoLockHelper
+       class EXPORT AutoLockHelper
        {
        public:
                inline operator bool() const
@@ -61,7 +56,7 @@ namespace smartcard_service_api
        };
 
        template<typename T>
-       class AutoLock : public AutoLockHelper
+       class EXPORT AutoLock : public AutoLockHelper
        {
        private:
                T *lock;

diff --git a/common/include/NumberStream.h b/common/include/NumberStream.h
index 74b1f8b..26f10e3 100644 (file)
--- a/common/include/NumberStream.h
+++ b/common/include/NumberStream.h
@@ -17,11 +17,6 @@
 #ifndef NUMBERSTREAM_H_
 #define NUMBERSTREAM_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 
 namespace smartcard_service_api

diff --git a/common/include/OpensslHelper.h b/common/include/OpensslHelper.h
index 05cd2c2..87b55b0 100644 (file)
--- a/common/include/OpensslHelper.h
+++ b/common/include/OpensslHelper.h
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <stdint.h>
 
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 
 #ifndef OPENSSLHELPER_H_

diff --git a/common/include/PKCS15.h b/common/include/PKCS15.h
index b114b53..d0faed4 100644 (file)
--- a/common/include/PKCS15.h
+++ b/common/include/PKCS15.h
@@ -17,12 +17,8 @@
 #ifndef PKCS15_H_
 #define PKCS15_H_
 
-/* standard library header */
 #include <map>
 
-/* SLP library header */
-
-/* local header */
 #include "PKCS15Object.h"
 #include "PKCS15ODF.h"
 

diff --git a/common/include/PKCS15DODF.h b/common/include/PKCS15DODF.h
index 9364245..7dfb5ea 100644 (file)
--- a/common/include/PKCS15DODF.h
+++ b/common/include/PKCS15DODF.h
@@ -17,11 +17,6 @@
 #ifndef PKCS15DODF_H_
 #define PKCS15DODF_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "PKCS15Object.h"
 #include "PKCS15OID.h"
 

diff --git a/common/include/PKCS15ODF.h b/common/include/PKCS15ODF.h
index 1deb36d..27a1b18 100644 (file)
--- a/common/include/PKCS15ODF.h
+++ b/common/include/PKCS15ODF.h
@@ -17,12 +17,8 @@
 #ifndef PKCS15ODF_H_
 #define PKCS15ODF_H_
 
-/* standard library header */
 #include <map>
 
-/* SLP library header */
-
-/* local header */
 #include "FileObject.h"
 #include "PKCS15DODF.h"
 

diff --git a/common/include/PKCS15OID.h b/common/include/PKCS15OID.h
index 248150b..9ba3073 100644 (file)
--- a/common/include/PKCS15OID.h
+++ b/common/include/PKCS15OID.h
@@ -17,11 +17,6 @@
 #ifndef PKCS15OID_H_
 #define PKCS15OID_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 
 namespace smartcard_service_api

diff --git a/common/include/PKCS15Object.h b/common/include/PKCS15Object.h
index df76f72..e5d78d2 100644 (file)
--- a/common/include/PKCS15Object.h
+++ b/common/include/PKCS15Object.h
@@ -17,13 +17,9 @@
 #ifndef PKCS15OBJECT_H_
 #define PKCS15OBJECT_H_
 
-/* standard library header */
 #include <map>
 #include <vector>
 
-/* SLP library header */
-
-/* local header */
 #include "FileObject.h"
 #include "PKCS15Path.h"
 

diff --git a/common/include/PKCS15Path.h b/common/include/PKCS15Path.h
index 52f3894..b5a964b 100644 (file)
--- a/common/include/PKCS15Path.h
+++ b/common/include/PKCS15Path.h
@@ -17,11 +17,6 @@
 #ifndef PKCS15Path_H_
 #define PKCS15Path_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 
 namespace smartcard_service_api

diff --git a/common/include/PKCS15TokenInfo.h b/common/include/PKCS15TokenInfo.h
index 9f3ff80..5ebba70 100644 (file)
--- a/common/include/PKCS15TokenInfo.h
+++ b/common/include/PKCS15TokenInfo.h
@@ -17,11 +17,6 @@
 #ifndef PKCS15TOKENINFO_H_
 #define PKCS15TOKENINFO_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "PKCS15Object.h"
 
 namespace smartcard_service_api

diff --git a/common/include/ProviderHelper.h b/common/include/ProviderHelper.h
index 7418b6c..2c004ea 100644 (file)
--- a/common/include/ProviderHelper.h
+++ b/common/include/ProviderHelper.h
@@ -17,11 +17,6 @@
 #ifndef PROVIDERHELPER_H_
 #define PROVIDERHELPER_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Channel.h"
 
 namespace smartcard_service_api

diff --git a/common/include/ReaderHelper.h b/common/include/ReaderHelper.h
index 259044a..a89d72d 100644 (file)
--- a/common/include/ReaderHelper.h
+++ b/common/include/ReaderHelper.h
@@ -17,13 +17,9 @@
 #ifndef READERHELPER_H_
 #define READERHELPER_H_
 
-/* standard library header */
 #include <vector>
 #include <string>
 
-/* SLP library header */
-
-/* local header */
 #include "Synchronous.h"
 #include "SessionHelper.h"
 
@@ -36,7 +32,7 @@ namespace smartcard_service_api
        typedef void (*openSessionCallback)(SessionHelper *session, int error,
                void *userData);
 
-       class ReaderHelper : public Synchronous
+       class EXPORT ReaderHelper : public Synchronous
        {
        protected:
                SEServiceHelper *seService;

diff --git a/common/include/SEServiceHelper.h b/common/include/SEServiceHelper.h
index 4afbfcb..3c57b41 100644 (file)
--- a/common/include/SEServiceHelper.h
+++ b/common/include/SEServiceHelper.h
@@ -17,12 +17,8 @@
 #ifndef SESERVICEHELPER_H_
 #define SESERVICEHELPER_H_
 
-/* standard library header */
 #include <vector>
 
-/* SLP library header */
-
-/* local header */
 #include "Synchronous.h"
 #include "ReaderHelper.h"
 
@@ -30,7 +26,7 @@ using namespace std;
 
 namespace smartcard_service_api
 {
-       class SEServiceHelper : public Synchronous
+       class EXPORT SEServiceHelper : public Synchronous
        {
        protected:
                vector<ReaderHelper *> readers;

diff --git a/common/include/Serializable.h b/common/include/Serializable.h
index a138cd6..aaf9b75 100644 (file)
--- a/common/include/Serializable.h
+++ b/common/include/Serializable.h
@@ -21,7 +21,7 @@
 
 namespace smartcard_service_api
 {
-       class Serializable
+       class EXPORT Serializable
        {
                virtual const ByteArray serialize() const = 0;
                virtual void deserialize(const ByteArray &buffer) = 0;

diff --git a/common/include/SessionHelper.h b/common/include/SessionHelper.h
index ead9c47..b1a33c1 100644 (file)
--- a/common/include/SessionHelper.h
+++ b/common/include/SessionHelper.h
@@ -17,12 +17,8 @@
 #ifndef SESSIONHELPER_H_
 #define SESSIONHELPER_H_
 
-/* standard library header */
 #include <vector>
 
-/* SLP library header */
-
-/* local header */
 #include "Synchronous.h"
 #include "ByteArray.h"
 #include "Channel.h"
@@ -38,7 +34,7 @@ namespace smartcard_service_api
        typedef void (*closeSessionCallback)(int error, void *userData);
        typedef void (*getChannelCountCallback)(unsigned count, int error, void *userData);
 
-       class SessionHelper : public Synchronous
+       class EXPORT SessionHelper : public Synchronous
        {
        protected:
                ReaderHelper *reader;

diff --git a/common/include/SignatureHelper.h b/common/include/SignatureHelper.h
index 0595ba0..9644d9b 100644 (file)
--- a/common/include/SignatureHelper.h
+++ b/common/include/SignatureHelper.h
@@ -17,18 +17,13 @@
 #ifndef SIGNATUREHELPER_H_
 #define SIGNATUREHELPER_H_
 
-/* standard library header */
 #ifdef __cplusplus
 #include <vector>
+#include "ByteArray.h"
 #endif /* __cplusplus */
 
-/* SLP library header */
-
-/* local header */
 #include "smartcard-types.h"
-#ifdef __cplusplus
-#include "ByteArray.h"
-#endif /* __cplusplus */
+#include "Debug.h"
 
 #ifdef __cplusplus
 using namespace std;

diff --git a/common/include/Terminal.h b/common/include/Terminal.h
index 3cfc912..f55cbb7 100644 (file)
--- a/common/include/Terminal.h
+++ b/common/include/Terminal.h
@@ -17,11 +17,6 @@
 #ifndef TERMINAL_H_
 #define TERMINAL_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "ByteArray.h"
 #include "Synchronous.h"
 
@@ -32,7 +27,7 @@ namespace smartcard_service_api
        typedef void (*terminalTransmitCallback)(const unsigned char *buffer, unsigned int length, int error, void *userParam);
        typedef void (*terminalGetATRCallback)(const unsigned char *buffer, unsigned int length, int error, void *userParam);
 
-       class Terminal : public Synchronous
+       class EXPORT Terminal : public Synchronous
        {
        protected:
                terminalNotificationCallback statusCallback;

diff --git a/common/include/TerminalInterface.h b/common/include/TerminalInterface.h
index 311b43a..47d7171 100644 (file)
--- a/common/include/TerminalInterface.h
+++ b/common/include/TerminalInterface.h
@@ -17,12 +17,6 @@
 #ifndef TERMINALINTERFACE_H_
 #define TERMINALINTERFACE_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
-
 //typedef unsigned int terminal_handle_h;
 //
 //typedef enum

diff --git a/common/smartcard-service-common.pc.in b/common/smartcard-service-common.pc.in
index 733efdf..7eba9e2 100644 (file)
--- a/common/smartcard-service-common.pc.in
+++ b/common/smartcard-service-common.pc.in
@@ -6,6 +6,6 @@ includedir=@INCLUDE_INSTALL_DIR@/@COMMON_LIB@
 Name: @COMMON_LIB@
 Description: Common library of Smartcard service
 Version: @FULLVER@
-Requires: glib-2.0
+Requires: glib-2.0 dlog
 Libs: -L${libdir} -l@COMMON_LIB@
 Cflags: -I${includedir}

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index dcab8cb..c9866a0 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -4,7 +4,7 @@
 
 Name:       smartcard-service
 Summary:    Smartcard Service
-Version:    0.1.27
+Version:    0.1.28
 Release:    0
 Group:      Network & Connectivity/Service
 License:    Apache-2.0

diff --git a/server/ClientInstance.cpp b/server/ClientInstance.cpp
index 4e60be7..730948f 100644 (file)
--- a/server/ClientInstance.cpp
+++ b/server/ClientInstance.cpp
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <pthread.h>
 
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "ClientInstance.h"
 #include "ServerResource.h"

diff --git a/server/ServerChannel.cpp b/server/ServerChannel.cpp
index a77406d..daedefc 100644 (file)
--- a/server/ServerChannel.cpp
+++ b/server/ServerChannel.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Debug.h"
 #include "ServerChannel.h"
 #include "APDUHelper.h"

diff --git a/server/ServerGDBus.cpp b/server/ServerGDBus.cpp
index 6a26095..050b8db 100644 (file)
--- a/server/ServerGDBus.cpp
+++ b/server/ServerGDBus.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-/* standard library header */
 #include <unistd.h>
 #include <glib.h>
 #include <gio/gio.h>
@@ -22,12 +21,10 @@
 #include <string>
 #include <sys/socket.h>
 
-/* SLP library header */
 #ifdef USER_SPACE_SMACK
 #include "security-server.h"
 #endif
 
-/* local header */
 #include "smartcard-types.h"
 #include "Debug.h"
 #include "ByteArray.h"

diff --git a/server/include/ClientInstance.h b/server/include/ClientInstance.h
index 25a0bfc..ca777fb 100644 (file)
--- a/server/include/ClientInstance.h
+++ b/server/include/ClientInstance.h
@@ -17,14 +17,10 @@
 #ifndef CLIENTINSTANCE_H_
 #define CLIENTINSTANCE_H_
 
-/* standard library header */
 #include <map>
 #include <vector>
 #include <string>
 
-/* SLP library header */
-
-/* local header */
 #include "ServiceInstance.h"
 
 namespace smartcard_service_api

diff --git a/server/include/ServerChannel.h b/server/include/ServerChannel.h
index 1df1576..6102f2a 100644 (file)
--- a/server/include/ServerChannel.h
+++ b/server/include/ServerChannel.h
@@ -17,11 +17,6 @@
 #ifndef SERVERCHANNEL_H_
 #define SERVERCHANNEL_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
 #include "Channel.h"
 #include "Terminal.h"
 #include "ServerSession.h"

diff --git a/server/include/ServerGDBus.h b/server/include/ServerGDBus.h
index 9a29246..96def07 100644 (file)
--- a/server/include/ServerGDBus.h
+++ b/server/include/ServerGDBus.h
@@ -17,14 +17,10 @@
 #ifndef SERVERGDBUS_H_
 #define SERVERGDBUS_H_
 
-/* standard library header */
 #include <glib.h>
 #include <queue>
 #include <vector>
 
-/* SLP library header */
-
-/* local header */
 #include "Synchronous.h"
 #include "GDBusHelper.h"
 #include "smartcard-service-gdbus.h"