From 6067656af5e7d0087aa3711e099667fa9e9391bd Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周一, 08 9月 2014 06:08:44 +0800
Subject: [PATCH]
---
src/library/pc-identifiers.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index 37af7d0..509fab4 100644
--- a/src/library/pc-identifiers.c
+++ b/src/library/pc-identifiers.c
@@ -11,7 +11,9 @@
#include <string.h>
#include <stdbool.h>
#include "base/base64.h"
+#ifdef __linux__
#include <valgrind/memcheck.h>
+#endif
static FUNCTION_RETURN generate_default_pc_id(PcIdentifier * identifiers,
unsigned int * num_identifiers) {
@@ -19,7 +21,7 @@
FUNCTION_RETURN result_adapterInfos, result_diskinfos;
unsigned int required_id_size, i, j, k;
DiskInfo * diskInfos;
- AdapterInfo *adapterInfos;
+ OsAdapterInfo *adapterInfos;
result_adapterInfos = getAdapterInfos(NULL, &adapter_num);
if (result_adapterInfos != FUNC_RET_OK) {
@@ -41,7 +43,7 @@
}
diskInfos = (DiskInfo*) malloc(disk_num * sizeof(DiskInfo));
result_diskinfos = getDiskInfos(diskInfos, &disk_num);
- adapterInfos = (AdapterInfo*) malloc(adapter_num * sizeof(AdapterInfo));
+ adapterInfos = (OsAdapterInfo*) malloc(adapter_num * sizeof(OsAdapterInfo));
result_adapterInfos = getAdapterInfos(adapterInfos, &adapter_num);
for (i = 0; i < disk_num; i++) {
for (j = 0; j < adapter_num; j++) {
@@ -62,7 +64,7 @@
size_t adapters;
FUNCTION_RETURN result_adapterInfos;
unsigned int i, j, k;
- AdapterInfo *adapterInfos;
+ OsAdapterInfo *adapterInfos;
result_adapterInfos = getAdapterInfos(NULL, &adapters);
if (result_adapterInfos != FUNC_RET_OK) {
@@ -77,7 +79,7 @@
return FUNC_RET_BUFFER_TOO_SMALL;
}
- adapterInfos = (AdapterInfo*) malloc(adapters * sizeof(AdapterInfo));
+ adapterInfos = (OsAdapterInfo*)malloc(adapters * sizeof(OsAdapterInfo));
result_adapterInfos = getAdapterInfos(adapterInfos, &adapters);
for (j = 0; j < adapters; j++) {
for (k = 0; k < 6; k++)
@@ -276,10 +278,14 @@
free(identifiers);
return result;
}
+#ifdef __linux__
VALGRIND_CHECK_VALUE_IS_DEFINED(identifiers[0]);
VALGRIND_CHECK_VALUE_IS_DEFINED(identifiers[1]);
+#endif
result = encode_pc_id(identifiers[0], identifiers[1], identifier_out);
+#ifdef __linux__
VALGRIND_CHECK_VALUE_IS_DEFINED(identifier_out);
+#endif
free(identifiers);
return result;
}
--
Gitblit v1.9.1