X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Fsamples%2Ftizen%2FSimpleClientServer%2Focclient.cpp;h=a128a73a6fd25e8e4dc582b304758b5db8c55702;hb=390866079e285d2c74918432c0d597d5da52f8a0;hp=d690cd4d25571f26456d9afdf99b65284a96a640;hpb=3e9402ad71cb3e93266a77796f44d17bab9853fd;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/occlient.cpp b/resource/csdk/stack/samples/tizen/SimpleClientServer/occlient.cpp index d690cd4..a128a73 100644 --- a/resource/csdk/stack/samples/tizen/SimpleClientServer/occlient.cpp +++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/occlient.cpp @@ -232,7 +232,7 @@ OCStackApplicationResult deleteReqCB(void *ctx, if(clientResponse) { cout << "\nStackResult: " << getResult(clientResponse->result); - //OC_LOG_PAYLOAD(INFO, clientResponse->payload); + //OIC_LOG_PAYLOAD(INFO, clientResponse->payload); } else { @@ -257,7 +257,7 @@ OCStackApplicationResult getReqCB(void* ctx, OCDoHandle /*handle*/, cout << "\nStackResult: " << getResult(clientResponse->result); cout << "\nSEQUENCE NUMBER: " << clientResponse->sequenceNumber; - //OC_LOG_PAYLOAD(INFO, TAG, clientResponse->payload); + //OIC_LOG_PAYLOAD(INFO, TAG, clientResponse->payload); if (clientResponse->numRcvdVendorSpecificHeaderOptions > 0) { @@ -288,7 +288,7 @@ OCStackApplicationResult obsReqCB(void* ctx, OCDoHandle /*handle*/, cout << "\nStackResult: " << getResult(clientResponse->result); cout << "\nSEQUENCE NUMBER: " << clientResponse->sequenceNumber; cout << "\nCallback Context for OBSERVE notification recvd successfully "; - //OC_LOG_PAYLOAD(INFO, clientResponse->payload); + //OIC_LOG_PAYLOAD(INFO, clientResponse->payload); gNumObserveNotifies++; if (gNumObserveNotifies == 15) //large number to test observing in DELETE case. { @@ -343,7 +343,7 @@ OCStackApplicationResult presenceCB(void* ctx, OCDoHandle /*handle*/, cout << "\nStackResult: " << getResult(clientResponse->result); cout << "\nNONCE NUMBER: " << clientResponse->sequenceNumber; cout << "\nCallback Context for Presence notification recvd successfully "; - //OC_LOG_PAYLOAD(INFO, clientResponse->payload); + //OIC_LOG_PAYLOAD(INFO, clientResponse->payload); gNumPresenceNotifies++; if (gNumPresenceNotifies == 20) { @@ -389,7 +389,7 @@ OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle /*handle*/, { cout << ":" << clientResponse->devAddr.port; } - //OC_LOG_PAYLOAD(INFO, clientResponse->payload); + //OIC_LOG_PAYLOAD(INFO, clientResponse->payload); cout << "\nConnectivity type: " << clientResponse->connType; g_connType = clientResponse->connType; g_serverAddr = clientResponse->devAddr; @@ -471,8 +471,8 @@ OCStackApplicationResult PlatformDiscoveryReqCB(void* ctx, if (clientResponse) { - //OC_LOG truncates the response as it is too long. - //OC_LOG_PAYLOAD(INFO, clientResponse->payload); + //OIC_LOG truncates the response as it is too long. + //OIC_LOG_PAYLOAD(INFO, clientResponse->payload); } else { @@ -492,7 +492,7 @@ OCStackApplicationResult DeviceDiscoveryReqCB(void* ctx, OCDoHandle /*handle*/, if (clientResponse) { - //OC_LOG truncates the response as it is too long. + //OIC_LOG truncates the response as it is too long. cout << "\nDiscovery response: "; cout << clientResponse->payload; } @@ -829,7 +829,7 @@ int main(int argc, char* argv[]) { if (OCProcess() != OC_STACK_OK) { - OC_LOG(ERROR, TAG, "OCStack process error"); + OIC_LOG(ERROR, TAG, "OCStack process error"); return 0; } usleep(SLEEP_DURATION); @@ -886,7 +886,7 @@ int main(int argc, char* argv[]) } // Break from loop with Ctrl+C - OC_LOG(INFO, TAG, "Entering occlient main loop..."); + OIC_LOG(INFO, TAG, "Entering occlient main loop..."); signal(SIGINT, handleSigInt); while (!gQuitFlag) {