Skip to content

Commit ea68964

Browse files
committed
rename functions
1 parent e7be533 commit ea68964

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

llvm/include/llvm/Support/AutoConvert.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ std::error_code restorezOSStdHandleAutoConversion(int FD);
5454
std::error_code setzOSFileTag(int FD, int CCSID, bool Text);
5555

5656
// Get the the tag ccsid for a file name or a file descriptor.
57-
ErrorOr<__ccsid_t> getFileTag(const char *FileName, const int FD = -1);
57+
ErrorOr<__ccsid_t> getzOSFileTag(const char *FileName, const int FD = -1);
5858

5959
// Query the file tag to determine if it needs conversion to UTF-8 codepage.
60-
ErrorOr<bool> needConversion(const char *FileName, const int FD = -1);
60+
ErrorOr<bool> needzOSConversion(const char *FileName, const int FD = -1);
6161

6262
} // namespace llvm
6363
#endif // __cplusplus

llvm/lib/Support/AutoConvert.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ std::error_code llvm::setzOSFileTag(int FD, int CCSID, bool Text) {
118118
return std::error_code();
119119
}
120120

121-
ErrorOr<__ccsid_t> llvm::getFileTag(const char *FileName, const int FD) {
121+
ErrorOr<__ccsid_t> llvm::getzOSFileTag(const char *FileName, const int FD) {
122122
// If we have a file descriptor, use it to find out file tagging. Otherwise we
123123
// need to use stat() with the file path.
124124
if (FD != -1) {
@@ -137,8 +137,8 @@ ErrorOr<__ccsid_t> llvm::getFileTag(const char *FileName, const int FD) {
137137
return Attr.st_tag.ft_ccsid;
138138
}
139139

140-
ErrorOr<bool> llvm::needConversion(const char *FileName, const int FD) {
141-
ErrorOr<__ccsid_t> Ccsid = getFileTag(FileName, FD);
140+
ErrorOr<bool> llvm::needzOSConversion(const char *FileName, const int FD) {
141+
ErrorOr<__ccsid_t> Ccsid = getzOSFileTag(FileName, FD);
142142
if (std::error_code EC = Ccsid.getError())
143143
return EC;
144144
// We don't need conversion for UTF-8 tagged files or binary files.

llvm/lib/Support/MemoryBuffer.cpp

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

511511
#ifdef __MVS__
512-
ErrorOr<bool> NeedConversion = needConversion(Filename.str().c_str(), FD);
512+
ErrorOr<bool> NeedConversion = needzOSConversion(Filename.str().c_str(), FD);
513513
if (std::error_code EC = NeedConversion.getError())
514514
return EC;
515515
// File size may increase due to EBCDIC -> UTF-8 conversion, therefore we

0 commit comments

Comments
 (0)