From b1d8a1d7e8f8425c4d4ed8709acd65a4b8fcbf56 Mon Sep 17 00:00:00 2001 From: Mark Langen Date: Tue, 4 Jul 2023 21:10:53 -0700 Subject: [PATCH] Use p_ convention --- LEGO1/legostream.cpp | 50 ++++++++++++++++++++++---------------------- LEGO1/legostream.h | 28 ++++++++++++------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/LEGO1/legostream.cpp b/LEGO1/legostream.cpp index 273951dc..7f2e5387 100644 --- a/LEGO1/legostream.cpp +++ b/LEGO1/legostream.cpp @@ -31,25 +31,25 @@ LegoFileStream::~LegoFileStream() } // OFFSET: LEGO1 0x100992c0 -MxResult LegoFileStream::Read(char* buffer, MxU32 size) +MxResult LegoFileStream::Read(char* p_buffer, MxU32 p_size) { if (m_hFile == NULL) return FAILURE; - return (fread(buffer, 1, size, m_hFile) == size) ? SUCCESS : FAILURE; + return (fread(p_buffer, 1, p_size, m_hFile) == p_size) ? SUCCESS : FAILURE; } // OFFSET: LEGO1 0x10099300 -MxResult LegoFileStream::Write(char* buffer, MxU32 size) +MxResult LegoFileStream::Write(char* p_buffer, MxU32 p_size) { if (m_hFile == NULL) return FAILURE; - return (fwrite(buffer, 1, size, m_hFile) == size) ? SUCCESS : FAILURE; + return (fwrite(p_buffer, 1, p_size, m_hFile) == p_size) ? SUCCESS : FAILURE; } // OFFSET: LEGO1 0x10099340 -MxResult LegoFileStream::Tell(MxU32* offset) +MxResult LegoFileStream::Tell(MxU32* p_offset) { if (m_hFile == NULL) return FAILURE; @@ -58,21 +58,21 @@ MxResult LegoFileStream::Tell(MxU32* offset) if (got == -1) return FAILURE; - *offset = got; + *p_offset = got; return SUCCESS; } // OFFSET: LEGO1 0x10099370 -MxResult LegoFileStream::Seek(MxU32 offset) +MxResult LegoFileStream::Seek(MxU32 p_offset) { if (m_hFile == NULL) return FAILURE; - return (fseek(m_hFile, offset, 0) == 0) ? SUCCESS : FAILURE; + return (fseek(m_hFile, p_offset, 0) == 0) ? SUCCESS : FAILURE; } // OFFSET: LEGO1 0x100993a0 -MxResult LegoFileStream::Open(const char* filename, OpenFlags mode) +MxResult LegoFileStream::Open(const char* p_filename, OpenFlags p_mode) { char modeString[4]; @@ -80,62 +80,62 @@ MxResult LegoFileStream::Open(const char* filename, OpenFlags mode) fclose(m_hFile); modeString[0] = '\0'; - if (mode & ReadBit) + if (p_mode & ReadBit) { m_mode = LEGOSTREAM_MODE_READ; strcat(modeString, "r"); } - if (mode & WriteBit) + if (p_mode & WriteBit) { if (m_mode != LEGOSTREAM_MODE_READ) m_mode = LEGOSTREAM_MODE_WRITE; strcat(modeString, "w"); } - if ((mode & 4) != 0) + if ((p_mode & 4) != 0) strcat(modeString, "b"); else strcat(modeString, "t"); - return (m_hFile = fopen(filename, modeString)) ? SUCCESS : FAILURE; + return (m_hFile = fopen(p_filename, modeString)) ? SUCCESS : FAILURE; } // OFFSET: LEGO1 0x10099080 -LegoMemoryStream::LegoMemoryStream(char* buffer) +LegoMemoryStream::LegoMemoryStream(char* p_buffer) : LegoStream() { - m_buffer = buffer; + m_buffer = p_buffer; m_offset = 0; } // OFFSET: LEGO1 0x10099160 -MxResult LegoMemoryStream::Read(char* buffer, MxU32 size) +MxResult LegoMemoryStream::Read(char* p_buffer, MxU32 p_size) { - memcpy(buffer, m_buffer + m_offset, size); - m_offset += size; + memcpy(p_buffer, m_buffer + m_offset, p_size); + m_offset += p_size; return SUCCESS; } // OFFSET: LEGO1 0x10099190 -MxResult LegoMemoryStream::Write(char* buffer, MxU32 size) +MxResult LegoMemoryStream::Write(char* p_buffer, MxU32 p_size) { - memcpy(m_buffer + m_offset, buffer, size); - m_offset += size; + memcpy(m_buffer + m_offset, p_buffer, p_size); + m_offset += p_size; return SUCCESS; } // OFFSET: LEGO1 0x100994a0 -MxResult LegoMemoryStream::Tell(MxU32* offset) +MxResult LegoMemoryStream::Tell(MxU32* p_offset) { - *offset = m_offset; + *p_offset = m_offset; return SUCCESS; } // OFFSET: LEGO1 0x100994b0 -MxResult LegoMemoryStream::Seek(MxU32 offset) +MxResult LegoMemoryStream::Seek(MxU32 p_offset) { - m_offset = offset; + m_offset = p_offset; return SUCCESS; } diff --git a/LEGO1/legostream.h b/LEGO1/legostream.h index ede2673f..899bd7e1 100644 --- a/LEGO1/legostream.h +++ b/LEGO1/legostream.h @@ -15,10 +15,10 @@ class LegoStream LegoStream() : m_mode(0) {} inline virtual ~LegoStream() {}; - virtual MxResult Read(char* buffer, MxU32 size) = 0; - virtual MxResult Write(char* buffer, MxU32 size) = 0; - virtual MxResult Tell(MxU32* offset) = 0; - virtual MxResult Seek(MxU32 offset) = 0; + virtual MxResult Read(char* p_buffer, MxU32 p_size) = 0; + virtual MxResult Write(char* p_buffer, MxU32 p_size) = 0; + virtual MxResult Tell(MxU32* p_offset) = 0; + virtual MxResult Seek(MxU32 p_offset) = 0; virtual MxBool IsWriteMode(); virtual MxBool IsReadMode(); @@ -40,12 +40,12 @@ class LegoFileStream : public LegoStream LegoFileStream(); virtual ~LegoFileStream(); - MxResult Read(char* buffer, MxU32 size) override; - MxResult Write(char* buffer, MxU32 size) override; - MxResult Tell(MxU32* offset) override; - MxResult Seek(MxU32 offset) override; + MxResult Read(char* p_buffer, MxU32 p_size) override; + MxResult Write(char* p_buffer, MxU32 p_size) override; + MxResult Tell(MxU32* p_offset) override; + MxResult Seek(MxU32 p_offset) override; - MxResult Open(const char* filename, OpenFlags mode); + MxResult Open(const char* p_filename, OpenFlags p_mode); private: FILE *m_hFile; @@ -54,13 +54,13 @@ class LegoFileStream : public LegoStream class LegoMemoryStream : public LegoStream { public: - LegoMemoryStream(char* buffer); + LegoMemoryStream(char* p_buffer); ~LegoMemoryStream() {} - MxResult Read(char* buffer, MxU32 size) override; - MxResult Write(char* buffer, MxU32 size) override; - MxResult Tell(MxU32* offset) override; - MxResult Seek(MxU32 offset) override; + MxResult Read(char* p_buffer, MxU32 p_size) override; + MxResult Write(char* p_buffer, MxU32 p_size) override; + MxResult Tell(MxU32* p_offset) override; + MxResult Seek(MxU32 p_offset) override; private: char *m_buffer;