Skip to content

Commit 311ac63

Browse files
abhina-sreeabhina-sree
authored
[NFC][SystemZ][z/OS] Rename autoconversion-related functions to be less generic (#107399)
This patch renames the functions in AutoConvert.h/cpp to have a less generic name because they are z/OS specific.
1 parent cf2ecc7 commit 311ac63

File tree

10 files changed

+36
-36
lines changed

10 files changed

+36
-36
lines changed

‎clang/tools/c-arcmt-test/c-arcmt-test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ static void flush_atexit(void) {
109109

110110
int main(int argc, const char **argv) {
111111
#ifdef __MVS__
112-
if (enableAutoConversion(fileno(stdout)) == -1)
112+
if (enablezOSAutoConversion(fileno(stdout)) == -1)
113113
fprintf(stderr, "Setting conversion on stdout failed\n");
114114

115-
if (enableAutoConversion(fileno(stderr)) == -1)
115+
if (enablezOSAutoConversion(fileno(stderr)) == -1)
116116
fprintf(stderr, "Setting conversion on stderr failed\n");
117117
#endif
118118

‎clang/tools/c-index-test/c-index-test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5180,10 +5180,10 @@ int main(int argc, const char **argv) {
51805180
thread_info client_data;
51815181

51825182
#ifdef __MVS__
5183-
if (enableAutoConversion(fileno(stdout)) == -1)
5183+
if (enablezOSAutoConversion(fileno(stdout)) == -1)
51845184
fprintf(stderr, "Setting conversion on stdout failed\n");
51855185

5186-
if (enableAutoConversion(fileno(stderr)) == -1)
5186+
if (enablezOSAutoConversion(fileno(stderr)) == -1)
51875187
fprintf(stderr, "Setting conversion on stderr failed\n");
51885188
#endif
51895189

‎llvm/include/llvm/Support/AutoConvert.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#ifdef __cplusplus
2828
extern "C" {
2929
#endif // __cplusplus
30-
int enableAutoConversion(int FD);
31-
int disableAutoConversion(int FD);
32-
int restoreStdHandleAutoConversion(int FD);
30+
int enablezOSAutoConversion(int FD);
31+
int disablezOSAutoConversion(int FD);
32+
int restorezOSStdHandleAutoConversion(int FD);
3333
#ifdef __cplusplus
3434
}
3535
#endif // __cplusplus
@@ -39,18 +39,18 @@ namespace llvm {
3939

4040
/// \brief Disable the z/OS enhanced ASCII auto-conversion for the file
4141
/// descriptor.
42-
std::error_code disableAutoConversion(int FD);
42+
std::error_code disablezOSAutoConversion(int FD);
4343

4444
/// \brief Query the z/OS enhanced ASCII auto-conversion status of a file
4545
/// descriptor and force the conversion if the file is not tagged with a
4646
/// codepage.
47-
std::error_code enableAutoConversion(int FD);
47+
std::error_code enablezOSAutoConversion(int FD);
4848

4949
/// Restore the z/OS enhanced ASCII auto-conversion for the std handle.
50-
std::error_code restoreStdHandleAutoConversion(int FD);
50+
std::error_code restorezOSStdHandleAutoConversion(int FD);
5151

5252
/// \brief Set the tag information for a file descriptor.
53-
std::error_code setFileTag(int FD, int CCSID, bool Text);
53+
std::error_code setzOSFileTag(int FD, int CCSID, bool Text);
5454

5555
} // namespace llvm
5656
#endif // __cplusplus

‎llvm/lib/Support/AutoConvert.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
static int savedStdHandleAutoConversionMode[3] = {-1, -1, -1};
2424

25-
int disableAutoConversion(int FD) {
25+
int disablezOSAutoConversion(int FD) {
2626
static const struct f_cnvrt Convert = {
2727
SETCVTOFF, // cvtcmd
2828
0, // pccsid
@@ -32,7 +32,7 @@ int disableAutoConversion(int FD) {
3232
return fcntl(FD, F_CONTROL_CVT, &Convert);
3333
}
3434

35-
int restoreStdHandleAutoConversion(int FD) {
35+
int restorezOSStdHandleAutoConversion(int FD) {
3636
assert(FD == STDIN_FILENO || FD == STDOUT_FILENO || FD == STDERR_FILENO);
3737
if (savedStdHandleAutoConversionMode[FD] == -1)
3838
return 0;
@@ -44,7 +44,7 @@ int restoreStdHandleAutoConversion(int FD) {
4444
return (fcntl(FD, F_CONTROL_CVT, &Cvt));
4545
}
4646

47-
int enableAutoConversion(int FD) {
47+
int enablezOSAutoConversion(int FD) {
4848
struct f_cnvrt Query = {
4949
QUERYCVT, // cvtcmd
5050
0, // pccsid
@@ -81,28 +81,28 @@ int enableAutoConversion(int FD) {
8181
return fcntl(FD, F_CONTROL_CVT, &Query);
8282
}
8383

84-
std::error_code llvm::disableAutoConversion(int FD) {
85-
if (::disableAutoConversion(FD) == -1)
84+
std::error_code llvm::disablezOSAutoConversion(int FD) {
85+
if (::disablezOSAutoConversion(FD) == -1)
8686
return errnoAsErrorCode();
8787

8888
return std::error_code();
8989
}
9090

91-
std::error_code llvm::enableAutoConversion(int FD) {
92-
if (::enableAutoConversion(FD) == -1)
91+
std::error_code llvm::enablezOSAutoConversion(int FD) {
92+
if (::enablezOSAutoConversion(FD) == -1)
9393
return errnoAsErrorCode();
9494

9595
return std::error_code();
9696
}
9797

98-
std::error_code llvm::restoreStdHandleAutoConversion(int FD) {
99-
if (::restoreStdHandleAutoConversion(FD) == -1)
98+
std::error_code llvm::restorezOSStdHandleAutoConversion(int FD) {
99+
if (::restorezOSStdHandleAutoConversion(FD) == -1)
100100
return errnoAsErrorCode();
101101

102102
return std::error_code();
103103
}
104104

105-
std::error_code llvm::setFileTag(int FD, int CCSID, bool Text) {
105+
std::error_code llvm::setzOSFileTag(int FD, int CCSID, bool Text) {
106106
assert((!Text || (CCSID != FT_UNTAGGED && CCSID != FT_BINARY)) &&
107107
"FT_UNTAGGED and FT_BINARY are not allowed for text files");
108108
struct file_tag Tag;

‎llvm/lib/Support/InitLLVM.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ void CleanupStdHandles(void *Cookie) {
2727
llvm::raw_ostream *Outs = &llvm::outs(), *Errs = &llvm::errs();
2828
Outs->flush();
2929
Errs->flush();
30-
llvm::restoreStdHandleAutoConversion(STDIN_FILENO);
31-
llvm::restoreStdHandleAutoConversion(STDOUT_FILENO);
32-
llvm::restoreStdHandleAutoConversion(STDERR_FILENO);
30+
llvm::restorezOSStdHandleAutoConversion(STDIN_FILENO);
31+
llvm::restorezOSStdHandleAutoConversion(STDOUT_FILENO);
32+
llvm::restorezOSStdHandleAutoConversion(STDERR_FILENO);
3333
}
3434
#endif
3535

@@ -70,8 +70,8 @@ InitLLVM::InitLLVM(int &Argc, const char **&Argv,
7070

7171
// If turning on conversion for stderr fails then the error message
7272
// may be garbled. There is no solution to this problem.
73-
ExitOnErr(errorCodeToError(llvm::enableAutoConversion(STDERR_FILENO)));
74-
ExitOnErr(errorCodeToError(llvm::enableAutoConversion(STDOUT_FILENO)));
73+
ExitOnErr(errorCodeToError(llvm::enablezOSAutoConversion(STDERR_FILENO)));
74+
ExitOnErr(errorCodeToError(llvm::enablezOSAutoConversion(STDOUT_FILENO)));
7575
#endif
7676

7777
#ifdef _WIN32

‎llvm/lib/Support/MemoryBuffer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ getOpenFileImpl(sys::fs::file_t FD, const Twine &Filename, uint64_t FileSize,
505505

506506
#ifdef __MVS__
507507
// Set codepage auto-conversion for z/OS.
508-
if (auto EC = llvm::enableAutoConversion(FD))
508+
if (auto EC = llvm::enablezOSAutoConversion(FD))
509509
return EC;
510510
#endif
511511

‎llvm/lib/Support/Unix/Path.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,17 +1096,17 @@ std::error_code openFile(const Twine &Name, int &ResultFD,
10961096
!Stat.st_tag.ft_txtflag && !Stat.st_tag.ft_ccsid &&
10971097
Stat.st_size == 0;
10981098
if (Flags & OF_Text) {
1099-
if (auto EC = llvm::enableAutoConversion(ResultFD))
1099+
if (auto EC = llvm::enablezOSAutoConversion(ResultFD))
11001100
return EC;
11011101
if (DoSetTag) {
1102-
if (auto EC = llvm::setFileTag(ResultFD, CCSID_IBM_1047, true))
1102+
if (auto EC = llvm::setzOSFileTag(ResultFD, CCSID_IBM_1047, true))
11031103
return EC;
11041104
}
11051105
} else {
1106-
if (auto EC = llvm::disableAutoConversion(ResultFD))
1106+
if (auto EC = llvm::disablezOSAutoConversion(ResultFD))
11071107
return EC;
11081108
if (DoSetTag) {
1109-
if (auto EC = llvm::setFileTag(ResultFD, FT_BINARY, false))
1109+
if (auto EC = llvm::setzOSFileTag(ResultFD, FT_BINARY, false))
11101110
return EC;
11111111
}
11121112
}

‎llvm/lib/Support/Unix/Program.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ std::error_code llvm::sys::ChangeStdoutMode(fs::OpenFlags Flags) {
533533

534534
std::error_code llvm::sys::ChangeStdinToBinary() {
535535
#ifdef __MVS__
536-
return disableAutoConversion(STDIN_FILENO);
536+
return disablezOSAutoConversion(STDIN_FILENO);
537537
#else
538538
// Do nothing, as Unix doesn't differentiate between text and binary.
539539
return std::error_code();

‎llvm/lib/Support/raw_ostream.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ raw_fd_ostream &llvm::outs() {
894894
// Set buffer settings to model stdout behavior.
895895
std::error_code EC;
896896
#ifdef __MVS__
897-
EC = enableAutoConversion(STDOUT_FILENO);
897+
EC = enablezOSAutoConversion(STDOUT_FILENO);
898898
assert(!EC);
899899
#endif
900900
static raw_fd_ostream S("-", EC, sys::fs::OF_None);
@@ -905,7 +905,7 @@ raw_fd_ostream &llvm::outs() {
905905
raw_fd_ostream &llvm::errs() {
906906
// Set standard error to be unbuffered.
907907
#ifdef __MVS__
908-
std::error_code EC = enableAutoConversion(STDERR_FILENO);
908+
std::error_code EC = enablezOSAutoConversion(STDERR_FILENO);
909909
assert(!EC);
910910
#endif
911911
static raw_fd_ostream S(STDERR_FILENO, false, true);

‎llvm/utils/count/count.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
int main(int argc, char **argv) {
1414
#ifdef __MVS__
15-
if (enableAutoConversion(fileno(stdin)) == -1)
15+
if (enablezOSAutoConversion(fileno(stdin)) == -1)
1616
fprintf(stderr, "Setting conversion on stdin failed\n");
1717

18-
if (enableAutoConversion(fileno(stderr)) == -1)
18+
if (enablezOSAutoConversion(fileno(stderr)) == -1)
1919
fprintf(stdout, "Setting conversion on stderr failed\n");
2020
#endif
2121
size_t Count, NumLines, NumRead;

0 commit comments

Comments
 (0)