Easysetup - Change OC_LOG to OIC_LOG & warning fixes

[platform/upstream/iotivity.git] / service / easy-setup / enrollee / tizen / wifi / networkhandler.cpp

diff --git a/service/easy-setup/enrollee/tizen/wifi/networkhandler.cpp b/service/easy-setup/enrollee/tizen/wifi/networkhandler.cpp
index 0c816bf..ab4d54f 100644 (file)
--- a/service/easy-setup/enrollee/tizen/wifi/networkhandler.cpp
+++ b/service/easy-setup/enrollee/tizen/wifi/networkhandler.cpp
@@ -52,16 +52,16 @@ print_state(wifi_connection_state_e state)
 
 void __wifi_connected_cb(wifi_error_e error_code, void *user_data)
 {
-    OC_LOG(INFO,LOG_TAG,"#### __connected ");
+    OIC_LOG(INFO,LOG_TAG,"#### __connected ");
     wifi_ap_get_ip_address(connectedWifi, WIFI_ADDRESS_FAMILY_IPV4, &gIpAddress);
-    OC_LOG_V(INFO,LOG_TAG,"#### __connected, Ipaddress=%s", gIpAddress);
+    OIC_LOG_V(INFO,LOG_TAG,"#### __connected, Ipaddress=%s", gIpAddress);
     gNetworkEventCb(ES_OK);
 
 }
 
 bool __wifi_found_ap_cb(wifi_ap_h ap, void *user_data)
 {
-    OC_LOG(INFO,LOG_TAG,"#### __wifi_found_ap_cb received ");
+    OIC_LOG(INFO,LOG_TAG,"#### __wifi_found_ap_cb received ");
 
     int error_code = 0;
     char *ap_name = NULL;
@@ -70,47 +70,47 @@ bool __wifi_found_ap_cb(wifi_ap_h ap, void *user_data)
     error_code = wifi_ap_get_essid(ap, &ap_name);
     if (error_code != WIFI_ERROR_NONE)
     {
-        OC_LOG(ERROR,LOG_TAG,"#### Fail to get AP name.");
+        OIC_LOG(ERROR,LOG_TAG,"#### Fail to get AP name.");
 
         return false;
     }
     error_code = wifi_ap_get_connection_state(ap, &state);
     if (error_code != WIFI_ERROR_NONE)
     {
-        OC_LOG(ERROR,LOG_TAG,"#### Fail to get state.");
+        OIC_LOG(ERROR,LOG_TAG,"#### Fail to get state.");
 
         return false;
     }
-    OC_LOG_V(INFO,LOG_TAG,"#### AP name : %s, state : %s", ap_name, print_state(state));
+    OIC_LOG_V(INFO,LOG_TAG,"#### AP name : %s, state : %s", ap_name, print_state(state));
 
     if (strcmp(ap_name, gSsid) == 0)
     {
-        OC_LOG(INFO,LOG_TAG,"#### network found");
+        OIC_LOG(INFO,LOG_TAG,"#### network found");
         wifi_ap_set_passphrase(ap, gPass);
         connectedWifi = ap;
         error_code = wifi_connect(ap, __wifi_connected_cb, NULL);
-        OC_LOG_V(INFO,LOG_TAG,"Code=%d", error_code);
+        OIC_LOG_V(INFO,LOG_TAG,"Code=%d", error_code);
     }
-    OC_LOG(INFO,LOG_TAG,"#### __wifi_found_ap_cb received ");
+    OIC_LOG(INFO,LOG_TAG,"#### __wifi_found_ap_cb received ");
     return true;
 }
 void __scan_request_cb(wifi_error_e error_code, void *user_data)
 {
-    OC_LOG(INFO, LOG_TAG, "__scan_request_cb");
+    OIC_LOG(INFO, LOG_TAG, "__scan_request_cb");
     int error_code1;
     error_code1 = wifi_foreach_found_aps(__wifi_found_ap_cb, NULL);
     if (error_code1 != WIFI_ERROR_NONE)
-        OC_LOG(INFO,LOG_TAG,"#### Fail to scan");
+        OIC_LOG(INFO,LOG_TAG,"#### Fail to scan");
 
-    OC_LOG(INFO, LOG_TAG,"#### __scan_request_cb exit ");
+    OIC_LOG(INFO, LOG_TAG,"#### __scan_request_cb exit ");
 }
 
 static void __wifi_activated_cb(wifi_error_e result, void *user_data)
 {
-    OC_LOG(INFO, LOG_TAG, "__wifi_activated_cb");
+    OIC_LOG(INFO, LOG_TAG, "__wifi_activated_cb");
     if (result == WIFI_ERROR_NONE)
     {
-        OC_LOG(INFO,LOG_TAG,"#### Success to activate Wi-Fi device!");
+        OIC_LOG(INFO,LOG_TAG,"#### Success to activate Wi-Fi device!");
     }
     wifi_scan(__scan_request_cb, NULL);
 
@@ -119,34 +119,34 @@ static void ESActivateWifi()
 {
     int error_code;
     error_code = wifi_initialize();
-    OC_LOG_V(INFO,LOG_TAG,"#### WIFI INITIALIZED WITH STATUS :%d", error_code);
+    OIC_LOG_V(INFO,LOG_TAG,"#### WIFI INITIALIZED WITH STATUS :%d", error_code);
 
     error_code = wifi_activate(__wifi_activated_cb, NULL);
-    OC_LOG_V(INFO,LOG_TAG,"#### WIFI ACTIVATED WITH STATUS :%d", error_code);
+    OIC_LOG_V(INFO,LOG_TAG,"#### WIFI ACTIVATED WITH STATUS :%d", error_code);
 
     bool wifi_activated = false;
     wifi_is_activated(&wifi_activated);
     if (wifi_activated)
     {
-        OC_LOG(INFO,LOG_TAG,"#### Success to get Wi-Fi device state.");
+        OIC_LOG(INFO,LOG_TAG,"#### Success to get Wi-Fi device state.");
         int scan_result = wifi_scan(__scan_request_cb, NULL);
-        OC_LOG_V(INFO,LOG_TAG,"#### Wifi scan result:%d", scan_result);
+        OIC_LOG_V(INFO,LOG_TAG,"#### Wifi scan result:%d", scan_result);
     }
     else
     {
-        OC_LOG(ERROR,LOG_TAG, "#### Fail to get Wi-Fi device state.");
+        OIC_LOG(ERROR,LOG_TAG, "#### Fail to get Wi-Fi device state.");
     }
 }
 
 static void start()
 {
-    OC_LOG(INFO, LOG_TAG, "START");
+    OIC_LOG(INFO, LOG_TAG, "START");
     ESActivateWifi();
 }
 
 void ConnectToWiFiNetwork(const char *ssid, const char *pass, NetworkEventCallback cb)
 {
-    OC_LOG_V(INFO, LOG_TAG, "ConnectToWiFiNetwork %s %s",ssid,pass);
+    OIC_LOG_V(INFO, LOG_TAG, "ConnectToWiFiNetwork %s %s",ssid,pass);
     gPass = pass;
     gSsid = ssid;
     gNetworkEventCb = cb;