mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmUuid: Hide UUID group info in implementation

Browse Source
This commit is contained in:
Gregor Jasny
2019-02-16 16:45:02 +01:00
committed by Brad King
parent 657b30905a
commit 8a95808f8f
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmUuid.cxx
View File

@@ -4,16 +4,10 @@
#include "cmCryptoHash.h"
#include <array>
#include <string.h>
cmUuid::cmUuid()
{
Groups.push_back(4);
Groups.push_back(2);
Groups.push_back(2);
Groups.push_back(2);
Groups.push_back(6);
}
static const std::array<int, 5> kUuidGroups = { { 4, 2, 2, 2, 6 } };
std::string cmUuid::FromMd5(std::vector<unsigned char> const& uuidNamespace,
std::string const& name) const
@@ -83,11 +77,11 @@ bool cmUuid::StringToBinary(std::string const& input,
return false;
}
size_t index = 0;
for (size_t i = 0; i < this->Groups.size(); ++i) {
for (size_t i = 0; i < kUuidGroups.size(); ++i) {
if (i != 0 && input[index++] != '-') {
return false;
}
size_t digits = this->Groups[i] * 2;
size_t digits = kUuidGroups[i] * 2;
if (!StringToBinaryImpl(input.substr(index, digits), output)) {
return false;
}
@@ -103,12 +97,12 @@ std::string cmUuid::BinaryToString(const unsigned char* input) const
std::string output;
size_t inputIndex = 0;
for (size_t i = 0; i < this->Groups.size(); ++i) {
for (size_t i = 0; i < kUuidGroups.size(); ++i) {
if (i != 0) {
output += '-';
}
size_t bytes = this->Groups[i];
size_t bytes = kUuidGroups[i];
for (size_t j = 0; j < bytes; ++j) {
unsigned char byte = input[inputIndex++];
output += this->ByteToHex(byte);

4
Source/cmUuid.h
View File

@@ -15,8 +15,6 @@
class cmUuid
{
public:
cmUuid();
std::string FromMd5(std::vector<unsigned char> const& uuidNamespace,
std::string const& name) const;
@@ -42,8 +40,6 @@ private:
std::string BinaryToString(const unsigned char* input) const;
bool IntFromHexDigit(char input, char& output) const;
std::vector<int> Groups;
};
#endif