fix SVACE issues

 - PROC_PAR_BIG ( pass by value => pass by pointer )
 - ResourceHandle

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ie5ef4c147f6da1647a082d84c1d71b7c167da9ee

diff --git a/daemon/discovery_provider/IotconDiscoveryProvider.cpp b/daemon/discovery_provider/IotconDiscoveryProvider.cpp
index 4a77f3d12dc2f28ff4114d33ab9f428a1ac58b06..e79ead3265af9df31609a1a9f27a7cdf955de696 100755 (executable)
--- a/daemon/discovery_provider/IotconDiscoveryProvider.cpp
+++ b/daemon/discovery_provider/IotconDiscoveryProvider.cpp
@@ -186,7 +186,7 @@ void conv::IotconDiscoveryProvider::__on_response_get(iotcon_remote_resource_h r
                                                                        , deviceId, deviceName, device_type, version, service_list);
 
        if (__discoveryManager != NULL) {
-               DeviceAdapter*  device = new(std::nothrow) DeviceAdapter (cur_resource_h);
+               DeviceAdapter*  device = new(std::nothrow) DeviceAdapter (&cur_resource_h);
 
                int num_service = service_list_json.getArraySize(NULL, "service_list");
                for (int index = 0; index < num_service; index++) {
@@ -199,7 +199,7 @@ void conv::IotconDiscoveryProvider::__on_response_get(iotcon_remote_resource_h r
                                continue;
                        }
 
-                       ServiceAdapter* serv = new(std::nothrow) ServiceAdapter(cur_resource_h);
+                       ServiceAdapter* serv = new(std::nothrow) ServiceAdapter(&cur_resource_h);
                        Json serv_info_json;
 
                        cur_service_json.get(NULL, CONV_JSON_DISCOVERY_SERVICE_TYPE, &serv_type_int);

diff --git a/daemon/discovery_provider/iotcon/DeviceAdapter.cpp b/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
index 4fd27c5ebd1ff36e51810863ff424bedaa904ad7..128d716b6a029cb6bd7f75955d270b100012f974 100755 (executable)
--- a/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
+++ b/daemon/discovery_provider/iotcon/DeviceAdapter.cpp
@@ -20,7 +20,7 @@
 
 using namespace std;
 
-conv::DeviceAdapter::DeviceAdapter(ResourceHandle resourceHandle)
+conv::DeviceAdapter::DeviceAdapter(ResourceHandle *resourceHandle)
 {
        this->m_resource_h = resourceHandle;
 }
@@ -61,22 +61,22 @@ int conv::DeviceAdapter::removeService(IService* serviceObj)
 
 string conv::DeviceAdapter::getName()
 {
-       return m_resource_h.getDeviceName();
+       return m_resource_h->getDeviceName();
 }
 
 string conv::DeviceAdapter::getId()
 {
-       return m_resource_h.getDeviceId();
+       return m_resource_h->getDeviceId();
 }
 
 string conv::DeviceAdapter::getAddress()
 {
-       return m_resource_h.getHostAddress();
+       return m_resource_h->getHostAddress();
 }
 
 string conv::DeviceAdapter::getType()
 {
-       return m_resource_h.getDeviceType();
+       return m_resource_h->getDeviceType();
 }
 
 int conv::DeviceAdapter::getServiceList(std::list<IService*> *list)
@@ -89,6 +89,6 @@ int conv::DeviceAdapter::getServiceList(std::list<IService*> *list)
 
 int conv::DeviceAdapter::setAddress(string id)
 {
-       m_resource_h.setHostAddress(id);
+       m_resource_h->setHostAddress(id);
        return CONV_ERROR_NONE;
 }

diff --git a/daemon/discovery_provider/iotcon/DeviceAdapter.h b/daemon/discovery_provider/iotcon/DeviceAdapter.h
old mode 100644 (file)
new mode 100755 (executable)
index e427d52..d7844d7
--- a/daemon/discovery_provider/iotcon/DeviceAdapter.h
+++ b/daemon/discovery_provider/iotcon/DeviceAdapter.h
@@ -26,7 +26,7 @@ namespace conv {
        class DeviceAdapter : public IDevice {
                public :
                        typedef std::list<IService*> service_list_t;
-                       DeviceAdapter(ResourceHandle res_h);
+                       DeviceAdapter(ResourceHandle *res_h);
                        ~DeviceAdapter();
 
                        int addService(IService* serviceObj);
@@ -39,7 +39,7 @@ namespace conv {
                        int setAddress(std::string host_address);
 
                private :
-                       ResourceHandle  m_resource_h;
+                       ResourceHandle  *m_resource_h;
                        service_list_t service_list;
        };
 }

diff --git a/daemon/discovery_provider/iotcon/ServiceAdapter.cpp b/daemon/discovery_provider/iotcon/ServiceAdapter.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8a8b7d8..a710200
--- a/daemon/discovery_provider/iotcon/ServiceAdapter.cpp
+++ b/daemon/discovery_provider/iotcon/ServiceAdapter.cpp
@@ -18,7 +18,7 @@
 
 using namespace std;
 
-conv::ServiceAdapter::ServiceAdapter(ResourceHandle resourceHandle)
+conv::ServiceAdapter::ServiceAdapter(ResourceHandle *resourceHandle)
 {
        this->m_resource_h = resourceHandle;
 }
@@ -29,28 +29,28 @@ conv::ServiceAdapter::~ServiceAdapter()
 
 string conv::ServiceAdapter::getName()
 {
-       return m_resource_h.getDeviceName();
+       return m_resource_h->getDeviceName();
 }
 
 string conv::ServiceAdapter::getVersion()
 {
-       return m_resource_h.getVersion();
+       return m_resource_h->getVersion();
 }
 
 string conv::ServiceAdapter::getType()
 {
-       return m_resource_h.getDeviceType();
+       return m_resource_h->getDeviceType();
 }
 
 string conv::ServiceAdapter::getId()
 {
-       return m_resource_h.getDeviceId();
+       return m_resource_h->getDeviceId();
 }
 
 string conv::ServiceAdapter::getUri()
 {
-       string uri_path = m_resource_h.getUriPath();
-       string host_address = m_resource_h.getHostAddress();
+       string uri_path = m_resource_h->getUriPath();
+       string host_address = m_resource_h->getHostAddress();
 
        return host_address + uri_path;
 }

diff --git a/daemon/discovery_provider/iotcon/ServiceAdapter.h b/daemon/discovery_provider/iotcon/ServiceAdapter.h
index 111d076b4cf310d0b27b987cce49246fd1e6a787..a7bd96715e1a20bb54db8e982ab7cdc3ce10f640 100755 (executable)
--- a/daemon/discovery_provider/iotcon/ServiceAdapter.h
+++ b/daemon/discovery_provider/iotcon/ServiceAdapter.h
@@ -24,7 +24,7 @@ namespace conv {
 
        class ServiceAdapter : public IService {
                public:
-                       ServiceAdapter(ResourceHandle resourceHandle);
+                       ServiceAdapter(ResourceHandle *resourceHandle);
                        ~ServiceAdapter();
 
                        string getName();
@@ -39,7 +39,7 @@ namespace conv {
                        int             setServiceInfo(string serviceInfo);
 
                private:
-                       ResourceHandle  m_resource_h;
+                       ResourceHandle  *m_resource_h;
 
                        int service_type = 0;
                        string __serviceInfo;