songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: remove sign from SHA1Digest cdata_bytes(), data_bytes()

Browse Source 
- this refinement of commit 81807646ca makes these methods
  consistent with other objects/containers.

  The 'unsigned char' access is still available via cdata()
This commit is contained in:
Mark Olesen 2023-05-17 14:26:05 +02:00
parent 28ac15f933
commit bc51caac32
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/test/parallel-comm2/Test-parallel-comm2.C
View File

@ -261,11 +261,11 @@ int main(int argc, char *argv[])
}
{
const SHA1Digest myHostDigest(SHA1(hostName()).digest());
const SHA1Digest myDigest(SHA1(hostName()).digest());
UPstream::mpiGather
(
reinterpret_cast<const char*>(myHostDigest.cdata_bytes()),
myDigest.cdata_bytes(), // Send
SHA1Digest::max_size(), // Num send per proc
digests.data_bytes(), // Recv
SHA1Digest::max_size(), // Num recv per proc

4
src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
View File

@ -88,11 +88,9 @@ static List<int> getHostGroupIds(const label parentCommunicator)
SHA1Digest myDigest(SHA1(hostName()).digest());
// The fixed-length digest allows use of MPI_Gather
// and avoids Pstream::gatherList() during setup...
UPstream::mpiGather
(
reinterpret_cast<const char*>(myDigest.cdata_bytes()),
myDigest.cdata_bytes(), // Send
SHA1Digest::max_size(), // Num send per proc
digests.data_bytes(), // Recv
SHA1Digest::max_size(), // Num recv per proc

15
src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
View File

@ -128,16 +128,19 @@ public:
//- Raw digest data (20 bytes) - const access
const unsigned char* cdata() const noexcept { return dig_.data(); }
//- Raw digest data (20 bytes) - const access
const unsigned char* cdata_bytes() const noexcept
//- Raw digest char data (20 bytes) - const access.
//- For consistency with other objects, these are \em not unsigned.
const char* cdata_bytes() const noexcept
{
return dig_.data();
return reinterpret_cast<const char*>(dig_.data());
}
//- Raw digest data (20 bytes) - non-const access. Use with caution!
unsigned char* data_bytes() noexcept
//- Raw digest char data (20 bytes) - non-const access.
//- For consistency with other objects, these are \em not unsigned.
//- Use with caution - generally for broadcasting only.
char* data_bytes() noexcept
{
return dig_.data();
return reinterpret_cast<char*>(dig_.data());
}
//- The number of bytes in digest (20)