Skip to content

Commit 30da01d

Browse files
mleleszimleleszi
committed
Cleanup
1 parent 428c7e9 commit 30da01d

29 files changed

+82
-117
lines changed

‎libc/src/stdio/CMakeLists.txt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ add_entrypoint_object(
126126
libc.src.stdio.printf_core.printf_main
127127
libc.src.stdio.printf_core.writer
128128
libc.src.stdio.printf_core.core_structs
129-
libc.src.stdio.printf_core.error_converter
129+
libc.src.stdio.printf_core.error_mapper
130130
libc.src.__support.libc_errno
131+
libc.src.__support.CPP.limits
131132
)
132133

133134
add_entrypoint_object(
@@ -140,7 +141,7 @@ add_entrypoint_object(
140141
libc.src.stdio.printf_core.printf_main
141142
libc.src.stdio.printf_core.writer
142143
libc.src.stdio.printf_core.core_structs
143-
libc.src.stdio.printf_core.error_converter
144+
libc.src.stdio.printf_core.error_mapper
144145
libc.src.__support.libc_errno
145146
)
146147

@@ -153,8 +154,9 @@ add_entrypoint_object(
153154
DEPENDS
154155
libc.src.stdio.printf_core.vasprintf_internal
155156
libc.src.stdio.printf_core.core_structs
156-
libc.src.stdio.printf_core.error_converter
157+
libc.src.stdio.printf_core.error_mapper
157158
libc.src.__support.libc_errno
159+
libc.src.__support.CPP.limits
158160
)
159161

160162
add_entrypoint_object(
@@ -167,7 +169,9 @@ add_entrypoint_object(
167169
libc.src.stdio.printf_core.printf_main
168170
libc.src.stdio.printf_core.writer
169171
libc.src.stdio.printf_core.core_structs
170-
libc.src.stdio.printf_core.error_converter
172+
libc.src.stdio.printf_core.error_mapper
173+
libc.src.__support.libc_errno
174+
libc.src.__support.CPP.limits
171175
)
172176

173177
add_entrypoint_object(
@@ -180,8 +184,9 @@ add_entrypoint_object(
180184
libc.src.stdio.printf_core.printf_main
181185
libc.src.stdio.printf_core.writer
182186
libc.src.stdio.printf_core.core_structs
183-
libc.src.stdio.printf_core.error_converter
187+
libc.src.stdio.printf_core.error_mapper
184188
libc.src.__support.libc_errno
189+
libc.src.__support.CPP.limits
185190
)
186191

187192
add_entrypoint_object(
@@ -193,8 +198,9 @@ add_entrypoint_object(
193198
DEPENDS
194199
libc.src.stdio.printf_core.vasprintf_internal
195200
libc.src.stdio.printf_core.core_structs
196-
libc.src.stdio.printf_core.error_converter
201+
libc.src.stdio.printf_core.error_mapper
197202
libc.src.__support.libc_errno
203+
libc.src.__support.CPP.limits
198204
)
199205

200206
add_subdirectory(printf_core)

‎libc/src/stdio/asprintf.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/asprintf.h"
10+
#include "src/__support/CPP/limits.h"
1011
#include "src/__support/arg_list.h"
1112
#include "src/__support/libc_errno.h"
1213
#include "src/__support/macros/config.h"
1314
#include "src/stdio/printf_core/core_structs.h"
14-
#include "src/stdio/printf_core/error_converter.h"
15+
#include "src/stdio/printf_core/error_mapper.h"
1516
#include "src/stdio/printf_core/vasprintf_internal.h"
1617

1718
namespace LIBC_NAMESPACE_DECL {

‎libc/src/stdio/baremetal/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ add_entrypoint_object(
2929
DEPENDS
3030
libc.src.stdio.printf_core.printf_main
3131
libc.src.stdio.printf_core.writer
32-
libc.src.stdio.printf_core.error_converter
32+
libc.src.stdio.printf_core.error_mapper
3333
libc.src.stdio.printf_core.core_structs
3434
libc.src.__support.arg_list
3535
libc.src.__support.OSUtil.osutil
3636
libc.src.__support.libc_errno
37+
libc.src.__support.CPP.limits
3738
)
3839

3940
add_entrypoint_object(
@@ -90,11 +91,12 @@ add_entrypoint_object(
9091
DEPENDS
9192
libc.src.stdio.printf_core.printf_main
9293
libc.src.stdio.printf_core.writer
93-
libc.src.stdio.printf_core.error_converter
94+
libc.src.stdio.printf_core.error_mapper
9495
libc.src.stdio.printf_core.core_structs
9596
libc.src.__support.arg_list
9697
libc.src.__support.OSUtil.osutil
9798
libc.src.__support.libc_errno
99+
libc.src.__support.CPP.limits
98100
)
99101

100102
add_entrypoint_object(

‎libc/src/stdio/baremetal/printf.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/printf.h"
10+
#include "src/__support/CPP/limits.h"
1011
#include "src/__support/OSUtil/io.h"
1112
#include "src/__support/arg_list.h"
1213
#include "src/__support/libc_errno.h"
1314
#include "src/__support/macros/config.h"
1415
#include "src/stdio/printf_core/core_structs.h"
15-
#include "src/stdio/printf_core/error_converter.h"
16+
#include "src/stdio/printf_core/error_mapper.h"
1617
#include "src/stdio/printf_core/printf_main.h"
1718
#include "src/stdio/printf_core/writer.h"
1819

‎libc/src/stdio/baremetal/vprintf.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/vprintf.h"
10+
#include "src/__support/CPP/limits.h"
1011
#include "src/__support/OSUtil/io.h"
1112
#include "src/__support/arg_list.h"
1213
#include "src/__support/libc_errno.h"
1314
#include "src/__support/macros/config.h"
1415
#include "src/stdio/printf_core/core_structs.h"
15-
#include "src/stdio/printf_core/error_converter.h"
16+
#include "src/stdio/printf_core/error_mapper.h"
1617
#include "src/stdio/printf_core/printf_main.h"
1718
#include "src/stdio/printf_core/writer.h"
1819

‎libc/src/stdio/generic/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,11 @@ add_generic_entrypoint_object(
393393
list(APPEND fprintf_deps
394394
libc.hdr.types.FILE
395395
libc.src.__support.arg_list
396+
libc.src.__support.CPP.limits
397+
libc.src.__support.libc_errno
396398
libc.src.stdio.printf_core.vfprintf_internal
397399
libc.src.stdio.printf_core.core_structs
398-
libc.src.stdio.printf_core.error_converter
400+
libc.src.stdio.printf_core.error_mapper
399401
)
400402

401403
if(LLVM_LIBC_FULL_BUILD)

‎libc/src/stdio/generic/fprintf.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88

99
#include "src/stdio/fprintf.h"
1010

11+
#include "src/__support/CPP/limits.h"
1112
#include "src/__support/File/file.h"
1213
#include "src/__support/arg_list.h"
1314
#include "src/__support/macros/config.h"
1415
#include "src/stdio/printf_core/core_structs.h"
15-
#include "src/stdio/printf_core/error_converter.h"
16+
#include "src/stdio/printf_core/error_mapper.h"
1617
#include "src/stdio/printf_core/vfprintf_internal.h"
1718

1819
#include "hdr/types/FILE.h"

‎libc/src/stdio/generic/printf.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88

99
#include "src/stdio/printf.h"
1010

11+
#include "src/__support/CPP/limits.h"
1112
#include "src/__support/File/file.h"
1213
#include "src/__support/arg_list.h"
1314
#include "src/__support/macros/config.h"
1415
#include "src/stdio/printf_core/core_structs.h"
15-
#include "src/stdio/printf_core/error_converter.h"
16+
#include "src/stdio/printf_core/error_mapper.h"
1617
#include "src/stdio/printf_core/vfprintf_internal.h"
1718

1819
#include "hdr/types/FILE.h"

‎libc/src/stdio/generic/vfprintf.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88

99
#include "src/stdio/vfprintf.h"
1010

11+
#include "src/__support/CPP/limits.h"
1112
#include "src/__support/File/file.h"
1213
#include "src/__support/arg_list.h"
1314
#include "src/__support/macros/config.h"
1415
#include "src/stdio/printf_core/core_structs.h"
15-
#include "src/stdio/printf_core/error_converter.h"
16+
#include "src/stdio/printf_core/error_mapper.h"
1617
#include "src/stdio/printf_core/vfprintf_internal.h"
1718

1819
#include "hdr/types/FILE.h"

‎libc/src/stdio/generic/vprintf.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88

99
#include "src/stdio/vprintf.h"
1010

11+
#include "src/__support/CPP/limits.h"
1112
#include "src/__support/File/file.h"
1213
#include "src/__support/arg_list.h"
1314
#include "src/__support/macros/config.h"
1415
#include "src/stdio/printf_core/core_structs.h"
15-
#include "src/stdio/printf_core/error_converter.h"
16+
#include "src/stdio/printf_core/error_mapper.h"
1617
#include "src/stdio/printf_core/vfprintf_internal.h"
1718

1819
#include "hdr/types/FILE.h"

0 commit comments

Comments
 (0)