Browse Source

add 2 constructors in CDiskBlockPos to simplify class usage

- add a default-constructor, which simply calls SetNull() and a
  constructor to directly pass nFile and nPos
- change code to use that new constructors
tags/v0.15.1
Philip Kaufmann 8 years ago
parent
commit
a8a4b9673e
3 changed files with 13 additions and 10 deletions
  1. 1
    3
      src/init.cpp
  2. 1
    3
      src/main.cpp
  3. 11
    4
      src/main.h

+ 1
- 3
src/init.cpp View File

@@ -346,9 +346,7 @@ void ThreadImport(void *data) {
CImportingNow imp;
int nFile = 0;
while (!fShutdown) {
CDiskBlockPos pos;
pos.nFile = nFile;
pos.nPos = 0;
CDiskBlockPos pos(nFile, 0);
FILE *file = OpenBlockFile(pos, true);
if (!file)
break;

+ 1
- 3
src/main.cpp View File

@@ -1535,9 +1535,7 @@ void static FlushBlockFile()
{
LOCK(cs_LastBlockFile);

CDiskBlockPos posOld;
posOld.nFile = nLastBlockFile;
posOld.nPos = 0;
CDiskBlockPos posOld(nLastBlockFile, 0);

FILE *fileOld = OpenBlockFile(posOld);
FileCommit(fileOld);

+ 11
- 4
src/main.h View File

@@ -192,6 +192,15 @@ public:
READWRITE(VARINT(nPos));
)

CDiskBlockPos() {
SetNull();
}

CDiskBlockPos(int nFileIn, unsigned int nPosIn) {
nFile = nFileIn;
nPos = nPosIn;
}

friend bool operator==(const CDiskBlockPos &a, const CDiskBlockPos &b) {
return (a.nFile == b.nFile && a.nPos == b.nPos);
}
@@ -1493,8 +1502,7 @@ public:
if (nStatus & BLOCK_HAVE_DATA) {
ret.nFile = nFile;
ret.nPos = nDataPos;
} else
ret.SetNull();
}
return ret;
}

@@ -1503,8 +1511,7 @@ public:
if (nStatus & BLOCK_HAVE_UNDO) {
ret.nFile = nFile;
ret.nPos = nUndoPos;
} else
ret.SetNull();
}
return ret;
}


Loading…
Cancel
Save