From 29c909cad7d449874bc2efecdb6945a2d6d55f24 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 11 Apr 2019 00:41:09 +0000
Subject: [PATCH] Remove never-used msg network-attribute definitions.

---
 src/sbbs3/atcodes.cpp | 9 +--------
 src/smblib/smbdefs.h  | 8 --------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp
index d761d9c9ea..49eb0c161f 100644
--- a/src/sbbs3/atcodes.cpp
+++ b/src/sbbs3/atcodes.cpp
@@ -1102,22 +1102,15 @@ const char* sbbs_t::atcode(char* sp, char* str, size_t maxlen)
 		return(str);
 	}
 	if(!strcmp(sp,"MSG_NETATTR") && current_msg!=NULL) {
-		safe_snprintf(str,maxlen,"%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
+		safe_snprintf(str,maxlen,"%s%s%s%s%s%s%s%s"
 			,current_msg->hdr.netattr&MSG_LOCAL			? "Local  "			:nulstr
 			,current_msg->hdr.netattr&MSG_INTRANSIT		? "InTransit  "     :nulstr
 			,current_msg->hdr.netattr&MSG_SENT			? "Sent  "			:nulstr
 			,current_msg->hdr.netattr&MSG_KILLSENT		? "KillSent  "      :nulstr
-			,current_msg->hdr.netattr&MSG_ARCHIVESENT	? "ArcSent  "		:nulstr
 			,current_msg->hdr.netattr&MSG_HOLD			? "Hold  "			:nulstr
 			,current_msg->hdr.netattr&MSG_CRASH			? "Crash  "			:nulstr
 			,current_msg->hdr.netattr&MSG_IMMEDIATE		? "Immediate  "		:nulstr
 			,current_msg->hdr.netattr&MSG_DIRECT		? "Direct  "		:nulstr
-			,current_msg->hdr.netattr&MSG_GATE			? "Gate  "			:nulstr
-			,current_msg->hdr.netattr&MSG_ORPHAN		? "Orphan  "		:nulstr
-			,current_msg->hdr.netattr&MSG_FPU			? "ForcePickup  "	:nulstr
-			,current_msg->hdr.netattr&MSG_TYPELOCAL		? "LocalUse  "		:nulstr
-			,current_msg->hdr.netattr&MSG_TYPEECHO		? "EchoMail  "		:nulstr
-			,current_msg->hdr.netattr&MSG_TYPENET		? "NetMail  "		:nulstr
 			);
 		return(str);
 	}
diff --git a/src/smblib/smbdefs.h b/src/smblib/smbdefs.h
index 4cbaf399c2..bdb685158a 100644
--- a/src/smblib/smbdefs.h
+++ b/src/smblib/smbdefs.h
@@ -296,18 +296,10 @@
 #define MSG_INTRANSIT		(1<<1)		/* Msg is in-transit */
 #define MSG_SENT			(1<<2)		/* Sent to remote */
 #define MSG_KILLSENT		(1<<3)		/* Kill when sent */
-#define MSG_ARCHIVESENT 	(1<<4)		/* Archive when sent */
 #define MSG_HOLD			(1<<5)		/* Hold for pick-up */
 #define MSG_CRASH			(1<<6)		/* Crash */
 #define MSG_IMMEDIATE		(1<<7)		/* Send Msg now, ignore restrictions */
 #define MSG_DIRECT			(1<<8)		/* Send directly to destination */
-#define MSG_GATE			(1<<9)		/* Send via gateway */
-#define MSG_ORPHAN			(1<<10) 	/* Unknown destination */
-#define MSG_FPU 			(1<<11) 	/* Force pickup */
-#define MSG_TYPELOCAL		(1<<12) 	/* Msg is for local use only */
-#define MSG_TYPEECHO		(1<<13) 	/* Msg is for conference distribution */
-#define MSG_TYPENET 		(1<<14) 	/* Msg is direct network mail */
-
 
 enum smb_net_type {
      NET_NONE				/* Local message */
-- 
GitLab