DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Make nType and nVersion private and sometimes const

Browse Source 
Make the various stream implementations' nType and nVersion private
and const (except in CDataStream where we really need a setter).
This commit is contained in:
Pieter Wuille
2016-10-28 16:57:24 -07:00
committed by Jack Grigg
parent 1315591c85
commit 7f4acac433
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hash.h
View File

@@ -134,9 +134,9 @@ class CHashWriter
private: private:
CHash256 ctx; CHash256 ctx;
const int nType;
const int nVersion;
public: public:
int nType;
int nVersion;
CHashWriter(int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn) {} CHashWriter(int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn) {}

4
src/serialize.h
View File

@@ -1075,9 +1075,9 @@ class CSizeComputer
protected: protected:
size_t nSize; size_t nSize;
const int nType;
const int nVersion;
public: public:
int nType;
int nVersion;
CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {} CSizeComputer(int nTypeIn, int nVersionIn) : nSize(0), nType(nTypeIn), nVersion(nVersionIn) {}

31
src/streams.h
View File

@@ -34,9 +34,10 @@ protected:
typedef SerializeType vector_type; typedef SerializeType vector_type;
vector_type vch; vector_type vch;
unsigned int nReadPos; unsigned int nReadPos;
public:
int nType; int nType;
int nVersion; int nVersion;
public:
typedef typename vector_type::allocator_type allocator_type; typedef typename vector_type::allocator_type allocator_type;
typedef typename vector_type::size_type size_type; typedef typename vector_type::size_type size_type;
@@ -219,9 +220,9 @@ public:
int in_avail() { return size(); } int in_avail() { return size(); }
void SetType(int n) { nType = n; } void SetType(int n) { nType = n; }
int GetType() { return nType; } int GetType() const { return nType; }
void SetVersion(int n) { nVersion = n; } void SetVersion(int n) { nVersion = n; }
int GetVersion() { return nVersion; } int GetVersion() const { return nVersion; }
void read(char* pch, size_t nSize) void read(char* pch, size_t nSize)
{ {
@@ -353,17 +354,15 @@ private:
CAutoFile(const CAutoFile&); CAutoFile(const CAutoFile&);
CAutoFile& operator=(const CAutoFile&); CAutoFile& operator=(const CAutoFile&);
int nType; const int nType;
int nVersion; const int nVersion;
FILE* file; FILE* file;
public: public:
CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn) CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn)
{ {
file = filenew; file = filenew;
nType = nTypeIn;
nVersion = nVersionIn;
} }
~CAutoFile() ~CAutoFile()
@@ -398,10 +397,8 @@ public:
// //
// Stream subset // Stream subset
// //
void SetType(int n) { nType = n; } int GetType() const { return nType; }
int GetType() { return nType; } int GetVersion() const { return nVersion; }
void SetVersion(int n) { nVersion = n; }
int GetVersion() { return nVersion; }
void read(char* pch, size_t nSize) void read(char* pch, size_t nSize)
{ {
@@ -473,8 +470,8 @@ private:
CBufferedFile(const CBufferedFile&); CBufferedFile(const CBufferedFile&);
CBufferedFile& operator=(const CBufferedFile&); CBufferedFile& operator=(const CBufferedFile&);
int nType; const int nType;
int nVersion; const int nVersion;
FILE *src; // source file FILE *src; // source file
uint64_t nSrcPos; // how many bytes have been read from source uint64_t nSrcPos; // how many bytes have been read from source
@@ -504,11 +501,9 @@ protected:
public: public:
CBufferedFile(FILE *fileIn, uint64_t nBufSize, uint64_t nRewindIn, int nTypeIn, int nVersionIn) : CBufferedFile(FILE *fileIn, uint64_t nBufSize, uint64_t nRewindIn, int nTypeIn, int nVersionIn) :
nSrcPos(0), nReadPos(0), nReadLimit((uint64_t)(-1)), nRewind(nRewindIn), vchBuf(nBufSize, 0) nType(nTypeIn), nVersion(nVersionIn), nSrcPos(0), nReadPos(0), nReadLimit((uint64_t)(-1)), nRewind(nRewindIn), vchBuf(nBufSize, 0)
{ {
src = fileIn; src = fileIn;
nType = nTypeIn;
nVersion = nVersionIn;
} }
~CBufferedFile() ~CBufferedFile()