From 4b7e3271e3ad8b2fda6fadead733a3fa9bad8dab Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 25 10月 2020 20:10:00 +0800
Subject: [PATCH] disk strategy failing on windows
---
src/library/hw_identifier/disk_strategy.cpp | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/library/hw_identifier/disk_strategy.cpp b/src/library/hw_identifier/disk_strategy.cpp
index 5e50761..d0ebaed 100644
--- a/src/library/hw_identifier/disk_strategy.cpp
+++ b/src/library/hw_identifier/disk_strategy.cpp
@@ -41,7 +41,7 @@
v_disk_id.reserve(disk_infos.size() * 2);
for (int j = 0; j < 2; j++) {
bool preferred = (j == 0);
- for (unsigned int i = 0; i < disk_infos.size(); i++) {
+ for (size_t i = 0; i < disk_infos.size(); i++) {
if (disk_infos[i].preferred == preferred) {
if (disk_infos[i].sn_initialized) {
array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> a_disk_id = generate_id_by_sn(disk_infos[i]);
@@ -51,13 +51,10 @@
array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA> l_disk_id = generate_id_by_label(disk_infos[i]);
v_disk_id.push_back(l_disk_id);
}
- if (preferred) {
- break;
- }
}
}
}
- return FUNC_RET_OK;
+ return v_disk_id.size() > 0 ? FUNC_RET_OK : FUNC_RET_NOT_AVAIL;
}
DiskStrategy::~DiskStrategy() {}
--
Gitblit v1.9.1