Format with clang-format 19

Author: fdegros

.clang-format

@@ -1 +1,2 @@
 BasedOnStyle: Chromium
+InsertBraces: true

lib/file_node.h

@@ -96,23 +96,15 @@ struct FileNode {
   using ByPath = bi::unordered_set_member_hook<LinkMode, bi::store_hash<true>>;
   ByPath by_path, by_original_path;
 
-  const DataNode& GetTarget() const {
-    return link ? *link : data;
-  }
+  const DataNode& GetTarget() const { return link ? *link : data; }
 
   // Gets attributes.
   using Stat = struct stat;
-  operator Stat() const {
-    return GetTarget();
-  }
+  operator Stat() const { return GetTarget(); }
 
-  FileType GetType() const {
-    return GetFileType(GetTarget().mode);
-  }
+  FileType GetType() const { return GetFileType(GetTarget().mode); }
 
-  bool IsDir() const {
-    return GetType() == FileType::Directory;
-  }
+  bool IsDir() const { return GetType() == FileType::Directory; }
 
   // Gets the full absolute path of this node.
   std::string GetPath() const {
@@ -192,9 +184,7 @@ struct FileNode {
   }
 
   // Gets a Reader to read file contents.
-  Reader::Ptr GetReader() const {
-    return GetTarget().GetReader(zip, *this);
-  }
+  Reader::Ptr GetReader() const { return GetTarget().GetReader(zip, *this); }
 
   // Output operator for debugging.
   friend std::ostream& operator<<(std::ostream& out, const FileNode& node) {

mount-zip.cc

@@ -34,7 +34,7 @@
 
 #ifdef __APPLE__
 
-#ifndef typeof // work around the -pedantic -std=c++20
+#ifndef typeof  // work around the -pedantic -std=c++20
 #define typeof(x) __typeof__(x)
 #endif
 

tests/whitebox/extra_field_test.cc

@@ -103,12 +103,12 @@ void unix_pkware_regular() {
  */
 void unix_pkware_device() {
   const u8 data[] = {
-    0xC8, 0x76, 0x45, 0x5D,  // atime
-    0xC8, 0x76, 0x45, 0x5D,  // mtime
-    0x00, 0x00,              // UID
-    0x06, 0x00,              // GID
-    0x08, 0x00, 0x00, 0x00,  // major
-    0x01, 0x00, 0x00, 0x00   // minor
+      0xC8, 0x76, 0x45, 0x5D,  // atime
+      0xC8, 0x76, 0x45, 0x5D,  // mtime
+      0x00, 0x00,              // UID
+      0x06, 0x00,              // GID
+      0x08, 0x00, 0x00, 0x00,  // major
+      0x01, 0x00, 0x00, 0x00   // minor
   };
 
   ExtraFields f;

utils/create-content-size.cpp

@@ -38,10 +38,12 @@ zip_int64_t callback(void* user,
       return 0;
     case ZIP_SOURCE_READ: {
       size_t nr = std::numeric_limits<size_t>::max();
-      if (len < nr)
+      if (len < nr) {
         nr = static_cast<size_t>(len);
-      if (ctx->size - ctx->offset < nr)
+      }
+      if (ctx->size - ctx->offset < nr) {
         nr = static_cast<size_t>(ctx->size - ctx->offset);
+      }
       memset(data, 0, nr);
       ctx->offset += nr;
       return nr;

utils/dump-extrafld.cpp

@@ -135,8 +135,9 @@ int main(int argc, char** argv) {
       int len = 0;
       const char* const comment =
           zip_get_archive_comment(z.get(), &len, ZIP_FL_ENC_RAW);
-      if (comment != nullptr && len > 0)
+      if (comment != nullptr && len > 0) {
         std::println("  comment: {}", std::string_view(comment, len));
+      }
     }
 
     zip_int64_t const n = zip_get_num_entries(z.get(), 0);