From 8cd930cc9d2ba9abeaf15ee764b738144084504c Mon Sep 17 00:00:00 2001
From: Myles Watson <mylesgw@google.com>
Date: Tue, 13 Dec 2016 09:47:55 -0800
Subject: [PATCH] test_vendor: Replace __FUNCTION__ with __func__

Test: Bluetooth settings still works
Change-Id: I4de24cceb9beb262ce7f96e7291288b70618f694
---
 vendor_libs/test_vendor_lib/src/async_manager.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/vendor_libs/test_vendor_lib/src/async_manager.cc b/vendor_libs/test_vendor_lib/src/async_manager.cc
index 6b200b2b7..423fc7240 100644
--- a/vendor_libs/test_vendor_lib/src/async_manager.cc
+++ b/vendor_libs/test_vendor_lib/src/async_manager.cc
@@ -105,7 +105,7 @@ class AsyncManager::AsyncFdWatcher {
     // start the thread if not started yet
     int started = tryStartThread();
     if (started != 0) {
-      LOG_ERROR(LOG_TAG, "%s: Unable to start thread", __FUNCTION__);
+      LOG_ERROR(LOG_TAG, "%s: Unable to start thread", __func__);
       return started;
     }
 
@@ -136,7 +136,7 @@ class AsyncManager::AsyncFdWatcher {
     } else {
       LOG_WARN(LOG_TAG,
                "%s: Starting thread stop from inside the reading thread itself",
-               __FUNCTION__);
+               __func__);
     }
 
     {
@@ -163,7 +163,7 @@ class AsyncManager::AsyncFdWatcher {
       LOG_ERROR(LOG_TAG,
                 "%s:Unable to establish a communication channel to the reading "
                 "thread",
-                __FUNCTION__);
+                __func__);
       return -1;
     }
     notification_listen_fd_ = pipe_fds[0];
@@ -171,7 +171,7 @@ class AsyncManager::AsyncFdWatcher {
 
     thread_ = std::thread([this]() { ThreadRoutine(); });
     if (!thread_.joinable()) {
-      LOG_ERROR(LOG_TAG, "%s: Unable to start reading thread", __FUNCTION__);
+      LOG_ERROR(LOG_TAG, "%s: Unable to start reading thread", __func__);
       return -1;
     }
     return 0;
@@ -181,7 +181,7 @@ class AsyncManager::AsyncFdWatcher {
     char buffer = '0';
     if (TEMP_FAILURE_RETRY(write(notification_write_fd_, &buffer, 1)) < 0) {
       LOG_ERROR(LOG_TAG, "%s: Unable to send message to reading thread",
-                __FUNCTION__);
+                __func__);
       return -1;
     }
     return 0;
@@ -246,7 +246,7 @@ class AsyncManager::AsyncFdWatcher {
         LOG_ERROR(LOG_TAG,
                   "%s: There was an error while waiting for data on the file "
                   "descriptors",
-                  __FUNCTION__);
+                  __func__);
         continue;
       }
 
@@ -320,7 +320,7 @@ class AsyncManager::AsyncTaskManager {
     } else {
       LOG_WARN(LOG_TAG,
                "%s: Starting thread stop from inside the task thread itself",
-               __FUNCTION__);
+               __func__);
     }
     return 0;
   }
@@ -390,7 +390,7 @@ class AsyncManager::AsyncTaskManager {
     // start thread if necessary
     int started = tryStartThread();
     if (started != 0) {
-      LOG_ERROR(LOG_TAG, "%s: Unable to start thread", __FUNCTION__);
+      LOG_ERROR(LOG_TAG, "%s: Unable to start thread", __func__);
       return kInvalidTaskId;
     }
     // notify the thread so that it knows of the new task
@@ -414,7 +414,7 @@ class AsyncManager::AsyncTaskManager {
     running_ = true;
     thread_ = std::thread([this]() { ThreadRoutine(); });
     if (!thread_.joinable()) {
-      LOG_ERROR(LOG_TAG, "%s: Unable to start task thread", __FUNCTION__);
+      LOG_ERROR(LOG_TAG, "%s: Unable to start task thread", __func__);
       return -1;
     }
     return 0;
-- 
2.11.0