From aa5b960ace514e036d932f6a45dc0c3a81f0db4a Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 16 5月 2020 21:54:27 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager.git into develop
---
src/library/base/base64.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/library/base/base64.cpp b/src/library/base/base64.cpp
index a8f1c4c..caa0ddc 100644
--- a/src/library/base/base64.cpp
+++ b/src/library/base/base64.cpp
@@ -39,7 +39,7 @@
}; // This array has 255 elements
// review api
-void add_CR_if_needed(string& encodeBuffer, int lineLenght) {
+static void add_CR_if_needed(string& encodeBuffer, int lineLenght) {
if (lineLenght > 0 && ((encodeBuffer.size() + 1) % lineLenght) == 0) {
encodeBuffer += '\n';
}
@@ -49,7 +49,7 @@
const unsigned char* bin = (const unsigned char*)binaryData;
int rc = 0; // result counter
- int byteNo; // I need this after the loop
+ unsigned int byteNo; // I need this after the loop
int modulusLen = len % 3;
int pad = ((modulusLen & 1) << 1) + ((modulusLen & 2) >> 1); // 2 gives 1 and 1 gives 2, but 0 gives 0.
@@ -109,9 +109,9 @@
const unsigned char* safeAsciiPtr = (const unsigned char*)tmp_str.c_str();
std::vector<uint8_t> bin;
int cb = 0;
- int charNo;
+ unsigned int charNo;
int pad = 0;
- int len = tmp_str.size();
+ size_t len = tmp_str.size();
if (len < 2) { // 2 accesses below would be OOB.
// catch empty string, return NULL as result.
@@ -121,7 +121,7 @@
if (safeAsciiPtr[len - 1] == '=') ++pad;
if (safeAsciiPtr[len - 2] == '=') ++pad;
- unsigned int flen = 3 * len / 4 - pad;
+ size_t flen = 3 * len / 4 - pad;
bin.reserve(flen);
for (charNo = 0; charNo <= len - 4 - pad; charNo += 4) {
--
Gitblit v1.9.1