[libc] Ensured proper formatting of files

Author: hoarfrost32

libc/src/sys/time/linux/utimes.cpp

@@ -1,10 +1,10 @@
-//===-- Linux implementation of utimes -------------------------------------===//
+//===-- Linux implementation of utimes ------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-//===----------------------------------------------------------------------===/
+//===----------------------------------------------------------------------===//
 
 #include "src/sys/time/utimes.h"
 
@@ -19,57 +19,58 @@
 #include <sys/syscall.h>
 
 namespace LIBC_NAMESPACE_DECL {
-  
-  LLVM_LIBC_FUNCTION(int, utimes, (const char *path, const struct timeval times[2])) {
-    int ret;
+
+LLVM_LIBC_FUNCTION(int, utimes,
+                   (const char *path, const struct timeval times[2])) {
+  int ret;
 
 #ifdef SYS_utimes
-    // No need to define a timespec struct, use the syscall directly.
-    ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_utimes, path, times);
+  // No need to define a timespec struct, use the syscall directly.
+  ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_utimes, path, times);
 #elif defined(SYS_utimensat)
-    //the utimensat syscall requires a timespec struct, not timeval.
-    struct timespec ts[2];
-    struct timespec *ts_ptr = nullptr; // default value if times is NULL
-    
-    // convert the microsec values in timeval struct times 
-    // to nanosecond values in timespec struct ts
-    if (times != NULL) {
-      
-      // ensure consistent values
-      if ((times[0].tv_usec < 0 || times[1].tv_usec < 0) || 
-         (times[0].tv_usec >= 1000000 || times[1].tv_usec >= 1000000)) {
-           libc_errno = EINVAL;
-           return -1;
-      }
-      
-      // set seconds in ts
-      ts[0].tv_sec = times[0].tv_sec; 
-      ts[1].tv_sec = times[1].tv_sec;
-      
-      // convert u-seconds to nanoseconds
-      ts[0].tv_nsec = times[0].tv_usec * 1000;
-      ts[1].tv_nsec = times[1].tv_usec * 1000;
-      
-      ts_ptr = ts;
+  // the utimensat syscall requires a timespec struct, not timeval.
+  struct timespec ts[2];
+  struct timespec *ts_ptr = nullptr; // default value if times is NULL
+
+  // convert the microsec values in timeval struct times
+  // to nanosecond values in timespec struct ts
+  if (times != NULL) {
+
+    // ensure consistent values
+    if ((times[0].tv_usec < 0 || times[1].tv_usec < 0) ||
+        (times[0].tv_usec >= 1000000 || times[1].tv_usec >= 1000000)) {
+      libc_errno = EINVAL;
+      return -1;
     }
-    
-    // If times was NULL, ts_ptr remains NULL, which utimensat interprets
-    // as setting times to the current time.
-  
-    // utimensat syscall. 
-    // flags=0 means don't follow symlinks (like utimes)
-    ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_utimensat, AT_FDCWD, path,
-                                             ts_ptr, 0);
+
+    // set seconds in ts
+    ts[0].tv_sec = times[0].tv_sec;
+    ts[1].tv_sec = times[1].tv_sec;
+
+    // convert u-seconds to nanoseconds
+    ts[0].tv_nsec = times[0].tv_usec * 1000;
+    ts[1].tv_nsec = times[1].tv_usec * 1000;
+
+    ts_ptr = ts;
+  }
+
+  // If times was NULL, ts_ptr remains NULL, which utimensat interprets
+  // as setting times to the current time.
+
+  // utimensat syscall.
+  // flags=0 means don't follow symlinks (like utimes)
+  ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_utimensat, AT_FDCWD, path, ts_ptr,
+                                          0);
 
 #else
 #error "utimensat and utimes syscalls not available."
 #endif // SYS_utimensat
-  
-    if (ret < 0) {
-      libc_errno = -ret;
-      return -1;
-    }
-  
-    return 0;
+
+  if (ret < 0) {
+    libc_errno = -ret;
+    return -1;
   }
+
+  return 0;
 }
+} // namespace LIBC_NAMESPACE_DECL

libc/src/sys/time/utimes.h

@@ -1,4 +1,4 @@
-//===-- Implementation header for utimes -----------------------------------===//
+//===-- Implementation header for utimes ----------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -18,4 +18,4 @@ int utimes(const char *path, const struct timeval times[2]);
 
 } // namespace LIBC_NAMESPACE_DECL
 
-#endif // LLVM_LIBC_SRC_SYS_TIME_UTIMES_H
+#endif // LLVM_LIBC_SRC_SYS_TIME_UTIMES_H

libc/test/src/sys/time/CMakeLists.txt

@@ -1,7 +1,5 @@
 add_custom_target(libc_sys_time_unittests)
 
-add_subdirectory(testdata)
-
 add_libc_unittest(
   utimes_test
   SUITE

libc/test/src/sys/time/testdata/CMakeLists.txt

@@ -1,11 +1,10 @@
-//===-- Unittests for utimes
-//-----------------------------------------------===//
+//===-- Unittests for utimes ----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-//===-----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//
 
 #include "hdr/fcntl_macros.h"
 #include "hdr/types/struct_timeval.h"
@@ -15,15 +14,14 @@
 #include "src/sys/stat/stat.h"
 #include "src/sys/time/utimes.h"
 #include "src/unistd/close.h"
-#include "src/unistd/unlink.h"
 #include "test/UnitTest/ErrnoSetterMatcher.h"
 #include "test/UnitTest/Test.h"
-#include <fcntl.h>
+
 constexpr const char *FILE_PATH = "utimes.test";
 
-// SUCCESS: Takes a file and successfully updates 
+// SUCCESS: Takes a file and successfully updates
 // its last access and modified times.
-TEST(LlvmLibcUtimesTest, ChangeTimesSpecific){
+TEST(LlvmLibcUtimesTest, ChangeTimesSpecific) {
   using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
 
   // const char* FILE_PATH = "testdata/__utimes_changetimes.test";
@@ -39,7 +37,7 @@ TEST(LlvmLibcUtimesTest, ChangeTimesSpecific){
   times[0].tv_usec = 12345;
   times[1].tv_sec = 43210;
   times[1].tv_usec = 23456;
-  
+
   // ensure utimes succeeds
   ASSERT_THAT(LIBC_NAMESPACE::utimes(FILE_PATH, times), Succeeds(0));
 
@@ -51,7 +49,7 @@ TEST(LlvmLibcUtimesTest, ChangeTimesSpecific){
   ASSERT_EQ(statbuf.st_atim.tv_sec, times[0].tv_sec);
   ASSERT_EQ(statbuf.st_mtim.tv_sec, times[1].tv_sec);
 
-  //microseconds
+  // microseconds
   ASSERT_EQ(statbuf.st_atim.tv_nsec, times[0].tv_usec * 1000);
   ASSERT_EQ(statbuf.st_mtim.tv_nsec, times[1].tv_usec * 1000);
 
@@ -60,7 +58,7 @@ TEST(LlvmLibcUtimesTest, ChangeTimesSpecific){
 
 // FAILURE: Invalid values in the timeval struct
 // to check that utimes rejects it.
-TEST(LlvmLibcUtimesTest, InvalidMicroseconds){
+TEST(LlvmLibcUtimesTest, InvalidMicroseconds) {
   using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
   using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
 
@@ -71,25 +69,25 @@ TEST(LlvmLibcUtimesTest, InvalidMicroseconds){
   ASSERT_GT(fd, 0);
   ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
 
-  // make a dummy timeval struct 
+  // make a dummy timeval struct
   // populated with bad usec values
   struct timeval times[2];
   times[0].tv_sec = 54321;
   times[0].tv_usec = 4567;
   times[1].tv_sec = 43210;
-  times[1].tv_usec = 1000000; //invalid
-  
+  times[1].tv_usec = 1000000; // invalid
+
   // ensure utimes fails
   ASSERT_THAT(LIBC_NAMESPACE::utimes(FILE_PATH, times), Fails(EINVAL));
 
-  // check for failure on 
+  // check for failure on
   // the other possible bad values
 
   times[0].tv_sec = 54321;
-  times[0].tv_usec = -4567; //invalid
+  times[0].tv_usec = -4567; // invalid
   times[1].tv_sec = 43210;
   times[1].tv_usec = 1000;
-  
+
   // ensure utimes fails once more
   ASSERT_THAT(LIBC_NAMESPACE::utimes(FILE_PATH, times), Fails(EINVAL));
   ASSERT_THAT(LIBC_NAMESPACE::remove(TEST_FILE), Succeeds(0));