From eb34a6999d9e8c5968abedc93103124cdc8d8a5c Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sun, 25 Aug 2002 12:00:58 +0000
Subject: [PATCH] No longer necessary to UN-lock the SMB header before calling
 smb_addmsghdr().

---
 src/sbbs3/email.cpp    | 3 +--
 src/sbbs3/netmail.cpp  | 6 ++----
 src/sbbs3/writemsg.cpp | 4 +---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/sbbs3/email.cpp b/src/sbbs3/email.cpp
index aa0a2a7830..1aef6eb1bf 100644
--- a/src/sbbs3/email.cpp
+++ b/src/sbbs3/email.cpp
@@ -273,8 +273,7 @@ bool sbbs_t::email(int usernumber, char *top, char *subj, long mode)
 
 	smb_dfield(&msg,TEXT_BODY,length);
 
-	smb_unlocksmbhdr(&smb);
-	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK);
+	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK); // calls smb_unlocksmbhdr() 
 	smb_close(&smb);
 	smb_stack(&smb,SMB_STACK_POP);
 
diff --git a/src/sbbs3/netmail.cpp b/src/sbbs3/netmail.cpp
index 19a51c0ec0..049306ff97 100644
--- a/src/sbbs3/netmail.cpp
+++ b/src/sbbs3/netmail.cpp
@@ -247,8 +247,7 @@ bool sbbs_t::inetmail(char *into, char *subj, long mode)
 
 	smb_dfield(&msg,TEXT_BODY,length);
 
-	smb_unlocksmbhdr(&smb);
-	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK);
+	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK);	// calls smb_unlocksmbhdr() 
 	smb_close(&smb);
 	smb_stack(&smb,SMB_STACK_POP);
 
@@ -435,8 +434,7 @@ bool sbbs_t::qnetmail(char *into, char *subj, long mode)
 
 	smb_dfield(&msg,TEXT_BODY,length);
 
-	smb_unlocksmbhdr(&smb);
-	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK);
+	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK); // calls smb_unlocksmbhdr() 
 	smb_close(&smb);
 	smb_stack(&smb,SMB_STACK_POP);
 
diff --git a/src/sbbs3/writemsg.cpp b/src/sbbs3/writemsg.cpp
index 67cd052ef7..ab25e2675d 100644
--- a/src/sbbs3/writemsg.cpp
+++ b/src/sbbs3/writemsg.cpp
@@ -1213,14 +1213,12 @@ bool sbbs_t::movemsg(smbmsg_t* msg, uint subnum)
 	msg->hdr.offset=offset;
 	msg->hdr.version=smb_ver();
 
-	smb_unlocksmbhdr(&smb);
-
 	fseek(smb.sdt_fp,offset,SEEK_SET);
 	fwrite(buf,length,1,smb.sdt_fp);
 	fflush(smb.sdt_fp);
 	FREE(buf);
 
-	i=smb_addmsghdr(&smb,msg,storage);
+	i=smb_addmsghdr(&smb,msg,storage);	// calls smb_unlocksmbhdr() 
 	smb_close(&smb);
 	smb_stack(&smb,SMB_STACK_POP);
 
-- 
GitLab