Fixed simple fixes according to static code analysis for resource-container

- Prohibit implicit copy-contructor and assignment operator for certain classes.
- Update copyright note

Change-Id: I0893aa2a4de23832fb9d540128f106fd7b45bafa
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4489
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h b/service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h
index c35facf..e264962 100644 (file)
--- a/service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h
+++ b/service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h
@@ -31,6 +31,8 @@ class BMISensorResource : public SoftSensorResource
 {
     public:
         BMISensorResource();
+        BMISensorResource(const BMISensorResource &other)=delete;
+        BMISensorResource& operator=( const BMISensorResource& rhs )=delete;
         ~BMISensorResource();
 
         virtual void handleSetAttributesRequest(RCSResourceAttributes &attrs);

diff --git a/service/resource-container/examples/ContainerSample.cpp b/service/resource-container/examples/ContainerSample.cpp
index 5d029b9..e223629 100644 (file)
--- a/service/resource-container/examples/ContainerSample.cpp
+++ b/service/resource-container/examples/ContainerSample.cpp
@@ -33,12 +33,11 @@ using OC::oc_log_stream;
 
 #define MAX_PATH 2048
 
-/* Annother way to create a context: */
+/* Another way to create a context: */
 auto info_logger = []() -> boost::iostreams::stream<OC::oc_log_stream> &
 {
     static OC::oc_log_stream ols(oc_make_ostream_logger);
     static boost::iostreams::stream<OC::oc_log_stream> os(ols);
-
     return os;
 };
 

diff --git a/service/resource-container/examples/ContainerSampleClient.cpp b/service/resource-container/examples/ContainerSampleClient.cpp
index cc97d1d..e7ce3f3 100644 (file)
--- a/service/resource-container/examples/ContainerSampleClient.cpp
+++ b/service/resource-container/examples/ContainerSampleClient.cpp
@@ -1,6 +1,6 @@
 //******************************************************************
 //
-// Copyright 2014 Intel Mobile Communications GmbH All Rights Reserved.
+// Copyright 2015 Samsung Electronics All Rights Reserved.
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 //
@@ -18,8 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-// OCClient.cpp : Defines the entry point for the console application.
-//
+
 #include <string>
 #include <map>
 #include <cstdlib>
@@ -204,7 +203,7 @@ void postLightRepresentation(std::shared_ptr<OCResource> resource)
 
         std::cout << "Posting light representation..." << std::endl;
 
-        mylight.m_on_off = "false";
+        mylight.m_on_off = false;
 
         rep.setValue("on-off", mylight.m_on_off);
 

diff --git a/service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h b/service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h
index 6780715..583094e 100644 (file)
--- a/service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h
+++ b/service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h
@@ -32,6 +32,8 @@ class DiscomfortIndexSensorResource : public SoftSensorResource
     public:
         DiscomfortIndexSensorResource();
         ~DiscomfortIndexSensorResource();
+        DiscomfortIndexSensorResource(const DiscomfortIndexSensorResource &other)=delete;
+        DiscomfortIndexSensorResource& operator=( const DiscomfortIndexSensorResource& rhs )=delete;
 
         virtual void handleSetAttributesRequest(RCSResourceAttributes &attrs);
 

diff --git a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp
index bc65a4e..d51febb 100644 (file)
--- a/service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp
+++ b/service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp
@@ -90,4 +90,4 @@ void DiscomfortIndexSensorResource::onUpdatedInputResource(const std::string att
     {
         executeLogic();
     }
-}
\ No newline at end of file
+}

diff --git a/service/resource-container/src/DiscoverResourceUnit.cpp b/service/resource-container/src/DiscoverResourceUnit.cpp
index 1d515f1..a4ec65c 100644 (file)
--- a/service/resource-container/src/DiscoverResourceUnit.cpp
+++ b/service/resource-container/src/DiscoverResourceUnit.cpp
@@ -177,4 +177,4 @@ bool DiscoverResourceUnit::isAlreadyDiscoveredResource(
         }
     }
     return false;
-}
\ No newline at end of file
+}

diff --git a/service/resource-container/src/DiscoverResourceUnit.h b/service/resource-container/src/DiscoverResourceUnit.h
index 227c1a7..b6635ed 100644 (file)
--- a/service/resource-container/src/DiscoverResourceUnit.h
+++ b/service/resource-container/src/DiscoverResourceUnit.h
@@ -60,6 +60,8 @@ namespace OIC
                 typedef RemoteResourceUnit::UPDATE_MSG REMOTE_MSG;
 
                 DiscoverResourceUnit(const std::string &bundleId);
+                DiscoverResourceUnit(const DiscoverResourceUnit &other)=delete;
+                DiscoverResourceUnit& operator=( const DiscoverResourceUnit& rhs )=delete;
                 ~DiscoverResourceUnit();
 
                 void startDiscover(DiscoverResourceInfo info, UpdatedCB updatedCB);