From f6437cfaed1dd0acd1ec63e1c282d0e7edfa4522 Mon Sep 17 00:00:00 2001
From: davidwed <davidwe@posteo.de>
Date: 周六, 07 9月 2019 21:54:13 +0800
Subject: [PATCH] Fix a compilier error with msys2-mingw64 ( ld.exe: cannot find -ldl ) (#35)
---
src/library/pc-identifiers.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index 8353f55..59f3dd1 100644
--- a/src/library/pc-identifiers.c
+++ b/src/library/pc-identifiers.c
@@ -39,11 +39,11 @@
if (identifiers == NULL || *num_identifiers == 0) {
result_adapterInfos = getAdapterInfos(NULL, &adapter_num);
- if (result_adapterInfos != FUNC_RET_OK) {
+ if ((result_adapterInfos != FUNC_RET_OK) || (adapter_num == 0)) {
return generate_disk_pc_id(identifiers, num_identifiers, false);
}
result_diskinfos = getDiskInfos(NULL, &disk_num);
- if (result_diskinfos != FUNC_RET_OK) {
+ if ((result_diskinfos != FUNC_RET_OK) || (disk_num == 0)) {
return generate_ethernet_pc_id(identifiers, num_identifiers, true);
}
*num_identifiers = disk_num * adapter_num;
@@ -283,7 +283,7 @@
PcIdentifier concat_identifiers[2];
char* b64_data = NULL;
int b64_size = 0;
- size_t concatIdentifiersSize = sizeof(PcIdentifier) * 2;
+ const size_t concatIdentifiersSize = sizeof(PcIdentifier) * 2;
//concat_identifiers = (PcIdentifier *) malloc(concatIdentifiersSize);
memcpy(&concat_identifiers[0], identifier1, sizeof(PcIdentifier));
memcpy(&concat_identifiers[1], identifier2, sizeof(PcIdentifier));
@@ -318,6 +318,7 @@
req_buffer_size = req_buffer_size < 2 ? 2 : req_buffer_size;
identifiers = (PcIdentifier *) malloc(
sizeof(PcIdentifier) * req_buffer_size);
+ memset(identifiers, 0, sizeof(PcIdentifier) * req_buffer_size);
result = generate_pc_id(identifiers, &req_buffer_size, strategy);
if (result != FUNC_RET_OK) {
free(identifiers);
@@ -399,6 +400,7 @@
generate_pc_id(NULL, &calc_identifiers_size, current_strategy_id);
calculated_identifiers = (PcIdentifier *) malloc(
sizeof(PcIdentifier) * calc_identifiers_size);
+ memset(calculated_identifiers, 0, sizeof(PcIdentifier) * calc_identifiers_size);
generate_pc_id(calculated_identifiers, &calc_identifiers_size,
current_strategy_id);
}
--
Gitblit v1.9.1