[Mobile/Tv]remove complie warning
authorbg.chun <bg.chun@samsung.com>
Mon, 18 Jan 2016 08:22:28 +0000 (17:22 +0900)
committerbg.chun <bg.chun@samsung.com>
Mon, 18 Jan 2016 09:57:53 +0000 (18:57 +0900)
src/common/GDBus/gdbus_powerwrapper.cc
-change order of initalize list

src/systeminfo/systeminfo_properties_manager.cc
-add #ifdef Preprocessor directives

src/tool/desc_gentool.cc
-remove unused ptr

Change-Id: Id40a2df4f7e24e485fcc760a04974f6bfd893d9c
Signed-off-by: bg.chun <bg.chun@samsung.com>
src/common/GDBus/gdbus_powerwrapper.cc
src/systeminfo/systeminfo_properties_manager.cc
src/tool/desc_gentool.cc

index 392418a3db5b9c0b5ab7312fee362636e554ef3b..7b11d10ee76308871caf5a4809796980499af9b3 100644 (file)
@@ -49,10 +49,10 @@ GDBusPowerWrapper::GDBusPowerWrapper(const std::string &bus_name,
                                      const std::string &object_path,
                                      GBusType bus_type,
                                      GDBusProxyFlags bus_proxy_flags)
-    : bus_name_(bus_name),
-      object_path_(object_path),
-      bus_type_(bus_type),
+    : bus_type_(bus_type),
       bus_proxy_flags_(bus_proxy_flags),
+      bus_name_(bus_name),
+      object_path_(object_path),
       proxy_(nullptr),
       err_(new GDBusWrapperError()) {}
 
index a4f85e851e10e1602a86efaab774fc6ae5a69f56..5ba530da50d2f8261986a22b98b6dd13da5b4d04 100644 (file)
@@ -1176,6 +1176,7 @@ static void CreateStorageInfo(const std::string& type, struct statfs& fs, picojs
   out->insert(std::make_pair("isRemovable", picojson::value(isRemovable)));
 }
 
+#ifdef TIZEN_TV
 static std::string FromStorageTypeToStringType(common::StorageType type) {
   switch(type) {
     case common::StorageType::kUsbDevice:
@@ -1188,10 +1189,10 @@ static std::string FromStorageTypeToStringType(common::StorageType type) {
       return kTypeUnknown;
   }
 }
+#endif
 
 PlatformResult SysteminfoPropertiesManager::ReportStorage(picojson::object* out) {
   LoggerD("Entered");
-  int sdcardState = 0;
   struct statfs fs;
 
   picojson::value result = picojson::value(picojson::array());
@@ -1226,6 +1227,7 @@ PlatformResult SysteminfoPropertiesManager::ReportStorage(picojson::object* out)
     }
   }
 #else
+  int sdcardState = 0;
   if (0 == vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &sdcardState)) {
     if (VCONFKEY_SYSMAN_MMC_MOUNTED == sdcardState){
       if (statfs(kStorageSdcardPath.c_str(), &fs) < 0) {
index 3cc9d81699e703bf4dd2906f1601b375e2a5abf6..b06db7b669fea9f38beb361389efe85420cf6686 100644 (file)
@@ -174,7 +174,6 @@ int main(int argc, char* argv[]) {
           !fname.compare(fname.size() - postfix_.size(), postfix_.size(),
                         postfix_)) {
         std::string so_path = tec_path + "/" + fname;
-        char* error;
         void *handle = dlopen(so_path.c_str(), RTLD_LAZY);
         if (handle == NULL) {
           std::cerr << "cannot open " << so_path << std::endl;