Modify the log message

- Change the log tag name
- Use the defined log format in dlog.h

Change-Id: Icbc548b191b16b20e1dcb28c609c7fb1884b9521

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 34bd28f..08f2b32 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -47,7 +47,7 @@ MESSAGE("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-DLOG_TAG=\"SCARD_CLIENT\"")
+ADD_DEFINITIONS("-DLOG_TAG=\"SMARTCARD_SERVICE_CLIENT\"")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index c8015c0..4b36681 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -46,7 +46,7 @@ MESSAGE("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 ADD_DEFINITIONS("-DUSE_UNIX_DOMAIN")
-ADD_DEFINITIONS("-DLOG_TAG=\"SCARD_COMMON\"")
+ADD_DEFINITIONS("-DLOG_TAG=\"SMARTCARD_SERVICE_COMMON\"")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 

diff --git a/common/include/Debug.h b/common/include/Debug.h
index c5e2a77..d8818c0 100644 (file)
--- a/common/include/Debug.h
+++ b/common/include/Debug.h
@@ -37,25 +37,25 @@
 #define SCARD_DEBUG(fmt, ...)\
        do\
        {\
-               LOGD("[%s(): %d] " fmt, __FUNCTION__, __LINE__,##__VA_ARGS__);\
+               LOGD(fmt, ##__VA_ARGS__);\
        } while (0)
 
 #define SCARD_DEBUG_ERR(fmt, ...)\
        do\
        {\
-               LOGE(COLOR_RED"[%s(): %d] " fmt COLOR_END, __FUNCTION__, __LINE__,##__VA_ARGS__);\
+               LOGE(COLOR_RED fmt COLOR_END, ##__VA_ARGS__);\
        }while (0)
 
 #define SCARD_BEGIN() \
        do\
     {\
-               LOGD(COLOR_BLUE"[%s(): %d] BEGIN >>>>"COLOR_END, __FUNCTION__ ,__LINE__);\
+               LOGD(COLOR_BLUE"BEGIN >>>>"COLOR_END);\
     } while( 0 )
 
 #define SCARD_END() \
        do\
     {\
-               LOGD(COLOR_BLUE"[%s(): %d] END <<<<"COLOR_END, __FUNCTION__,__LINE__ );\
+               LOGD(COLOR_BLUE"END <<<<"COLOR_END);\
     } \
     while( 0 )
 

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index a178765..548e1ca 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -46,7 +46,7 @@ IF("${ARCH}" MATCHES "^arm.*")
 ENDIF()
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-ADD_DEFINITIONS("-DLOG_TAG=\"SCARD_SERVER\"")
+ADD_DEFINITIONS("-DLOG_TAG=\"SMARTCARD_SERVICE_SERVER\"")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 
@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_server_LDFLAGS} "-L../common" "-lsm
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 IF("${USE_AUTOSTART}" STREQUAL "1")
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/smartcard-service.service DESTINATION share/dbus-1/services)
-ENDIF()
\ No newline at end of file
+ENDIF()

diff --git a/test-client/CMakeLists.txt b/test-client/CMakeLists.txt
index 55e4724..27ae818 100644 (file)
--- a/test-client/CMakeLists.txt
+++ b/test-client/CMakeLists.txt
@@ -41,7 +41,7 @@ ENDIF()
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 #ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-DLOG_TAG=\"SCARD_TEST\"")
+ADD_DEFINITIONS("-DLOG_TAG=\"SMARTCARD_SERVICE_TEST\"")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_test_client_LDFLAGS} "-L../common" "-lsmartcard-service-common" "-L../client" "-lsmartcard-service" "-pie -ldl")