Fix build issue caused by #16731
authorAndrii Shtompel <a.shtompel@samsung.com>
Tue, 4 Apr 2017 15:05:27 +0000 (18:05 +0300)
committerKevin Kane <kkane@microsoft.com>
Wed, 5 Apr 2017 02:05:42 +0000 (02:05 +0000)
Patchset #16731 changed callback API, and then some time it wasn't rebased.
During that time CA API tests were updated, and old callback API were used.
Gerrit showed no conflicts, Jenkins build were successful.
It is required to rebase more frequently.

I've fixed build error + fix compiler warnings in that file.

Change-Id: I360f22cba5ec70075eff4f814f319678bbf099c8
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18481
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
resource/csdk/connectivity/test/ca_api_unittest.cpp

index 15ffd2a..8115ec9 100755 (executable)
@@ -213,12 +213,12 @@ void provide_x509_cert_and_key(PkiInfo_t* inf)
     return;
 }
 // Empty version, for testing.
-void badPkixInfoHandler(PkiInfo_t* inf)
+void badPkixInfoHandler(PkiInfo_t* /*inf*/)
 {
     return;
 }
 
-void provide_supported_credential_types(bool* list)
+void provide_supported_credential_types(bool* list, const char* /*deviceId*/)
 {
     list[1] = true;
     /*
@@ -369,7 +369,7 @@ TEST_F(CATests, DISABLED_PkiTest)
     // provide data on the heap, but the CA stack should not be changing data provided to it
     // by callbacks. 
 
-    char* local_addr = "127.0.0.1";
+    const char* local_addr = "127.0.0.1";
     uint16_t local_port = 5503;
     CAEndpoint_t* serverAddr = NULL;