MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 10:12:39 +01:00
Code Issues Releases Wiki Activity

ircd::info::versions: Rename types to ABI and ABI.

Browse source 
modules/console: Tweak formatting.
This commit is contained in:
Jason Volk 2019-05-31 15:27:48 -07:00
parent c2669cda2b
commit 7d4de7ec82
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/ircd/info.h
View file

@ -92,9 +92,9 @@ struct ircd::info::versions
/// Our own name for the dependency. /// Our own name for the dependency.
string_view name; string_view name;
/// Set the type to either INCLUDE or LIBRARY to indicate where this version /// Set the type to either API or ABI to indicate where this version
/// information has been sourced. Defaults to INCLUDE. /// information has been sourced. Defaults to API.
enum type {INCLUDE, LIBRARY} type {INCLUDE}; enum type {API, ABI} type {API};
/// If the version number is a single (likely monotonic) integer. /// If the version number is a single (likely monotonic) integer.
long monotonic {0}; long monotonic {0};
@ -116,7 +116,7 @@ struct ircd::info::versions
explicit operator string_view() const; explicit operator string_view() const;
versions(const string_view &name, versions(const string_view &name,
const enum type &type = type::INCLUDE, const enum type &type = type::API,
const long &monotonic = 0, const long &monotonic = 0,
const std::array<long, 3> &semantic = {0L}, const std::array<long, 3> &semantic = {0L},
const string_view &string = {}); const string_view &string = {});

22
modules/console.cc
View file

@ -691,13 +691,13 @@ bool
console_cmd__versions(opt &out, const string_view &line) console_cmd__versions(opt &out, const string_view &line)
{ {
out out
<< std::left << std::setw(12) << "NAME" << std::left << std::setw(6) << "TYPE"
<< " " << " "
<< std::left << std::setw(12) << "TYPE" << std::left << std::setw(16) << "NAME"
<< " " << " "
<< std::left << std::setw(16) << "MONOTONIC" << std::left << std::setw(14) << "MONOTONIC"
<< " " << " "
<< std::left << std::setw(16) << "SEMANTIC" << std::left << std::setw(14) << "SEMANTIC"
<< " " << " "
<< std::left << std::setw(16) << ":STRING" << std::left << std::setw(16) << ":STRING"
<< " " << " "
@ -707,9 +707,9 @@ console_cmd__versions(opt &out, const string_view &line)
{ {
const auto &type const auto &type
{ {
version->type == version->INCLUDE? "include": version->type == version->API? "API":
version->type == version->LIBRARY? "library": version->type == version->ABI? "ABI":
"???" "???"
}; };
char buf[32]; char buf[32];
@ -722,13 +722,13 @@ console_cmd__versions(opt &out, const string_view &line)
}}; }};
out out
<< std::left << std::setw(12) << version->name << std::left << std::setw(6) << type
<< " " << " "
<< std::left << std::setw(12) << type << std::left << std::setw(16) << version->name
<< " " << " "
<< std::left << std::setw(16) << version->monotonic << std::left << std::setw(14) << version->monotonic
<< " " << " "
<< std::left << std::setw(16) << semantic << std::left << std::setw(14) << semantic
<< " :" << " :"
<< std::left << std::setw(16) << version->string << std::left << std::setw(16) << version->string
<< " " << " "