From: jihwan.seo Date: Tue, 7 Feb 2017 22:45:44 +0000 (+0900) Subject: replace parameter name in setDevAddr X-Git-Tag: 1.3.0~672 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2cd7832994145fe983c634a50448407f8205e8c;p=platform%2Fupstream%2Fiotivity.git replace parameter name in setDevAddr Change-Id: I78a46e9c8be9f844277f6ccc9ac6820a69e75047 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/17097 Reviewed-by: Jaehong Jo Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- diff --git a/resource/src/OCRepresentation.cpp b/resource/src/OCRepresentation.cpp index edbb756..cd08b8b 100644 --- a/resource/src/OCRepresentation.cpp +++ b/resource/src/OCRepresentation.cpp @@ -631,14 +631,14 @@ namespace OC m_children = children; } - void OCRepresentation::setDevAddr(const OCDevAddr& m_devAddr) + void OCRepresentation::setDevAddr(const OCDevAddr& devAddr) { std::ostringstream ss; - if (m_devAddr.flags & OC_SECURE) + if (devAddr.flags & OC_SECURE) { ss << COAPS; } - else if (m_devAddr.adapter & OC_ADAPTER_TCP) + else if (devAddr.adapter & OC_ADAPTER_TCP) { ss << COAP_TCP; } @@ -646,13 +646,13 @@ namespace OC { ss << COAP; } - if (m_devAddr.flags & OC_IP_USE_V6) + if (devAddr.flags & OC_IP_USE_V6) { char addressEncoded[128] = {0}; OCStackResult result = OCEncodeAddressForRFC6874(addressEncoded, sizeof(addressEncoded), - m_devAddr.addr); + devAddr.addr); if (OC_STACK_OK != result) { throw OC::OCException("Invalid address in setDevAddr"); @@ -661,11 +661,11 @@ namespace OC } else { - ss << m_devAddr.addr; + ss << devAddr.addr; } - if (m_devAddr.port) + if (devAddr.port) { - ss << ':' << m_devAddr.port; + ss << ':' << devAddr.port; } m_host = ss.str(); }