From 62b0507b4f8c4141621de7293af215d9a95d97ad Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Debian Linux)" <rob@synchro.net>
Date: Fri, 13 Sep 2024 19:56:34 -0700
Subject: [PATCH] fileidexrec_t doesn't need to contain union
This served exactly no purpose (since the idxrec_t existed at the same
offset in both parts of the union). So this was just some weird artifact
from the new filebase development.
---
src/smblib/smbdefs.h | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/smblib/smbdefs.h b/src/smblib/smbdefs.h
index ad6974c104..5d41aabd9b 100644
--- a/src/smblib/smbdefs.h
+++ b/src/smblib/smbdefs.h
@@ -408,14 +408,9 @@ struct hash_info {
};
typedef struct { /* File index record */
- union {
- idxrec_t idx;
- struct {
- idxrec_t idx_; // only here for storage, no need to reference
- char name[SMB_FILEIDX_NAMELEN + 1];
- struct hash_info hash;
- };
- };
+ idxrec_t idx;
+ char name[SMB_FILEIDX_NAMELEN + 1];
+ struct hash_info hash;
} fileidxrec_t;
#define SIZEOF_SMB_FILEIDXREC_T 128
/* valid bits in hashflags_t */
--
GitLab