[LIBC][NFC] Rename errno and assert files to match other files with functions

[michaelrj]

Summary

Rename the files containing the __errno_location function
to __errno_location.h/cpp to match the other files and move
the llvmlibc_errno macro to its own file.

Split assert.h into __assert_fail.h (contains the function prototype)
and assert.h (contains the assert macro).

[michaelrj]

update the assert files to also match

[michaelrj]

move the errno macro to its own file to match assert.

[michaelrj]

fix missing newline at the end of a file.

[sivachandra]

libc/src/assert/assert.h

8

Missing header guard.

libc/src/errno/llvmlibc_errno.h

8

Missing header guard.

14

Please fix.

[abrachet]

libc/src/assert/assert.h

8

This is the intended behavior for assert.h which can be included multiple times with NDEBUG redefined.

[sivachandra]

libc/src/assert/assert.h

8

Ah, thanks for reminding. Ignore my comment then.

[sivachandra]

libc/src/assert/assert.h

8

@michaelrj, can you please add a comment explaining what @abrachet said?

[michaelrj]

added header guard to llvmlibc_errno.h, and a comment on assert.h explaining the lack of header guard (thank you to abrachet).

libc/src/assert/CMakeLists.txt

 add_entrypoint_object(
   __assert_fail
   SRCS
     __assert_fail.cpp
   HDRS
+    __assert_fail.h
     assert.h
   DEPENDS
     # These two dependencies are temporary and should be replaced by fprintf
     # later.
     libc.config.linux.linux_syscall_h
     libc.include.sys_syscall
     libc.src.stdlib.abort
 )

libc/src/assert/__assert_fail.h

+//===-- Internal header for __assert_fail -----------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC_ASSERT_ASSERT_FAIL_H
+#define LLVM_LIBC_SRC_ASSERT_ASSERT_FAIL_H
+
+#include <stddef.h>
+
+namespace __llvm_libc {
+
+[[noreturn]] void __assert_fail(const char *assertion, const char *file,
+                                unsigned line, const char *function);
+
+} // namespace __llvm_libc
+
+#endif // LLVM_LIBC_SRC_ASSERT_ASSERT_FAIL_H

libc/src/assert/__assert_fail.cpp

 //===-- Implementation of __assert_fail -----------------------------------===//
 //
 // 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/assert/assert.h"
+#include "src/assert/__assert_fail.h"
 #include "src/stdlib/abort.h"
 
 // These includes are temporary.
 #include "config/linux/syscall.h" // For internal syscall function.
 #include "include/sys/syscall.h"  // For syscall numbers.
 
 namespace __llvm_libc {
 

libc/src/assert/assert.h

 //===-- Internal header for assert ------------------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_SRC_ASSERT_ASSERT_H
-#define LLVM_LIBC_SRC_ASSERT_ASSERT_H
-
-#include <stddef.h>
-
-namespace __llvm_libc {
-
-[[noreturn]] void __assert_fail(const char *assertion, const char *file, unsigned line,
-                  const char *function);
-
-} // namespace __llvm_libc
-
-#endif // LLVM_LIBC_SRC_ASSERT_ASSERT_H
+#include "src/assert/__assert_fail.h"
 
 #undef assert
 
 #ifdef NDEBUG
 #define assert(e) (void)0
 #else
 #define assert(e)                                                              \
   ((e) ? (void)0 :                                                             \
     __llvm_libc::__assert_fail(#e, __FILE__, __LINE__, __PRETTY_FUNCTION__))
 #endif

libc/src/errno/CMakeLists.txt

 add_entrypoint_object(
   __errno_location
   SRCS
-    errno_location.cpp
+    __errno_location.cpp
   HDRS
+    __errno_location.h
     llvmlibc_errno.h
 )

libc/src/errno/__errno_location.h

-//===-- Implementation header for errno -------------------------*- C++ -*-===//
+//===-- Implementation header for __errno_location --------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
-#define LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
-
-// Internal code should use this and not use the errno macro from the
-// public header.
-#define llvmlibc_errno (*__llvm_libc::__errno_location())
+#ifndef LLVM_LIBC_SRC_ERRNO_ERRNO_LOCATION_H
+#define LLVM_LIBC_SRC_ERRNO_ERRNO_LOCATION_H
 
 namespace __llvm_libc {
 
 int *__errno_location();
 
 } // namespace __llvm_libc
 
-#endif // LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
+#endif // LLVM_LIBC_SRC_ERRNO_ERRNO_LOCATION_H

libc/src/errno/__errno_location.cpp

 //===-- Implementation of __errno_location --------------------------------===//
 //
 // 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/errno/llvmlibc_errno.h"
+#include "src/errno/__errno_location.h"
 
 #include "src/__support/common.h"
 
 namespace __llvm_libc {
 
 static thread_local int __errno = 0;
 
 // __errno_location is not really an entry point but we still want it to behave
 // like an entry point because the errno macro resolves to the C symbol
 // "__errno_location".
 int *LLVM_LIBC_ENTRYPOINT(__errno_location)() { return &__errno; }
 
 } // namespace __llvm_libc

libc/src/errno/llvmlibc_errno.h

 //===-- Implementation header for errno -------------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
-#define LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
+#include "src/errno/__errno_location.h"
 
 // Internal code should use this and not use the errno macro from the
 // public header.
-#define llvmlibc_errno (*__llvm_libc::__errno_location())
-
-namespace __llvm_libc {
-
-int *__errno_location();
-
-} // namespace __llvm_libc
-
-#endif // LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
+#define llvmlibc_errno (*__llvm_libc::__errno_location())