From 4192b40473b54daf6b22b158e53aefb850d79cd6 Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Thu, 29 Dec 2022 14:02:32 -0800
Subject: [PATCH] Remove startup->node_spysem, nobody's using it and it had a
bad bug
This came about through the realization that the global 'sbbs' in main.cpp
can (and was/is) hiding some copy/pasta bugs.
---
src/sbbs3/main.cpp | 8 --------
src/sbbs3/startup.h | 1 -
2 files changed, 9 deletions(-)
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index 990100b9f9..c4527aba7b 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -2462,10 +2462,6 @@ void output_thread(void* arg)
if(startup->node_spybuf!=NULL
&& startup->node_spybuf[sbbs->cfg.node_num-1]!=NULL) {
RingBufWrite(startup->node_spybuf[sbbs->cfg.node_num-1],buf+bufbot,i);
- /* Signal spy output semaphore? */
- if(startup->node_spysem!=NULL
- && startup->node_spysem[sbbs->cfg.node_num-1]!=NULL)
- sem_post(startup->node_spysem[sbbs->cfg.node_num-1]);
}
/* Spy on the user remotely */
if(spy_socket[sbbs->cfg.node_num-1]!=INVALID_SOCKET)
@@ -3894,10 +3890,6 @@ void sbbs_t::spymsg(const char* msg)
if(startup->node_spybuf!=NULL
&& startup->node_spybuf[cfg.node_num-1]!=NULL) {
RingBufWrite(startup->node_spybuf[cfg.node_num-1],(uchar*)str,strlen(str));
- /* Signal spy output semaphore? */
- if(startup->node_spysem!=NULL
- && startup->node_spysem[sbbs->cfg.node_num-1]!=NULL)
- sem_post(startup->node_spysem[sbbs->cfg.node_num-1]);
}
if(cfg.node_num && spy_socket[cfg.node_num-1]!=INVALID_SOCKET)
diff --git a/src/sbbs3/startup.h b/src/sbbs3/startup.h
index 65ec7fb5ad..a51cffa73c 100644
--- a/src/sbbs3/startup.h
+++ b/src/sbbs3/startup.h
@@ -101,7 +101,6 @@ typedef struct {
str_list_t ssh_interfaces;
RingBuf** node_spybuf; /* Spy output buffer (each node) */
RingBuf** node_inbuf; /* User input buffer (each node) */
- sem_t** node_spysem; /* Spy output semaphore (each node) */
void* cbdata; /* Private data passed to callbacks */
void* event_cbdata; /* Private data passed to event_lputs callback */
--
GitLab