ソースを参照

Move `*Version()` functions to version.h/cpp

tags/v0.15.1
Wladimir J. van der Laan 7年前
コミット
6e5fd003e0
8個のファイルの変更36行の追加28行の削除
  1. 1
    0
      src/bitcoin-cli.cpp
  2. 1
    1
      src/qt/utilitydialog.cpp
  3. 1
    0
      src/rpcprotocol.cpp
  4. 1
    0
      src/tinyformat.h
  5. 0
    25
      src/util.cpp
  6. 0
    2
      src/util.h
  7. 28
    0
      src/version.cpp
  8. 4
    0
      src/version.h

+ 1
- 0
src/bitcoin-cli.cpp ファイルの表示

@@ -8,6 +8,7 @@
#include "rpcclient.h"
#include "rpcprotocol.h"
#include "chainparamsbase.h"
#include "version.h"

#include <boost/filesystem/operations.hpp>


+ 1
- 1
src/qt/utilitydialog.cpp ファイルの表示

@@ -10,9 +10,9 @@
#include "clientmodel.h"
#include "guiutil.h"

#include "clientversion.h"
#include "init.h"
#include "util.h"
#include "version.h"

#include <QLabel>
#include <QRegExp>

+ 1
- 0
src/rpcprotocol.cpp ファイルの表示

@@ -6,6 +6,7 @@
#include "rpcprotocol.h"

#include "util.h"
#include "version.h"

#include <stdint.h>


+ 1
- 0
src/tinyformat.h ファイルの表示

@@ -121,6 +121,7 @@ namespace tfm = tinyformat;
#include <cassert>
#include <iostream>
#include <sstream>
#include <stdexcept>

#ifndef TINYFORMAT_ERROR
# define TINYFORMAT_ERROR(reason) assert(0 && reason)

+ 0
- 25
src/util.cpp ファイルの表示

@@ -13,7 +13,6 @@
#include "random.h"
#include "sync.h"
#include "uint256.h"
#include "version.h"

#include <stdarg.h>

@@ -1116,30 +1115,6 @@ void SetMockTime(int64_t nMockTimeIn)
nMockTime = nMockTimeIn;
}

string FormatVersion(int nVersion)
{
if (nVersion%100 == 0)
return strprintf("%d.%d.%d", nVersion/1000000, (nVersion/10000)%100, (nVersion/100)%100);
else
return strprintf("%d.%d.%d.%d", nVersion/1000000, (nVersion/10000)%100, (nVersion/100)%100, nVersion%100);
}

string FormatFullVersion()
{
return CLIENT_BUILD;
}

// Format the subversion field according to BIP 14 spec (https://en.bitcoin.it/wiki/BIP_0014)
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments)
{
std::ostringstream ss;
ss << "/";
ss << name << ":" << FormatVersion(nClientVersion);
if (!comments.empty())
ss << "(" << boost::algorithm::join(comments, "; ") << ")";
ss << "/";
return ss.str();
}

#ifdef WIN32
boost::filesystem::path GetSpecialFolderPath(int nFolder, bool fCreate)

+ 0
- 2
src/util.h ファイルの表示

@@ -156,8 +156,6 @@ boost::filesystem::path GetTempPath();
void ShrinkDebugFile();
int64_t GetTime();
void SetMockTime(int64_t nMockTimeIn);
std::string FormatFullVersion();
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
void runCommand(std::string strCommand);

inline std::string i64tostr(int64_t n)

+ 28
- 0
src/version.cpp ファイルの表示

@@ -4,7 +4,10 @@

#include "version.h"

#include "tinyformat.h"

#include <string>
#include <boost/algorithm/string/join.hpp>

// Name of client reported in the 'version' message. Report the same name
// for both bitcoind and bitcoin-qt, to make it harder for attackers to
@@ -69,3 +72,28 @@ const std::string CLIENT_NAME("Satoshi");

const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX);
const std::string CLIENT_DATE(BUILD_DATE);

static std::string FormatVersion(int nVersion)
{
if (nVersion%100 == 0)
return strprintf("%d.%d.%d", nVersion/1000000, (nVersion/10000)%100, (nVersion/100)%100);
else
return strprintf("%d.%d.%d.%d", nVersion/1000000, (nVersion/10000)%100, (nVersion/100)%100, nVersion%100);
}

std::string FormatFullVersion()
{
return CLIENT_BUILD;
}

// Format the subversion field according to BIP 14 spec (https://en.bitcoin.it/wiki/BIP_0014)
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments)
{
std::ostringstream ss;
ss << "/";
ss << name << ":" << FormatVersion(nClientVersion);
if (!comments.empty())
ss << "(" << boost::algorithm::join(comments, "; ") << ")";
ss << "/";
return ss.str();
}

+ 4
- 0
src/version.h ファイルの表示

@@ -7,6 +7,7 @@
#include "clientversion.h"

#include <string>
#include <vector>

//
// client versioning
@@ -48,4 +49,7 @@ static const int BIP0031_VERSION = 60000;
// "mempool" command, enhanced "getdata" behavior starts with this version
static const int MEMPOOL_GD_VERSION = 60002;

std::string FormatFullVersion();
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);

#endif

読み込み中…
キャンセル
保存