Skip to content

Commit 615965c

Browse files
committed
Move common package version code to init/common
1 parent 5bed2ab commit 615965c

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/init.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -756,14 +756,7 @@ void InitParameterInteraction(ArgsManager& args)
756756
void InitLogging(const ArgsManager& args)
757757
{
758758
init::SetLoggingOptions(args);
759-
760-
std::string version_string = FormatFullVersion();
761-
#ifdef DEBUG
762-
version_string += " (debug build)";
763-
#else
764-
version_string += " (release build)";
765-
#endif
766-
LogPrintf(PACKAGE_NAME " version %s\n", version_string);
759+
init::LogPackageVersion();
767760
}
768761

769762
namespace { // Variables internal to initialization process only

src/init/common.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <config/bitcoin-config.h>
77
#endif
88

9+
#include <clientversion.h>
910
#include <compat/sanity.h>
1011
#include <crypto/sha256.h>
1112
#include <key.h>
@@ -152,4 +153,15 @@ bool StartLogging(const ArgsManager& args)
152153

153154
return true;
154155
}
156+
157+
void LogPackageVersion()
158+
{
159+
std::string version_string = FormatFullVersion();
160+
#ifdef DEBUG
161+
version_string += " (debug build)";
162+
#else
163+
version_string += " (release build)";
164+
#endif
165+
LogPrintf(PACKAGE_NAME " version %s\n", version_string);
166+
}
155167
} // namespace init

src/init/common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ void AddLoggingArgs(ArgsManager& args);
2222
void SetLoggingOptions(const ArgsManager& args);
2323
void SetLoggingCategories(const ArgsManager& args);
2424
bool StartLogging(const ArgsManager& args);
25+
void LogPackageVersion();
2526
} // namespace init
2627

2728
#endif // BITCOIN_INIT_COMMON_H

0 commit comments

Comments
 (0)