Merge pull request #2063 from Diapolo/CDiskBlockPos

add 2 constructors in CDiskBlockPos to simplify class usage

src/init.cpp

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

src/main.cpp

@@ -1535,9 +1535,7 @@ void static FlushBlockFile()
 {
     LOCK(cs_LastBlockFile);
 
-    CDiskBlockPos posOld;
+    CDiskBlockPos posOld(nLastBlockFile, 0);
-    posOld.nFile = nLastBlockFile;
-    posOld.nPos = 0;
 
     FILE *fileOld = OpenBlockFile(posOld);
     FileCommit(fileOld);

src/main.h

@@ -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;
     }