Address review comments

project-chip · Mar 9, 2020 · 8b997b1 · 8b997b1
1 parent 99376f2
commit 8b997b1
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
@@ -34,7 +34,7 @@
 #ifndef CHIP_CONFIG_H_
 #define CHIP_CONFIG_H_
 
-#include "SystemConfig.h"
+#include <SystemConfig.h>
 
 /* COMING SOON: making the INET Layer optional entails making this inclusion optional. */
 //#include "InetConfig.h"

diff --git a/src/lib/core/CHIPCore.h b/src/lib/core/CHIPCore.h
@@ -25,7 +25,7 @@
 #ifndef CHIPCORE_H_
 #define CHIPCORE_H_
 
-#include "core/CHIPConfig.h"
+#include <core/CHIPConfig.h>
 /*
 #include <SystemLayer/SystemLayer.h>
 
@@ -35,7 +35,6 @@
 
 #include <InetLayer/InetLayer.h>
 */
-//Currently only used on Sapphire
 #define CHIP_CORE_IDENTITY           "chip-core"
 #define CHIP_CORE_PREFIX             CHIP_CORE_IDENTITY ": "
 
@@ -49,7 +48,7 @@ using namespace ::Inet;
 */
 }
 
-#include "core/CHIPError.h"
+#include <core/CHIPError.h>
 /*
 #include "core/CHIPKeyIds.h"
 #include "core/CHIPFabricState.h"

diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp
@@ -22,8 +22,8 @@
 
 #include <stddef.h>
 
-#include "core/CHIPCore.h"
-#include "support/ErrorStr.h"
+#include <core/CHIPCore.h>
+#include <support/ErrorStr.h>
 
 namespace chip {
 

diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
@@ -31,7 +31,7 @@
 #ifndef CHIP_ERROR_H
 #define CHIP_ERROR_H
 
-#include "CHIPConfig.h"
+#include <CHIPConfig.h>
 // clang-format off
 
 /**

diff --git a/src/lib/support/CodeUtils.h b/src/lib/support/CodeUtils.h
@@ -26,8 +26,8 @@
 #ifndef CODEUTILS_H_
 #define CODEUTILS_H_
 
-#include "core/CHIPError.h"
-#include "support/ErrorStr.h"
+#include <core/CHIPError.h>
+#include <support/ErrorStr.h>
 #include "support/logging/CHIPLogging.h"
 
 /**

diff --git a/src/lib/support/logging/CHIPLogging.cpp b/src/lib/support/logging/CHIPLogging.cpp
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include "support/DLLUtil.h"
-#include "core/CHIPCore.h"
+#include <core/CHIPCore.h>
 #include "support/CodeUtils.h"
 #include "CHIPLogging.h"
 
@@ -77,12 +77,10 @@ static const char ModuleNames[] =
     "SP\0"  // ServiceProvisioning
     "SWU"   // SoftwareUpdate
     "TP\0"  // TokenPairing
-    "HL\0"  // HeatLink
     "TS\0"  // TimeServices
     "WT\0"  // chipTunnel
     "HB\0"  // Heartbeat
     "WSL"   // chipSystemLayer
-    "DLP"   // DropcamLegacyPairing
     "EVL"   // Event Logging
     "SPT"   // Support
     ;

diff --git a/src/lib/support/logging/CHIPLogging.h b/src/lib/support/logging/CHIPLogging.h
@@ -36,7 +36,7 @@
 
 #include <stdint.h>
 
-#include "core/CHIPConfig.h"
+#include <core/CHIPConfig.h>
 
 /**
  *   @namespace chip::Logging
@@ -98,12 +98,10 @@ enum LogModule
     kLogModule_ServiceProvisioning,
     kLogModule_SoftwareUpdate,
     kLogModule_TokenPairing,
-    kLogModule_HeatLink,
     kLogModule_TimeService,
     kLogModule_chipTunnel,
     kLogModule_Heartbeat,
     kLogModule_chipSystemLayer,
-    kLogModule_DropcamLegacyPairing,
     kLogModule_EventLogging,
     kLogModule_Support,