From 906dc12c5d00906fa4f6e547e7affb5af0802832 Mon Sep 17 00:00:00 2001
From: Alex Dale <sigquit@google.com>
Date: Thu, 27 Jun 2019 13:42:10 -0700
Subject: [PATCH] Formatted WV utils/include files.

[ Merge of http://go/wvgerrit/80943 ]

Ran `git clang-format` on files in utils/include.
Used the new .clang-format config.

Bug: 134365840
Test: WV unit tests
Change-Id: Ifc0950236ecd610792e9add11ac07c63485f3f0c
---
 .../util/include/disallow_copy_and_assign.h   |  1 -
 libwvdrmengine/cdm/util/include/log.h         | 25 +++++++++----------
 libwvdrmengine/cdm/util/include/platform.h    | 24 ++++++++----------
 .../cdm/util/include/string_conversions.h     |  1 +
 libwvdrmengine/cdm/util/include/util_common.h | 20 +++++++--------
 5 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h b/libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h
index 0aefbc36..abc10480 100644
--- a/libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h
+++ b/libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h
@@ -11,7 +11,6 @@ namespace wvcdm {
   TypeName(const TypeName&);                    \
   void operator=(const TypeName&)
 
-
 }  // namespace wvcdm
 
 #endif  //  WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_
diff --git a/libwvdrmengine/cdm/util/include/log.h b/libwvdrmengine/cdm/util/include/log.h
index d79ff001..37706fa0 100644
--- a/libwvdrmengine/cdm/util/include/log.h
+++ b/libwvdrmengine/cdm/util/include/log.h
@@ -33,22 +33,21 @@ extern LogPriority g_cutoff;
 // unit tests.
 CORE_UTIL_EXPORT void InitLogging();
 
-CORE_UTIL_EXPORT void Log(
-    const char* file, const char* function, int line, LogPriority level,
-    const char* fmt, ...);
+CORE_UTIL_EXPORT void Log(const char* file, const char* function, int line,
+                          LogPriority level, const char* fmt, ...);
 
 // Log APIs
 #ifndef LOGE
-#define LOGE(...) Log(__FILE__, __func__, __LINE__, \
-                      wvcdm::LOG_ERROR, __VA_ARGS__)
-#define LOGW(...) Log(__FILE__, __func__, __LINE__, \
-                      wvcdm::LOG_WARN, __VA_ARGS__)
-#define LOGI(...) Log(__FILE__, __func__, __LINE__, \
-                      wvcdm::LOG_INFO, __VA_ARGS__)
-#define LOGD(...) Log(__FILE__, __func__, __LINE__, \
-                      wvcdm::LOG_DEBUG, __VA_ARGS__)
-#define LOGV(...) Log(__FILE__, __func__, __LINE__, \
-                      wvcdm::LOG_VERBOSE, __VA_ARGS__)
+#  define LOGE(...) \
+    Log(__FILE__, __func__, __LINE__, wvcdm::LOG_ERROR, __VA_ARGS__)
+#  define LOGW(...) \
+    Log(__FILE__, __func__, __LINE__, wvcdm::LOG_WARN, __VA_ARGS__)
+#  define LOGI(...) \
+    Log(__FILE__, __func__, __LINE__, wvcdm::LOG_INFO, __VA_ARGS__)
+#  define LOGD(...) \
+    Log(__FILE__, __func__, __LINE__, wvcdm::LOG_DEBUG, __VA_ARGS__)
+#  define LOGV(...) \
+    Log(__FILE__, __func__, __LINE__, wvcdm::LOG_VERBOSE, __VA_ARGS__)
 #endif
 }  // namespace wvcdm
 
diff --git a/libwvdrmengine/cdm/util/include/platform.h b/libwvdrmengine/cdm/util/include/platform.h
index ad2325da..4168e446 100644
--- a/libwvdrmengine/cdm/util/include/platform.h
+++ b/libwvdrmengine/cdm/util/include/platform.h
@@ -10,24 +10,22 @@
 #include "util_common.h"
 
 #ifdef _WIN32
-# include <wtypes.h>
-# include <BaseTsd.h>
-# include <winsock2.h>  // For htonl and ntohl.
-# define __PRETTY_FUNCTION__ __FUNCTION__
-# undef NO_ERROR
-# undef GetCurrentTime
-# undef DeleteFile
+#  include <BaseTsd.h>
+#  include <winsock2.h>  // For htonl and ntohl.
+#  include <wtypes.h>
+#  define __PRETTY_FUNCTION__ __FUNCTION__
+#  undef NO_ERROR
+#  undef GetCurrentTime
+#  undef DeleteFile
 
 using ssize_t = SSIZE_T;
 
-inline void sleep(int seconds) {
-  Sleep(seconds * 1000);
-}
+inline void sleep(int seconds) { Sleep(seconds * 1000); }
 CORE_UTIL_EXPORT int setenv(const char* key, const char* value, int overwrite);
 #else
-# include <arpa/inet.h>
-# include <sys/types.h>
-# include <unistd.h>
+#  include <arpa/inet.h>
+#  include <sys/types.h>
+#  include <unistd.h>
 #endif
 
 #endif  // WVCDM_UTIL_PLATFORM_H_
diff --git a/libwvdrmengine/cdm/util/include/string_conversions.h b/libwvdrmengine/cdm/util/include/string_conversions.h
index 3bb73dc9..c5448a8f 100644
--- a/libwvdrmengine/cdm/util/include/string_conversions.h
+++ b/libwvdrmengine/cdm/util/include/string_conversions.h
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/libwvdrmengine/cdm/util/include/util_common.h b/libwvdrmengine/cdm/util/include/util_common.h
index 9a1f309d..100e1389 100644
--- a/libwvdrmengine/cdm/util/include/util_common.h
+++ b/libwvdrmengine/cdm/util/include/util_common.h
@@ -6,17 +6,17 @@
 #define WVCDM_UTIL_UTIL_COMMON_H_
 
 #ifdef _WIN32
-# ifdef CORE_UTIL_IMPLEMENTATION
-#  define CORE_UTIL_EXPORT __declspec(dllexport)
-# else
-#  define CORE_UTIL_EXPORT __declspec(dllimport)
-# endif
+#  ifdef CORE_UTIL_IMPLEMENTATION
+#    define CORE_UTIL_EXPORT __declspec(dllexport)
+#  else
+#    define CORE_UTIL_EXPORT __declspec(dllimport)
+#  endif
 #else
-# ifdef CORE_UTIL_IMPLEMENTATION
-#  define CORE_UTIL_EXPORT __attribute__((visibility("default")))
-# else
-#  define CORE_UTIL_EXPORT
-# endif
+#  ifdef CORE_UTIL_IMPLEMENTATION
+#    define CORE_UTIL_EXPORT __attribute__((visibility("default")))
+#  else
+#    define CORE_UTIL_EXPORT
+#  endif
 #endif
 
 #endif  // WVCDM_UTIL_UTIL_COMMON_H_