Skip to content

Commit 4e89f66

Browse files
RealKindOnedwfreed
RealKindOne
authored and
dwfreed
committed
modules: remove unused spy code.
1 parent d01a08c commit 4e89f66

File tree

5 files changed

+1
-146
lines changed

5 files changed

+1
-146
lines changed

‎modules/m_admin.c

-22
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ static void mr_admin(struct MsgBuf *, struct Client *, struct Client *, int, con
4242
static void ms_admin(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
4343
static void do_admin(struct Client *source_p);
4444

45-
static void admin_spy(struct Client *);
46-
4745
struct Message admin_msgtab = {
4846
"ADMIN", 0, 0, 0, 0,
4947
{{mr_admin, 0}, {m_admin, 0}, {ms_admin, 0}, mg_ignore, mg_ignore, {ms_admin, 0}}
@@ -134,9 +132,6 @@ ms_admin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
134132
static void
135133
do_admin(struct Client *source_p)
136134
{
137-
if(IsPerson(source_p))
138-
admin_spy(source_p);
139-
140135
sendto_one_numeric(source_p, RPL_ADMINME, form_str(RPL_ADMINME), me.name);
141136
if(AdminInfo.name != NULL)
142137
sendto_one_numeric(source_p, RPL_ADMINLOC1, form_str(RPL_ADMINLOC1), AdminInfo.name);
@@ -145,20 +140,3 @@ do_admin(struct Client *source_p)
145140
if(AdminInfo.email != NULL)
146141
sendto_one_numeric(source_p, RPL_ADMINEMAIL, form_str(RPL_ADMINEMAIL), AdminInfo.email);
147142
}
148-
149-
/* admin_spy()
150-
*
151-
* input - pointer to client
152-
* output - none
153-
* side effects - event doing_admin is called
154-
*/
155-
static void
156-
admin_spy(struct Client *source_p)
157-
{
158-
hook_data hd;
159-
160-
hd.client = source_p;
161-
hd.arg1 = hd.arg2 = NULL;
162-
163-
call_hook(doing_admin_hook, &hd);
164-
}

‎modules/m_info.c

-21
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ static const char info_desc[] =
4545
static void send_conf_options(struct Client *source_p);
4646
static void send_birthdate_online_time(struct Client *source_p);
4747
static void send_info_text(struct Client *source_p);
48-
static void info_spy(struct Client *);
4948

5049
static void m_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
5150
static void mo_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
@@ -704,8 +703,6 @@ m_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
704703
if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) != HUNTED_ISME)
705704
return;
706705

707-
info_spy(source_p);
708-
709706
send_info_text(source_p);
710707
send_birthdate_online_time(source_p);
711708

@@ -721,7 +718,6 @@ mo_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
721718
{
722719
if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME)
723720
{
724-
info_spy(source_p);
725721
send_info_text(source_p);
726722

727723
if(IsOperGeneral(source_p))
@@ -900,20 +896,3 @@ send_conf_options(struct Client *source_p)
900896

901897
sendto_one_numeric(source_p, RPL_INFO, form_str(RPL_INFO), "");
902898
}
903-
904-
/* info_spy()
905-
*
906-
* input - pointer to client
907-
* output - none
908-
* side effects - hook doing_info is called
909-
*/
910-
static void
911-
info_spy(struct Client *source_p)
912-
{
913-
hook_data hd;
914-
915-
hd.client = source_p;
916-
hd.arg1 = hd.arg2 = NULL;
917-
918-
call_hook(doing_info_hook, &hd);
919-
}

‎modules/m_motd.c

-21
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ mapi_hlist_av1 motd_hlist[] = {
5656

5757
DECLARE_MODULE_AV2(motd, NULL, NULL, motd_clist, motd_hlist, NULL, NULL, NULL, motd_desc);
5858

59-
static void motd_spy(struct Client *);
60-
6159
/*
6260
** m_motd
6361
** parv[1] = servername
@@ -83,7 +81,6 @@ m_motd(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
8381
if(hunt_server(client_p, source_p, ":%s MOTD :%s", 1, parc, parv) != HUNTED_ISME)
8482
return;
8583

86-
motd_spy(source_p);
8784
send_user_motd(source_p);
8885
}
8986

@@ -97,23 +94,5 @@ mo_motd(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
9794
if(hunt_server(client_p, source_p, ":%s MOTD :%s", 1, parc, parv) != HUNTED_ISME)
9895
return;
9996

100-
motd_spy(source_p);
10197
send_user_motd(source_p);
10298
}
103-
104-
/* motd_spy()
105-
*
106-
* input - pointer to client
107-
* output - none
108-
* side effects - hook doing_motd is called
109-
*/
110-
static void
111-
motd_spy(struct Client *source_p)
112-
{
113-
hook_data data;
114-
115-
data.client = source_p;
116-
data.arg1 = data.arg2 = NULL;
117-
118-
call_hook(doing_motd_hook, &data);
119-
}

‎modules/m_stats.c

+1-59
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ static void stats_l_list(struct Client *s, const char *, bool, bool, rb_dlink_li
7979
static void stats_l_client(struct Client *source_p, struct Client *target_p,
8080
char statchar);
8181

82-
static int stats_spy(struct Client *, char, const char *);
83-
static void stats_p_spy(struct Client *);
84-
8582
typedef void (*handler_t)(struct Client *source_p);
8683
typedef void (*handler_parv_t)(struct Client *source_p, int parc, const char *parv[]);
8784

@@ -206,7 +203,6 @@ m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
206203
static time_t last_used = 0;
207204
struct stats_cmd *cmd;
208205
unsigned char statchar;
209-
int did_stats = 0;
210206

211207
statchar = parv[1][0];
212208

@@ -229,14 +225,6 @@ m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
229225
if(hunt_server(client_p, source_p, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
230226
return;
231227

232-
if(tolower(statchar) != 'l')
233-
/* FIXME */
234-
did_stats = stats_spy(source_p, statchar, NULL);
235-
236-
/* if did_stats is true, a module grabbed this STATS request */
237-
if(did_stats)
238-
goto stats_out;
239-
240228
/* Look up */
241229
cmd = &stats_cmd_table[statchar];
242230
if(cmd->handler != NULL)
@@ -272,7 +260,7 @@ m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
272260
}
273261

274262
stats_out:
275-
/* Send the end of stats notice, and the stats_spy */
263+
/* Send the end of stats notice */
276264
sendto_one_numeric(source_p, RPL_ENDOFSTATS,
277265
form_str(RPL_ENDOFSTATS), statchar);
278266
}
@@ -817,8 +805,6 @@ stats_operedup (struct Client *source_p)
817805

818806
sendto_one_numeric(source_p, RPL_STATSDEBUG,
819807
"p :%u staff members", count);
820-
821-
stats_p_spy (source_p);
822808
}
823809

824810
static void
@@ -1515,7 +1501,6 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
15151501
}
15161502
else if (target_p != NULL)
15171503
{
1518-
stats_spy(source_p, statchar, target_p->name);
15191504
stats_l_client(source_p, target_p, statchar);
15201505
}
15211506
else
@@ -1534,8 +1519,6 @@ stats_ltrace(struct Client *source_p, int parc, const char *parv[])
15341519
doall = true;
15351520
}
15361521

1537-
stats_spy(source_p, statchar, name);
1538-
15391522
if (ConfigFileEntry.stats_l_oper_only != STATS_L_OPER_ONLY_NO && !IsOperGeneral(source_p))
15401523
{
15411524
if (doall && MyClient(source_p))
@@ -1659,44 +1642,3 @@ stats_comm(struct Client *source_p)
16591642
{
16601643
rb_dump_fd(rb_dump_fd_callback, source_p);
16611644
}
1662-
1663-
/*
1664-
* stats_spy
1665-
*
1666-
* inputs - pointer to client doing the /stats
1667-
* - char letter they are doing /stats on
1668-
* output - none
1669-
* side effects -
1670-
* This little helper function reports to opers if configured.
1671-
*/
1672-
static int
1673-
stats_spy(struct Client *source_p, char statchar, const char *name)
1674-
{
1675-
hook_data_int data;
1676-
1677-
data.client = source_p;
1678-
data.arg1 = name;
1679-
data.arg2 = (int) statchar;
1680-
data.result = 0;
1681-
1682-
call_hook(doing_stats_hook, &data);
1683-
1684-
return data.result;
1685-
}
1686-
1687-
/* stats_p_spy()
1688-
*
1689-
* input - pointer to client doing stats
1690-
* ouput -
1691-
* side effects - call hook doing_stats_p
1692-
*/
1693-
static void
1694-
stats_p_spy (struct Client *source_p)
1695-
{
1696-
hook_data data;
1697-
1698-
data.client = source_p;
1699-
data.arg1 = data.arg2 = NULL;
1700-
1701-
call_hook(doing_stats_p_hook, &data);
1702-
}

‎modules/m_trace.c

-23
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ static const char trace_desc[] =
4444

4545
static void m_trace(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
4646

47-
static void trace_spy(struct Client *, struct Client *);
48-
4947
struct Message trace_msgtab = {
5048
"TRACE", 0, 0, 0, 0,
5149
{mg_unreg, {m_trace, 0}, {m_trace, 0}, mg_ignore, mg_ignore, {m_trace, 0}}
@@ -179,15 +177,11 @@ m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
179177
tname = target_p->name;
180178
}
181179

182-
trace_spy(source_p, target_p);
183-
184180
sendto_one_numeric(source_p, RPL_ENDOFTRACE,
185181
form_str(RPL_ENDOFTRACE), tname);
186182
return;
187183
}
188184

189-
trace_spy(source_p, NULL);
190-
191185
/* give non-opers a limited trace output of themselves (if local),
192186
* opers and servers (if no shide) --fl
193187
*/
@@ -430,20 +424,3 @@ report_this_status(struct Client *source_p, struct Client *target_p)
430424

431425
return (cnt);
432426
}
433-
434-
/* trace_spy()
435-
*
436-
* input - pointer to client
437-
* output - none
438-
* side effects - hook event doing_trace is called
439-
*/
440-
static void
441-
trace_spy(struct Client *source_p, struct Client *target_p)
442-
{
443-
hook_data_client hdata;
444-
445-
hdata.client = source_p;
446-
hdata.target = target_p;
447-
448-
call_hook(doing_trace_hook, &hdata);
449-
}

0 commit comments

Comments
 (0)