Minecraft/4jcraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: nuke all widestrings and widechars everywhere

Browse Source
This commit is contained in:
Tropical
2026-04-07 23:20:09 -05:00
parent f1f1d116b3
commit 2912e9ae2e
1323 changed files with 23207 additions and 23399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/java/src/InputOutputStream/BufferedReader.cpp
+10 -10
View File
@@ -11,8 +11,8 @@
BufferedReader::BufferedReader(Reader* in)
: reader(in), readMark(0), bufferedMark(0), eofReached(false) {
bufferSize = 64;
buffer = new wchar_t[bufferSize];
memset(buffer, 0, sizeof(wchar_t) * bufferSize);
buffer = new char[bufferSize];
memset(buffer, 0, sizeof(char) * bufferSize);
bufferMore();
}
@@ -25,8 +25,8 @@ void BufferedReader::bufferMore() {
if (bufferSize < (bufferedMark + BUFFER_MORE_AMOUNT)) {
// Enlarge the buffer
wchar_t* temp = new wchar_t[bufferSize * 2];
memset(temp, 0, sizeof(wchar_t) * bufferSize * 2);
char* temp = new char[bufferSize * 2];
memset(temp, 0, sizeof(char) * bufferSize * 2);
std::copy(buffer, buffer + bufferSize, temp);
delete[] buffer;
@@ -99,11 +99,11 @@ int BufferedReader::read() {
// Returns:
// The number of characters read, or -1 if the end of the stream has been
// reached
int BufferedReader::read(wchar_t cbuf[], unsigned int off, unsigned int len) {
int BufferedReader::read(char cbuf[], unsigned int off, unsigned int len) {
if (bufferSize < (bufferedMark + len)) {
// Enlarge the buffer
wchar_t* temp = new wchar_t[bufferSize * 2];
memset(temp, 0, sizeof(wchar_t) * bufferSize * 2);
char* temp = new char[bufferSize * 2];
memset(temp, 0, sizeof(char) * bufferSize * 2);
std::copy(buffer, buffer + bufferSize, temp);
delete[] buffer;
@@ -135,12 +135,12 @@ int BufferedReader::read(wchar_t cbuf[], unsigned int off, unsigned int len) {
// immediately by a linefeed. Returns: A String containing the contents of the
// line, not including any line-termination characters, or null if the end of
// the stream has been reached
std::wstring BufferedReader::readLine() {
std::wstring output = L"";
std::string BufferedReader::readLine() {
std::string output = "";
bool newLineCharFound = false;
while (readMark < bufferedMark) {
wchar_t value = buffer[readMark++];
char value = buffer[readMark++];
if (!newLineCharFound) {
if ((value == '\n') || (value == '\r')) {