ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-06 13:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidy up guid on linux

Browse Source
This commit is contained in:
Nikita Smith
2024-11-08 11:43:05 -08:00
parent d177e39a54
commit d114a0e961
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/base/base_core.h
+10 -6
View File
@@ -489,13 +489,17 @@ struct TxtRng
//////////////////////////////// ////////////////////////////////
//~ Globally Unique Ids //~ Globally Unique Ids
typedef struct Guid Guid; typedef union Guid Guid;
struct Guid union Guid
{ {
U32 data1; struct
U16 data2; {
U16 data3; U32 data1;
U8 data4[8]; U16 data2;
U16 data3;
U8 data4[8];
};
U8 v[16];
}; };
StaticAssert(sizeof(Guid) == 16, g_guid_size_check); StaticAssert(sizeof(Guid) == 16, g_guid_size_check);
src/os/core/linux/os_core_linux.c
+3 -6
View File
@@ -1133,14 +1133,11 @@ os_safe_call(OS_ThreadFunctionType *func, OS_ThreadFunctionType *fail_handler, v
//////////////////////////////// ////////////////////////////////
//~ rjf: @os_hooks GUIDs (Implemented Per-OS) //~ rjf: @os_hooks GUIDs (Implemented Per-OS)
internal OS_Guid internal Guid
os_make_guid(void) os_make_guid(void)
{ {
U8 random_bytes[16] = {0}; Guid guid = {0};
StaticAssert(sizeof(random_bytes) == sizeof(OS_Guid), os_lnx_guid_size_check); getrandom(guid.v, sizeof(guid.v), 0);
getrandom(random_bytes, sizeof(random_bytes), 0);
OS_Guid guid = {0};
MemoryCopy(&guid, random_bytes, sizeof(random_bytes));
guid.data3 &= 0x0fff; guid.data3 &= 0x0fff;
guid.data3 |= (4 << 12); guid.data3 |= (4 << 12);
guid.data4[0] &= 0x3f; guid.data4[0] &= 0x3f;