Skip to content

Commit 1381ad4

Browse files
authored
Revert "[libc] Reland #149423 "wchar string conversion functions mb to wc"" (#151016)
Reverts #150667
1 parent a4a0832 commit 1381ad4

File tree

15 files changed

+9
-969
lines changed

15 files changed

+9
-969
lines changed

libc/config/linux/x86_64/entrypoints.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,9 +1267,6 @@ if(LLVM_LIBC_FULL_BUILD)
12671267
libc.src.wchar.mbsinit
12681268
libc.src.wchar.mbrtowc
12691269
libc.src.wchar.mbtowc
1270-
libc.src.wchar.mbstowcs
1271-
libc.src.wchar.mbsrtowcs
1272-
libc.src.wchar.mbsnrtowcs
12731270
libc.src.wchar.wcrtomb
12741271
libc.src.wchar.wctomb
12751272
libc.src.wchar.wcstombs

libc/include/wchar.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,6 @@ functions:
5353
- type: wchar_t *__restrict
5454
- type: const char *__restrict
5555
- type: size_t
56-
- name: mbsnrtowcs
57-
standards:
58-
- stdc
59-
return_type: size_t
60-
arguments:
61-
- type: wchar_t *__restrict
62-
- type: const char **__restrict
63-
- type: size_t
64-
- type: size_t
65-
- type: mbstate_t *__restrict
66-
- name: mbsrtowcs
67-
standards:
68-
- stdc
69-
return_type: size_t
70-
arguments:
71-
- type: wchar_t *__restrict
72-
- type: const char **__restrict
73-
- type: size_t
74-
- type: mbstate_t *__restrict
75-
- name: mbstowcs
76-
standards:
77-
- stdc
78-
return_type: size_t
79-
arguments:
80-
- type: wchar_t *__restrict
81-
- type: const char *__restrict
82-
- type: size_t
8356
- name: mbsinit
8457
standards:
8558
- stdc

libc/src/__support/wchar/CMakeLists.txt

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,31 +60,14 @@ add_object_library(
6060
SRCS
6161
mbrtowc.cpp
6262
DEPENDS
63-
libc.hdr.errno_macros
64-
libc.hdr.types.wchar_t
65-
libc.hdr.types.size_t
66-
libc.src.__support.common
67-
libc.src.__support.error_or
68-
libc.src.__support.macros.config
69-
.character_converter
70-
.mbstate
71-
)
72-
73-
add_header_library(
74-
mbsnrtowcs
75-
HDRS
76-
mbsnrtowcs.h
77-
DEPENDS
78-
libc.hdr.errno_macros
79-
libc.hdr.types.wchar_t
80-
libc.hdr.types.size_t
81-
libc.src.__support.common
82-
libc.src.__support.error_or
83-
libc.src.__support.macros.config
84-
libc.src.__support.macros.null_check
85-
.character_converter
86-
.mbstate
87-
.string_converter
63+
libc.hdr.errno_macros
64+
libc.hdr.types.wchar_t
65+
libc.hdr.types.size_t
66+
libc.src.__support.common
67+
libc.src.__support.error_or
68+
libc.src.__support.macros.config
69+
.character_converter
70+
.mbstate
8871
)
8972

9073
add_header_library(

libc/src/__support/wchar/mbsnrtowcs.h

Lines changed: 0 additions & 66 deletions
This file was deleted.

libc/src/wchar/CMakeLists.txt

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -184,54 +184,6 @@ add_entrypoint_object(
184184
libc.src.__support.wchar.mbstate
185185
)
186186

187-
add_entrypoint_object(
188-
mbstowcs
189-
SRCS
190-
mbstowcs.cpp
191-
HDRS
192-
mbstowcs.h
193-
DEPENDS
194-
libc.hdr.types.size_t
195-
libc.hdr.types.wchar_t
196-
libc.src.__support.common
197-
libc.src.__support.macros.config
198-
libc.src.__support.libc_errno
199-
libc.src.__support.wchar.mbstate
200-
libc.src.__support.wchar.mbsnrtowcs
201-
)
202-
203-
add_entrypoint_object(
204-
mbsrtowcs
205-
SRCS
206-
mbsrtowcs.cpp
207-
HDRS
208-
mbsrtowcs.h
209-
DEPENDS
210-
libc.hdr.types.size_t
211-
libc.hdr.types.wchar_t
212-
libc.src.__support.common
213-
libc.src.__support.macros.config
214-
libc.src.__support.libc_errno
215-
libc.src.__support.wchar.mbstate
216-
libc.src.__support.wchar.mbsnrtowcs
217-
)
218-
219-
add_entrypoint_object(
220-
mbsnrtowcs
221-
SRCS
222-
mbsnrtowcs.cpp
223-
HDRS
224-
mbsnrtowcs.h
225-
DEPENDS
226-
libc.hdr.types.size_t
227-
libc.hdr.types.wchar_t
228-
libc.src.__support.common
229-
libc.src.__support.macros.config
230-
libc.src.__support.libc_errno
231-
libc.src.__support.wchar.mbstate
232-
libc.src.__support.wchar.mbsnrtowcs
233-
)
234-
235187
add_entrypoint_object(
236188
wcstombs
237189
SRCS

libc/src/wchar/mbsnrtowcs.cpp

Lines changed: 0 additions & 39 deletions
This file was deleted.

libc/src/wchar/mbsnrtowcs.h

Lines changed: 0 additions & 24 deletions
This file was deleted.

libc/src/wchar/mbsrtowcs.cpp

Lines changed: 0 additions & 39 deletions
This file was deleted.

libc/src/wchar/mbsrtowcs.h

Lines changed: 0 additions & 24 deletions
This file was deleted.

libc/src/wchar/mbstowcs.cpp

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)