From 61dc2ca65959f92bec3a646c3fb81c23aaf4947f Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周一, 13 10月 2014 06:35:23 +0800
Subject: [PATCH] resolved warnings
---
src/library/pc-identifiers.c | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index 891bd82..75d70fe 100644
--- a/src/library/pc-identifiers.c
+++ b/src/library/pc-identifiers.c
@@ -2,46 +2,51 @@
* pc-identifiers.c
*
* Created on: Apr 16, 2014
- * Author: devel
+ *
*/
#include "os/os.h"
#include "pc-identifiers.h"
#include <stdlib.h>
#include <string.h>
-#include <stdbool.h>
#include "base/base64.h"
+#include "base/base.h"
+#ifdef __linux__
+#include <stdbool.h>
#include <valgrind/memcheck.h>
+#else
+#include <Windows.h>
+#endif
static FUNCTION_RETURN generate_default_pc_id(PcIdentifier * identifiers,
unsigned int * num_identifiers) {
size_t adapter_num, disk_num;
FUNCTION_RETURN result_adapterInfos, result_diskinfos;
- unsigned int required_id_size, i, j, k;
+ unsigned int required_id_size, defined_identifiers, i, j, k;
DiskInfo * diskInfos;
- AdapterInfo *adapterInfos;
+ OsAdapterInfo *adapterInfos;
result_adapterInfos = getAdapterInfos(NULL, &adapter_num);
- if (result_adapterInfos != OK) {
+ if (result_adapterInfos != FUNC_RET_OK) {
//call generate_disk_pc_id;
return result_adapterInfos;
}
result_diskinfos = getDiskInfos(NULL, &disk_num);
- if (result_diskinfos == OK) {
+ if (result_diskinfos == FUNC_RET_OK) {
required_id_size = disk_num * adapter_num;
} else {
required_id_size = disk_num;
}
- int defined_identifiers = *num_identifiers;
+ defined_identifiers = *num_identifiers;
*num_identifiers = required_id_size;
if (identifiers == NULL) {
- return OK;
+ return FUNC_RET_OK;
} else if (required_id_size > defined_identifiers) {
- return BUFFER_TOO_SMALL;
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
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++) {
@@ -54,30 +59,31 @@
free(diskInfos);
free(adapterInfos);
- return OK;
+ return FUNC_RET_OK;
}
static FUNCTION_RETURN generate_ethernet_pc_id(PcIdentifier * identifiers,
- unsigned int * num_identifiers, bool use_mac) {
+ unsigned int * num_identifiers, int use_mac) {
size_t adapters;
+ int defined_adapters;
FUNCTION_RETURN result_adapterInfos;
unsigned int i, j, k;
- AdapterInfo *adapterInfos;
+ OsAdapterInfo *adapterInfos;
result_adapterInfos = getAdapterInfos(NULL, &adapters);
- if (result_adapterInfos != OK) {
+ if (result_adapterInfos != FUNC_RET_OK) {
return result_adapterInfos;
}
- int defined_adapters = *num_identifiers;
+ defined_adapters = *num_identifiers;
*num_identifiers = adapters;
if (identifiers == NULL) {
- return OK;
+ return FUNC_RET_OK;
} else if (adapters > defined_adapters) {
- return BUFFER_TOO_SMALL;
+ 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++)
@@ -94,7 +100,7 @@
}
}
free(adapterInfos);
- return OK;
+ return FUNC_RET_OK;
}
static FUNCTION_RETURN generate_disk_pc_id(PcIdentifier * identifiers,
@@ -102,17 +108,18 @@
size_t disk_num, available_disk_info=0;
FUNCTION_RETURN result_diskinfos;
unsigned int i, k, j;
+ int defined_identifiers;
char firstChar;
DiskInfo * diskInfos;
result_diskinfos = getDiskInfos(NULL, &disk_num);
- if (result_diskinfos != OK) {
+ if (result_diskinfos != FUNC_RET_OK) {
return result_diskinfos;
}
diskInfos = (DiskInfo*) malloc(disk_num * sizeof(DiskInfo));
//memset(diskInfos,0,disk_num * sizeof(DiskInfo));
result_diskinfos = getDiskInfos(diskInfos, &disk_num);
- if (result_diskinfos != OK) {
+ if (result_diskinfos != FUNC_RET_OK) {
free(diskInfos);
return result_diskinfos;
}
@@ -121,14 +128,14 @@
available_disk_info += firstChar == 0 ? 0 : 1;
}
- int defined_identifiers = *num_identifiers;
+ defined_identifiers = *num_identifiers;
*num_identifiers = available_disk_info;
if (identifiers == NULL) {
free(diskInfos);
- return OK;
+ return FUNC_RET_OK;
} else if (available_disk_info > defined_identifiers) {
free(diskInfos);
- return BUFFER_TOO_SMALL;
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
j=0;
@@ -147,7 +154,7 @@
}
}
free(diskInfos);
- return OK;
+ return FUNC_RET_OK;
}
/**
@@ -165,6 +172,7 @@
* @param
* @return
*/
+
FUNCTION_RETURN generate_pc_id(PcIdentifier * identifiers,
unsigned int * array_size, IDENTIFICATION_STRATEGY strategy) {
FUNCTION_RETURN result;
@@ -176,10 +184,10 @@
result = generate_default_pc_id(identifiers, array_size);
break;
case ETHERNET:
- result = generate_ethernet_pc_id(identifiers, array_size, true);
+ result = generate_ethernet_pc_id(identifiers, array_size, true );
break;
case IP_ADDRESS:
- result = generate_ethernet_pc_id(identifiers, array_size, false);
+ result = generate_ethernet_pc_id(identifiers, array_size, false );
break;
case DISK_NUM:
result = generate_disk_pc_id(identifiers, array_size, false);
@@ -188,10 +196,10 @@
result = generate_disk_pc_id(identifiers, array_size, true);
break;
default:
- return ERROR;
+ return FUNC_RET_ERROR;
}
- if (result == OK && identifiers != NULL) {
+ if (result == FUNC_RET_OK && identifiers != NULL) {
strategy_num = strategy << 5;
for (i = 0; i < *array_size; i++) {
//encode strategy in the first three bits of the pc_identifier
@@ -235,25 +243,26 @@
PcSignature pc_identifier_out) {
//TODO base62 encoding, now uses base64
PcIdentifier concat_identifiers[2];
+ char* b64_data;
int b64_size = 0;
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));
- char* b64_data = base64(concat_identifiers, concatIdentifiersSize,
+ b64_data = base64(concat_identifiers, concatIdentifiersSize,
&b64_size);
if (b64_size > sizeof(PcSignature)) {
- return BUFFER_TOO_SMALL;
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
sprintf(pc_identifier_out, "%.4s-%.4s-%.4s-%.4s", &b64_data[0],
&b64_data[4], &b64_data[8], &b64_data[12]);
//free(concat_identifiers);
free(b64_data);
- return OK;
+ return FUNC_RET_OK;
}
FUNCTION_RETURN parity_check_id(PcSignature pc_identifier) {
- return OK;
+ return FUNC_RET_OK;
}
FUNCTION_RETURN generate_user_pc_signature(PcSignature identifier_out,
@@ -262,24 +271,28 @@
PcIdentifier* identifiers;
unsigned int req_buffer_size = 0;
result = generate_pc_id(NULL, &req_buffer_size, strategy);
- if (result != OK) {
+ if (result != FUNC_RET_OK) {
return result;
}
if (req_buffer_size == 0) {
- return ERROR;
+ return FUNC_RET_ERROR;
}
req_buffer_size = req_buffer_size < 2 ? 2 : req_buffer_size;
identifiers = (PcIdentifier *) malloc(
sizeof(PcIdentifier) * req_buffer_size);
result = generate_pc_id(identifiers, &req_buffer_size, strategy);
- if (result != OK) {
+ if (result != FUNC_RET_OK) {
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;
}
@@ -303,13 +316,13 @@
&base64ids[8], &base64ids[12]);
concat_identifiers = unbase64(base64ids, 16, &identifiers_size);
if (identifiers_size > sizeof(PcIdentifier) * 2) {
- return BUFFER_TOO_SMALL;
+ return FUNC_RET_BUFFER_TOO_SMALL;
}
memcpy(identifier1_out, concat_identifiers, sizeof(PcIdentifier));
memcpy(identifier2_out, concat_identifiers + sizeof(PcIdentifier),
sizeof(PcIdentifier));
free(concat_identifiers);
- return OK;
+ return FUNC_RET_OK;
}
static IDENTIFICATION_STRATEGY strategy_from_pc_id(PcIdentifier identifier) {
@@ -328,7 +341,7 @@
printf("Comparing pc identifiers: \n");
#endif
result = decode_pc_id(user_identifiers[0], user_identifiers[1], str_code);
- if (result != OK) {
+ if (result != FUNC_RET_OK) {
return result;
}
previous_strategy_id = STRATEGY_UNKNOWN;
--
Gitblit v1.9.1