simplify get_macos_uuid()

also remove a magic number 37 by replacing it with NHUUIDSZ
This commit is contained in:
nhmall
2026-04-30 09:27:50 -04:00
parent c5b258c2cf
commit 319dd38873
4 changed files with 13 additions and 34 deletions
+3 -5
View File
@@ -843,15 +843,13 @@ sys_random_seed(void)
#if defined(MACOS) && defined(NHUUID)
extern void get_macos_uuid(char *); /* sys/unix/macuuid.m */
extern void free_macos_uuid(void); /* sys/unix/macuuid.m */
#endif
void
get_nhuuid(void)
{
#if defined(NHUUID)
char struuid[37] = { 0 };
char *struuidptr = &struuid[0];
char struuid[NHUUIDSZ] = { 0 };
#if defined(LINUX) && defined(NHUUID)
uuid_t binuuid;
#endif
@@ -866,8 +864,8 @@ get_nhuuid(void)
uuid_unparse(binuuid, struuid);
#endif /* MACOS || LINUX */
if (*struuidptr)
Snprintf(svn.nhuuid, sizeof svn.nhuuid, "%s", struuidptr);
if (struuid[0])
Snprintf(svn.nhuuid, sizeof svn.nhuuid, "%s", struuid);
#endif /* NHUUID */
}