minor cleanup

fix some typo and remove unused code

Change-Id: Id97004d4ade1f317894af7db6c6466b639094c92

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9aa1f35194f24c2242ecc950c8d6e1e85fdb4bfd..6095b0112930d16809046457e5f08cda4744b820 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 SET(EXTRA_FLAGS "-Wall -Werror -fvisibility=hidden")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_FLAGS}")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS} -std=c++11")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b506fbd03db79bea9f236a97385aca17024e51cd..ae93c0cbe8397edfc3c9034a3ee861b7b36cc71a 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -12,7 +12,7 @@ ADD_DEFINITIONS("-DMDS_CLIENT")
 
 ADD_LIBRARY(${CLIENT} SHARED ${CLIENT_SRCS})
 ADD_DEPENDENCIES(${CLIENT} GENERATED_DBUS_CODE)
-TARGET_LINK_LIBRARIES(${CLIENT}        ${client_pkgs_LIBRARIES})
+TARGET_LINK_LIBRARIES(${CLIENT} ${client_pkgs_LIBRARIES})
 SET_TARGET_PROPERTIES(${CLIENT} PROPERTIES VERSION ${FULLVER} SOVERSION ${MAJORVER})
 INSTALL(TARGETS ${CLIENT} DESTINATION ${LIB_INSTALL_DIR})
 

diff --git a/common/log.h b/common/log.h
index e6b17469ee4c0abaaa765a61b85cfbe784d98780..97badc63e71093154aaa5fa1ca77f2033aa1c8b5 100644 (file)
--- a/common/log.h
+++ b/common/log.h
@@ -21,11 +21,6 @@
 #define MDS_LOG_BLUE "\033[34m"
 #define MDS_LOG_END "\033[0m"
 
-#undef __DBG
-#undef __INFO
-#undef __WARN
-#undef __ERR
-
 #undef _DBG
 #undef _INFO
 #undef _WARN
@@ -40,66 +35,48 @@
 #include <stdio.h>
 #include <string.h>
 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
-#define __DBG(fmt, arg...) printf("[Modes]%s(%d):" fmt "\n", __FILENAME__, __LINE__, ##arg)
-#define __INFO(fmt, arg...) printf("[Modes]%s(%d):" fmt "\n", __FILENAME__, __LINE__, ##arg)
-#define __WARN(fmt, arg...) printf("[Modes]%s(%d):" fmt "\n", __FILENAME__, __LINE__, ##arg)
-#define __ERR(fmt, arg...) printf("[Modes]%s(%d):" fmt "\n", __FILENAME__, __LINE__, ##arg)
+#define _DBG(fmt, arg...) printf("[Modes]%s(%d):" fmt "\n", __FILENAME__, __LINE__, ##arg)
+#define _INFO(fmt, arg...) printf("[Modes]%s(%d):" fmt "\n", __FILENAME__, __LINE__, ##arg)
+#define _WARN(fmt, arg...) printf("[Modes]%s(%d):" fmt "\n", __FILENAME__, __LINE__, ##arg)
+#define _ERR(fmt, arg...) printf("[Modes]%s(%d):" fmt "\n", __FILENAME__, __LINE__, ##arg)
 #else
 #define LOG_TAG "MODES"
 #include <dlog.h>
-#define __DBG(fmt, arg...) SLOGD(fmt, ##arg)
-#define __INFO(fmt, arg...) SLOGI(fmt, ##arg)
-#define __WARN(fmt, arg...) SLOGW(fmt, ##arg)
-#define __ERR(fmt, arg...) SLOGE(fmt, ##arg)
+#define _DBG(fmt, arg...) SLOGD(fmt, ##arg)
+#define _INFO(fmt, arg...) SLOGI(fmt, ##arg)
+#define _WARN(fmt, arg...) SLOGW(fmt, ##arg)
+#define _ERR(fmt, arg...) SLOGE(fmt, ##arg)
+#define SECURE_DBG(fmt, arg...) SECURE_SLOGI(fmt, ##arg)
+#define SECURE_ERR(fmt, arg...) SECURE_SLOGE(fmt, ##arg)
 #endif /* MDS_STDOUT */
 
 
 #ifdef MDS_SUPERVISOR
-#define _DBG(fmt, arg...) __DBG(MDS_LOG_BROWN "<Daemon>" MDS_LOG_END fmt, ##arg)
-#define _INFO(fmt, arg...) __INFO(MDS_LOG_BLUE "<Daemon>" MDS_LOG_END fmt, ##arg)
-#define _WARN(fmt, arg...) __WARN(MDS_LOG_GREEN "<Daemon>" MDS_LOG_END fmt, ##arg)
-#define _ERR(fmt, arg...) __ERR(MDS_LOG_RED "<Daemon>" MDS_LOG_END fmt, ##arg)
+#define DBG(fmt, arg...) _DBG(MDS_LOG_BROWN "<Daemon>" MDS_LOG_END fmt, ##arg)
+#define INFO(fmt, arg...) _INFO(MDS_LOG_BLUE "<Daemon>" MDS_LOG_END fmt, ##arg)
+#define WARN(fmt, arg...) _WARN(MDS_LOG_GREEN "<Daemon>" MDS_LOG_END fmt, ##arg)
+#define ERR(fmt, arg...) _ERR(MDS_LOG_RED "<Daemon>" MDS_LOG_END fmt, ##arg)
 #elif defined(MDS_CLIENT)
-#define _DBG(fmt, arg...) __DBG(MDS_LOG_BROWN "<Client>" MDS_LOG_END fmt, ##arg)
-#define _INFO(fmt, arg...) __INFO(MDS_LOG_BLUE "<Client>" MDS_LOG_END fmt, ##arg)
-#define _WARN(fmt, arg...) __WARN(MDS_LOG_GREEN "<Client>" MDS_LOG_END fmt, ##arg)
-#define _ERR(fmt, arg...) __ERR(MDS_LOG_RED "<Client>" MDS_LOG_END fmt, ##arg)
+#define DBG(fmt, arg...) _DBG(MDS_LOG_BROWN "<Client>" MDS_LOG_END fmt, ##arg)
+#define INFO(fmt, arg...) _INFO(MDS_LOG_BLUE "<Client>" MDS_LOG_END fmt, ##arg)
+#define WARN(fmt, arg...) _WARN(MDS_LOG_GREEN "<Client>" MDS_LOG_END fmt, ##arg)
+#define ERR(fmt, arg...) _ERR(MDS_LOG_RED "<Client>" MDS_LOG_END fmt, ##arg)
 #elif defined(MDS_PLUGIN)
-#define _DBG(fmt, arg...) __DBG(MDS_LOG_BROWN "<Plugin>" MDS_LOG_END fmt, ##arg)
-#define _INFO(fmt, arg...) __INFO(MDS_LOG_BLUE "<Plugin>" MDS_LOG_END fmt, ##arg)
-#define _WARN(fmt, arg...) __WARN(MDS_LOG_GREEN "<Plugin>" MDS_LOG_END fmt, ##arg)
-#define _ERR(fmt, arg...) __ERR(MDS_LOG_RED "<Plugin>" MDS_LOG_END fmt, ##arg)
+#define DBG(fmt, arg...) _DBG(MDS_LOG_BROWN "<Plugin>" MDS_LOG_END fmt, ##arg)
+#define INFO(fmt, arg...) _INFO(MDS_LOG_BLUE "<Plugin>" MDS_LOG_END fmt, ##arg)
+#define WARN(fmt, arg...) _WARN(MDS_LOG_GREEN "<Plugin>" MDS_LOG_END fmt, ##arg)
+#define ERR(fmt, arg...) _ERR(MDS_LOG_RED "<Plugin>" MDS_LOG_END fmt, ##arg)
 #elif defined(MDS_TEST)
-#define _DBG(fmt, arg...) __DBG(MDS_LOG_BROWN "<Test>" MDS_LOG_END fmt, ##arg)
-#define _INFO(fmt, arg...) __INFO(MDS_LOG_BLUE "<Test>" MDS_LOG_END fmt, ##arg)
-#define _WARN(fmt, arg...) __WARN(MDS_LOG_GREEN "<Test>" MDS_LOG_END fmt, ##arg)
-#define _ERR(fmt, arg...) __ERR(MDS_LOG_RED "<Test>" MDS_LOG_END fmt, ##arg)
+#define DBG(fmt, arg...) _DBG(MDS_LOG_BROWN "<Test>" MDS_LOG_END fmt, ##arg)
+#define INFO(fmt, arg...) _INFO(MDS_LOG_BLUE "<Test>" MDS_LOG_END fmt, ##arg)
+#define WARN(fmt, arg...) _WARN(MDS_LOG_GREEN "<Test>" MDS_LOG_END fmt, ##arg)
+#define ERR(fmt, arg...) _ERR(MDS_LOG_RED "<Test>" MDS_LOG_END fmt, ##arg)
 #else
-#define _DBG(fmt, arg...) __DBG(fmt, ##arg)
-#define _INFO(fmt, arg...) __INFO(fmt, ##arg)
-#define _WARN(fmt, arg...) __WARN(fmt, ##arg)
-#define _ERR(fmt, arg...) __ERR(fmt, ##arg)
-#endif /* MDS_SUPERVISOR */
-
-#define MDS_DEBUGGING
-
-#ifdef MDS_DEBUGGING
 #define DBG(fmt, arg...) _DBG(fmt, ##arg)
+#define INFO(fmt, arg...) _INFO(fmt, ##arg)
 #define WARN(fmt, arg...) _WARN(fmt, ##arg)
 #define ERR(fmt, arg...) _ERR(fmt, ##arg)
-#define INFO(fmt, arg...) _INFO(fmt, ##arg)
-#define SECURE_DBG(fmt, arg...) SECURE_SLOGI(fmt, ##arg)
-#define SECURE_ERR(fmt, arg...) SECURE_SLOGE(fmt, ##arg)
-
-#else /* MDS_DEBUGGING */
-#define DBG(fmt, arg...)
-#define WARN(fmt, arg...)
-#define ERR(fmt, arg...)
-#define INFO(fmt, arg...)
-#define SECURE_DBG(fmt, arg...)
-#define SECURE_ERR(fmt, arg...)
-
-#endif /* MDS_DEBUGGING */
+#endif /* MDS_SUPERVISOR */
 
 #define RET_IF(expr) \
        do { \

diff --git a/packaging/modes.spec b/packaging/modes.spec
index c46c4f811e0e36af1790c25a2a09f9b530e45bc6..ae2815af7dcd5c51b216f896f93f883cffd234ea 100644 (file)
--- a/packaging/modes.spec
+++ b/packaging/modes.spec
@@ -23,6 +23,7 @@ BuildRequires: pkgconfig(cynara-session)
 #For changing owner/group
 Requires: security-config
 %if 0%{?gcov:1}
+BuildRequires: tar
 BuildRequires: lcov
 %endif
 
@@ -80,7 +81,6 @@ The %{name}-gcov pacakge contains gcov objects
 
 %prep
 %setup -q
-chmod g-w %_sourcedir/*
 cp %{SOURCE1001} ./%{name}.manifest
 
 %build

diff --git a/schema/tizen_action_rule.xsd b/schema/tizen_action_rule.xsd
index f664ba9d78cbaaa4bc69a89f9e899a2a70a5a94c..2fe7127ae00b0b9ee4d9df85fddb5ff7f660e0bd 100644 (file)
--- a/schema/tizen_action_rule.xsd
+++ b/schema/tizen_action_rule.xsd
@@ -10,7 +10,7 @@
               <xs:element maxOccurs="unbounded" name="rule">
                 <xs:complexType>
                   <xs:sequence>
-                    <xs:element minOccurs="0" maxOccurs="unbounded" name="privilege" type="xs:string"/>
+                    <xs:element minOccurs="0" maxOccurs="unbounded" name="privilege" type="xs:string" />
                     <xs:element minOccurs="0" name="conflict" type="xs:string" />
                     <xs:element minOccurs="0" maxOccurs="unbounded" name="alias">
                       <xs:complexType>
@@ -31,8 +31,8 @@
                   <xs:attribute name="life" use="optional">
                     <xs:simpleType>
                       <xs:restriction base="xs:string">
-                        <xs:enumeration value="permanent"/>
-                        <xs:enumeration value="volatile"/>
+                        <xs:enumeration value="permanent" />
+                        <xs:enumeration value="volatile" />
                       </xs:restriction>
                     </xs:simpleType>
                   </xs:attribute>
@@ -47,32 +47,32 @@
   </xs:element>
   <xs:simpleType name="domainT">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="App Framework"/>
-      <xs:enumeration value="Applications"/>
-      <xs:enumeration value="Broadcasting"/>
-      <xs:enumeration value="Documents"/>
-      <xs:enumeration value="Dotnet"/>
-      <xs:enumeration value="Graphics System"/>
-      <xs:enumeration value="Machine Learning"/>
-      <xs:enumeration value="Multimedia"/>
-      <xs:enumeration value="Network &amp; Connectivity"/>
-      <xs:enumeration value="SCM"/>
-      <xs:enumeration value="SDK"/>
-      <xs:enumeration value="Security"/>
-      <xs:enumeration value="Service Framework"/>
-      <xs:enumeration value="System"/>
-      <xs:enumeration value="Testing"/>
-      <xs:enumeration value="TinyAra"/>
-      <xs:enumeration value="UI Framework"/>
-      <xs:enumeration value="Web Framework"/>
+      <xs:enumeration value="App Framework" />
+      <xs:enumeration value="Applications" />
+      <xs:enumeration value="Broadcasting" />
+      <xs:enumeration value="Documents" />
+      <xs:enumeration value="Dotnet" />
+      <xs:enumeration value="Graphics System" />
+      <xs:enumeration value="Machine Learning" />
+      <xs:enumeration value="Multimedia" />
+      <xs:enumeration value="Network &amp; Connectivity" />
+      <xs:enumeration value="SCM" />
+      <xs:enumeration value="SDK" />
+      <xs:enumeration value="Security" />
+      <xs:enumeration value="Service Framework" />
+      <xs:enumeration value="System" />
+      <xs:enumeration value="Testing" />
+      <xs:enumeration value="TinyAra" />
+      <xs:enumeration value="UI Framework" />
+      <xs:enumeration value="Web Framework" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="basicTypeT">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="int"/>
-      <xs:enumeration value="float"/>
-      <xs:enumeration value="bool"/>
-      <xs:enumeration value="string"/>
+      <xs:enumeration value="int" />
+      <xs:enumeration value="float" />
+      <xs:enumeration value="bool" />
+      <xs:enumeration value="string" />
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5151dc01b68d15bd1f354d9cacadad5887ad2f66..eb2523543baf8515e4413bbd300f9527170ddcd4 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,7 +5,8 @@ ADD_DEFINITIONS("-DMDS_TEST")
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/common/dbus.c
     PROPERTIES GENERATED TRUE)
 
-pkg_check_modules(gtest_pkgs REQUIRED dlog glib-2.0 gio-2.0 gio-unix-2.0 libxml-2.0 gmock cynara-client cynara-creds-gdbus cynara-session)
+pkg_check_modules(gtest_pkgs REQUIRED dlog glib-2.0 gio-2.0 gio-unix-2.0 libxml-2.0
+       gmock cynara-client cynara-creds-gdbus cynara-session)
 INCLUDE_DIRECTORIES(${gtest_pkgs_INCLUDE_DIRS})
 LINK_DIRECTORIES(${gtest_pkgs_LIBRARY_DIRS})