run clang-format

google · Dec 30, 2023 · 9a3ceba · 9a3ceba
1 parent e3f5398
commit 9a3ceba
Show file tree

Hide file tree

Showing 40 changed files with 2,477 additions and 2,607 deletions.
diff --git a/.clang-format b/.clang-format
@@ -84,7 +84,7 @@ IncludeIsMainRegex: '([-_](test|unittest))?$'
 IncludeIsMainSourceRegex: ''
 IndentCaseLabels: true
 IndentGotoLabels: true
-IndentPPDirectives: None
+IndentPPDirectives: AfterHash
 IndentWidth:     2
 IndentWrappedFunctionNames: false
 JavaScriptQuotes: Leave

diff --git a/src/base/commandlineflags.h b/src/base/commandlineflags.h
@@ -48,63 +48,64 @@
 #ifndef BASE_COMMANDLINEFLAGS_H__
 #define BASE_COMMANDLINEFLAGS_H__
 
-#include "config.h"
-#include <cstdlib>               // for getenv
-#include <cstring>               // for memchr
+#include <cstdlib>  // for getenv
+#include <cstring>  // for memchr
 #include <string>
 
+#include "config.h"
+
 #ifdef GLOG_USE_GFLAGS
 
-#include <gflags/gflags.h>
+#  include <gflags/gflags.h>
 
 #else
 
-#include "glog/logging.h"
+#  include "glog/logging.h"
 
-#define DECLARE_VARIABLE(type, shorttype, name, tn) \
-  namespace fL##shorttype {                         \
-    extern GLOG_EXPORT type FLAGS_##name;           \
-  }                                                 \
-  using fL##shorttype::FLAGS_##name
-#define DEFINE_VARIABLE(type, shorttype, name, value, meaning, tn) \
-  namespace fL##shorttype {                                        \
-    GLOG_EXPORT type FLAGS_##name(value);                          \
-    char FLAGS_no##name;                                           \
-  }                                                                \
-  using fL##shorttype::FLAGS_##name
+#  define DECLARE_VARIABLE(type, shorttype, name, tn) \
+    namespace fL##shorttype {                         \
+      extern GLOG_EXPORT type FLAGS_##name;           \
+    }                                                 \
+    using fL##shorttype::FLAGS_##name
+#  define DEFINE_VARIABLE(type, shorttype, name, value, meaning, tn) \
+    namespace fL##shorttype {                                        \
+      GLOG_EXPORT type FLAGS_##name(value);                          \
+      char FLAGS_no##name;                                           \
+    }                                                                \
+    using fL##shorttype::FLAGS_##name
 
 // bool specialization
-#define DECLARE_bool(name) \
-  DECLARE_VARIABLE(bool, B, name, bool)
-#define DEFINE_bool(name, value, meaning) \
-  DEFINE_VARIABLE(bool, B, name, value, meaning, bool)
+#  define DECLARE_bool(name) DECLARE_VARIABLE(bool, B, name, bool)
+#  define DEFINE_bool(name, value, meaning) \
+    DEFINE_VARIABLE(bool, B, name, value, meaning, bool)
 
 // int32 specialization
-#define DECLARE_int32(name) DECLARE_VARIABLE(google::int32, I, name, int32)
-#define DEFINE_int32(name, value, meaning) \
-  DEFINE_VARIABLE(google::int32, I, name, value, meaning, int32)
+#  define DECLARE_int32(name) DECLARE_VARIABLE(google::int32, I, name, int32)
+#  define DEFINE_int32(name, value, meaning) \
+    DEFINE_VARIABLE(google::int32, I, name, value, meaning, int32)
 
 // uint32 specialization
-#ifndef DECLARE_uint32
-#define DECLARE_uint32(name) DECLARE_VARIABLE(google::uint32, U, name, uint32)
-#endif // DECLARE_uint64
-#define DEFINE_uint32(name, value, meaning) \
-  DEFINE_VARIABLE(google::uint32, U, name, value, meaning, uint32)
+#  ifndef DECLARE_uint32
+#    define DECLARE_uint32(name) \
+      DECLARE_VARIABLE(google::uint32, U, name, uint32)
+#  endif  // DECLARE_uint64
+#  define DEFINE_uint32(name, value, meaning) \
+    DEFINE_VARIABLE(google::uint32, U, name, value, meaning, uint32)
 
 // Special case for string, because we have to specify the namespace
 // std::string, which doesn't play nicely with our FLAG__namespace hackery.
-#define DECLARE_string(name)                    \
-  namespace fLS {                               \
-  extern GLOG_EXPORT std::string& FLAGS_##name; \
-  }                                             \
-  using fLS::FLAGS_##name
-#define DEFINE_string(name, value, meaning)                   \
-  namespace fLS {                                             \
-  std::string FLAGS_##name##_buf(value);                      \
-  GLOG_EXPORT std::string& FLAGS_##name = FLAGS_##name##_buf; \
-  char FLAGS_no##name;                                        \
-  }                                                           \
-  using fLS::FLAGS_##name
+#  define DECLARE_string(name)                    \
+    namespace fLS {                               \
+    extern GLOG_EXPORT std::string& FLAGS_##name; \
+    }                                             \
+    using fLS::FLAGS_##name
+#  define DEFINE_string(name, value, meaning)                   \
+    namespace fLS {                                             \
+    std::string FLAGS_##name##_buf(value);                      \
+    GLOG_EXPORT std::string& FLAGS_##name = FLAGS_##name##_buf; \
+    char FLAGS_no##name;                                        \
+    }                                                           \
+    using fLS::FLAGS_##name
 
 #endif  // GLOG_USE_GFLAGS
 
@@ -130,8 +131,7 @@
 // These macros (could be functions, but I don't want to bother with a .cc
 // file), make it easier to initialize flags from the environment.
 
-#define EnvToString(envname, dflt)   \
-  (!getenv(envname) ? (dflt) : getenv(envname))
+#define EnvToString(envname, dflt) (!getenv(envname) ? (dflt) : getenv(envname))
 
 #define EnvToBool(envname, dflt) \
   (!getenv(envname) ? (dflt)     \

diff --git a/src/base/googleinit.h b/src/base/googleinit.h
@@ -1,10 +1,10 @@
 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
-// 
+//
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
 //     * Neither the name of Google Inc. nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
-// 
+//
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,16 +36,14 @@
 class GoogleInitializer {
  public:
   using void_function = void (*)();
-  GoogleInitializer(const char*, void_function f) {
-    f();
-  }
+  GoogleInitializer(const char*, void_function f) { f(); }
 };
 
-#define REGISTER_MODULE_INITIALIZER(name, body)                 \
-  namespace {                                                   \
-    static void google_init_module_##name () { body; }          \
-    GoogleInitializer google_initializer_module_##name(#name,   \
-            google_init_module_##name);                         \
+#define REGISTER_MODULE_INITIALIZER(name, body)       \
+  namespace {                                         \
+  static void google_init_module_##name() { body; }   \
+  GoogleInitializer google_initializer_module_##name( \
+      #name, google_init_module_##name);              \
   }
 
 #endif /* _GOOGLEINIT_H */