diff --git a/include/ircd/info.h b/include/ircd/info.h index 67f0faaf8..0600f7501 100644 --- a/include/ircd/info.h +++ b/include/ircd/info.h @@ -92,9 +92,9 @@ struct ircd::info::versions /// Our own name for the dependency. string_view name; - /// Set the type to either INCLUDE or LIBRARY to indicate where this version - /// information has been sourced. Defaults to INCLUDE. - enum type {INCLUDE, LIBRARY} type {INCLUDE}; + /// Set the type to either API or ABI to indicate where this version + /// information has been sourced. Defaults to API. + enum type {API, ABI} type {API}; /// If the version number is a single (likely monotonic) integer. long monotonic {0}; @@ -116,7 +116,7 @@ struct ircd::info::versions explicit operator string_view() const; versions(const string_view &name, - const enum type &type = type::INCLUDE, + const enum type &type = type::API, const long &monotonic = 0, const std::array &semantic = {0L}, const string_view &string = {}); diff --git a/modules/console.cc b/modules/console.cc index ab1320e50..43b6a5dfa 100644 --- a/modules/console.cc +++ b/modules/console.cc @@ -691,13 +691,13 @@ bool console_cmd__versions(opt &out, const string_view &line) { 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" << " " @@ -707,9 +707,9 @@ console_cmd__versions(opt &out, const string_view &line) { const auto &type { - version->type == version->INCLUDE? "include": - version->type == version->LIBRARY? "library": - "???" + version->type == version->API? "API": + version->type == version->ABI? "ABI": + "???" }; char buf[32]; @@ -722,13 +722,13 @@ console_cmd__versions(opt &out, const string_view &line) }}; 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 << " "