From 9afdac17dcc8956fd795797bfc5b6e1c09285342 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 08 3月 2020 21:27:16 +0800
Subject: [PATCH] Issues #14 and #6
---
src/inspector/inspector.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 01b90aa..9ae38f5 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -8,7 +8,7 @@
using namespace std;
const map<LCC_API_IDENTIFICATION_STRATEGY, string> stringByStrategyId = {
{STRATEGY_DEFAULT, "DEFAULT"}, {STRATEGY_ETHERNET, "MAC"}, {STRATEGY_IP_ADDRESS, "IP"},
- {STRATEGY_DISK_NUM, "Disk1"}, {STRATEGY_DISK_LABEL, "Disk2"}, {STRATEGY_PLATFORM_SPECIFIC, "Custom"}};
+ {STRATEGY_DISK_NUM, "Disk1"}, {STRATEGY_DISK_LABEL, "Disk2"}, {STRATEGY_NONE, "Custom"}};
const unordered_map<LCC_EVENT_TYPE, string> stringByEventType = {
{LICENSE_OK, "OK "},
@@ -37,16 +37,16 @@
}
int main(int argc, char* argv[]) {
- license::CpuInfo cpu;
+ license::os::CpuInfo cpu;
cout << "CpuVendor :" << cpu.vendor() << endl;
cout << "Virtual machine:" << cpu.cpu_virtual() << endl;
cout << "Cpu model : 0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
- char pc_identifier[LCC_API_PC_IDENTIFIER_SIZE + 1];
+ char hw_identifier[LCC_API_PC_IDENTIFIER_SIZE + 1];
size_t bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
for (const auto& x : stringByStrategyId) {
- if (identify_pc(x.first, pc_identifier, &bufSize)) {
- std::cout << x.second << ':' << pc_identifier << std::endl;
+ if (identify_pc(x.first, hw_identifier, &bufSize)) {
+ std::cout << x.second << ':' << hw_identifier << std::endl;
} else {
std::cout << x.second << ": NA" << endl;
--
Gitblit v1.9.1