From: Markus Jung Date: Thu, 10 Dec 2015 07:18:30 +0000 (+0900) Subject: Fixed simple fixes according to static code analysis for resource-container X-Git-Tag: 1.0.1~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbb4e358647d812cbbf6c9474c49ce88048dcb17;p=contrib%2Fiotivity.git 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 Reviewed-on: https://gerrit.iotivity.org/gerrit/4505 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- diff --git a/service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h b/service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h index c35facf..e264962 100644 --- 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 --- 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 & { static OC::oc_log_stream ols(oc_make_ostream_logger); static boost::iostreams::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 --- 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 #include #include @@ -204,7 +203,7 @@ void postLightRepresentation(std::shared_ptr 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 --- 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 --- 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.h b/service/resource-container/src/DiscoverResourceUnit.h index 227c1a7..b6635ed 100644 --- 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);