From b847849322f8d763ef8079bd681f0dfc7986f6d6 Mon Sep 17 00:00:00 2001
From: George Kulakowski <kulakowski@google.com>
Date: Sun, 25 Nov 2018 19:47:37 -0800
Subject: [PATCH] [devmgr] Rename devcoordinator.h to coordinator.h to match
its .cpp equivalent
Test: no functional change
Change-Id: I4c524fe56d8392f7ef1947e1de5cb15479f4f6c3
---
system/core/devmgr/devmgr/binding.cpp | 2 +-
system/core/devmgr/devmgr/coordinator.cpp | 3 ++-
system/core/devmgr/devmgr/{devcoordinator.h => coordinator.h} | 0
system/core/devmgr/devmgr/devfs.cpp | 2 +-
system/core/devmgr/devmgr/drivers.cpp | 2 +-
system/core/devmgr/devmgr/fidl.cpp | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
rename system/core/devmgr/devmgr/{devcoordinator.h => coordinator.h} (100%)
diff --git a/system/core/devmgr/devmgr/binding.cpp b/system/core/devmgr/devmgr/binding.cpp
index 0812b4362a0..b251a8c6e26 100644
--- a/system/core/devmgr/devmgr/binding.cpp
+++ b/system/core/devmgr/devmgr/binding.cpp
@@ -8,7 +8,7 @@
#include <stdio.h>
-#include "devcoordinator.h"
+#include "coordinator.h"
namespace devmgr {
diff --git a/system/core/devmgr/devmgr/coordinator.cpp b/system/core/devmgr/devmgr/coordinator.cpp
index 73c560ff523..5f1397017f8 100644
--- a/system/core/devmgr/devmgr/coordinator.cpp
+++ b/system/core/devmgr/devmgr/coordinator.cpp
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "coordinator.h"
+
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -34,7 +36,6 @@
#include <utility>
-#include "devcoordinator.h"
#include "devmgr.h"
#include "../shared/fdio.h"
#include "../shared/fidl_txn.h"
diff --git a/system/core/devmgr/devmgr/devcoordinator.h b/system/core/devmgr/devmgr/coordinator.h
similarity index 100%
rename from system/core/devmgr/devmgr/devcoordinator.h
rename to system/core/devmgr/devmgr/coordinator.h
diff --git a/system/core/devmgr/devmgr/devfs.cpp b/system/core/devmgr/devmgr/devfs.cpp
index 26ef424d191..30b6ba39e9a 100644
--- a/system/core/devmgr/devmgr/devfs.cpp
+++ b/system/core/devmgr/devmgr/devfs.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "devcoordinator.h"
+#include "coordinator.h"
#include "devmgr.h"
#include "../shared/async-loop-owned-rpc-handler.h"
#include "../shared/log.h"
diff --git a/system/core/devmgr/devmgr/drivers.cpp b/system/core/devmgr/devmgr/drivers.cpp
index 29d0b74c02e..28b88e64c18 100644
--- a/system/core/devmgr/devmgr/drivers.cpp
+++ b/system/core/devmgr/devmgr/drivers.cpp
@@ -10,8 +10,8 @@
#include <string.h>
#include <unistd.h>
+#include "coordinator.h"
#include "devmgr.h"
-#include "devcoordinator.h"
#include "../shared/fdio.h"
#include "../shared/log.h"
diff --git a/system/core/devmgr/devmgr/fidl.cpp b/system/core/devmgr/devmgr/fidl.cpp
index d65fb360a0b..3efd7d9e79b 100644
--- a/system/core/devmgr/devmgr/fidl.cpp
+++ b/system/core/devmgr/devmgr/fidl.cpp
@@ -7,7 +7,7 @@
#include <lib/fidl/cpp/message.h>
#include <lib/fidl/cpp/message_part.h>
-#include "devcoordinator.h"
+#include "coordinator.h"
#include "../shared/log.h"
namespace devmgr {
--
GitLab