From: Art Cancro <ajc@citadel.org>
Date: Fri, 31 Mar 2017 14:24:14 +0000 (-0400)
Subject: These hooks are not needed when running single threaded
X-Git-Tag: v939~577
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=ba6d504ceb294a13362371f578c22cb7161f1dc9

These hooks are not needed when running single threaded
---

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 6d7f93096..9472eb4fb 100644
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -93,8 +93,6 @@
 #define PRIO_UNSTEALTH 45000
 /* Priorities for EVT_STEALTH */
 #define PRIO_STEALTH 50000
-void CtdlRegisterTDAPVetoHook(int (*fcn_ptr)(StrBuf*), int EventType, int Priority);
-void CtdlUnregisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType);
 
 
 void CtdlRegisterSessionHook(void (*fcn_ptr)(void), int EventType, int Priority);
diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index 10f8bc4bf..5fce93473 100644
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -689,11 +689,6 @@ int PurgeUseTable(StrBuf *ErrMsg) {
 	struct UPurgeList *uptr; 
 
 	/* Phase 1: traverse through the table, discovering old records... */
-	if (CheckTDAPVeto(CDB_USETABLE, ErrMsg))
-	{
-		syslog(LOG_DEBUG, "Purge use table: VETO!");
-		return 0;
-	}
 
 	syslog(LOG_DEBUG, "Purge use table: phase 1");
 	cdb_rewind(CDB_USETABLE);
diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 4cc86fff9..897f43c1b 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -53,19 +53,6 @@ FixedOutputHook *FixedOutputTable = NULL;
 
 
 
-/*
- * TDAPVetoHookFunctionHook extensions are used for any type of hook for which
- * may prevent the autopurger to run for this specific data class.
- * the function should at least LOG_INFO that it does so.
- */
-typedef struct TDAPVetoHookFunctionHook TDAPVetoHookFunctionHook;
-struct TDAPVetoHookFunctionHook {
-	TDAPVetoHookFunctionHook *next;
-	int Priority;
-	int (*h_function_pointer) (StrBuf *);
-	int eventtype;
-};
-TDAPVetoHookFunctionHook *TDAPVetoHookTable = NULL;
 
 
 
@@ -515,73 +502,7 @@ void CtdlDestroyEVCleanupHooks(void)
 	EVCleanupHookTable = NULL;
 }
 
-void CtdlRegisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType, int Priority)
-{
-	TDAPVetoHookFunctionHook *newfcn;
-
-	newfcn = (TDAPVetoHookFunctionHook *)
-	    malloc(sizeof(TDAPVetoHookFunctionHook));
-	newfcn->Priority = Priority;
-	newfcn->h_function_pointer = fcn_ptr;
-	newfcn->eventtype = EventType;
-
-	TDAPVetoHookFunctionHook **pfcn;
-	pfcn = &TDAPVetoHookTable;
-	while ((*pfcn != NULL) && 
-	       ((*pfcn)->Priority < newfcn->Priority) &&
-	       ((*pfcn)->next != NULL))
-		pfcn = &(*pfcn)->next;
-		
-	newfcn->next = *pfcn;
-	*pfcn = newfcn;
-	
-	syslog(LOG_DEBUG, "extensions: registered a new TDAP Veto function (type %d Priority %d)",
-		   EventType, Priority);
-}
-
-
-void CtdlUnregisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType)
-{
-	TDAPVetoHookFunctionHook *cur, *p, *last;
-	last = NULL;
-	cur = TDAPVetoHookTable;
-	while  (cur != NULL) {
-		if ((fcn_ptr == cur->h_function_pointer) &&
-		    (EventType == cur->eventtype))
-		{
-			syslog(LOG_DEBUG, "extensions: unregistered TDAP Veto function (type %d)", EventType);
-			p = cur->next;
-
-			free(cur);
-			cur = NULL;
-
-			if (last != NULL)
-				last->next = p;
-			else 
-				TDAPVetoHookTable = p;
-			cur = p;
-		}
-		else {
-			last = cur;
-			cur = cur->next;
-		}
-	}
-}
-
-void CtdlDestroyTDAPVetoHooks(void)
-{
-	TDAPVetoHookFunctionHook *cur, *p;
 
-	cur = TDAPVetoHookTable;
-	while (cur != NULL)
-	{
-		syslog(LOG_DEBUG, "extensions: destroyed TDAP Veto function");
-		p = cur->next;
-		free(cur);
-		cur = p;
-	}
-	TDAPVetoHookTable = NULL;
-}
 
 
 void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority)
@@ -1310,18 +1231,6 @@ void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_st
 	*num_msgs = 0;
 }
 
-int CheckTDAPVeto (int DBType, StrBuf *ErrMsg)
-{
-	int Result = 0;
-	TDAPVetoHookFunctionHook *fcn = NULL;
-
-	for (fcn = TDAPVetoHookTable; (fcn != NULL) && (Result == 0); fcn = fcn->next) {
-		if (fcn->eventtype == DBType) {
-			Result = (*fcn->h_function_pointer) (ErrMsg);
-		}
-	}
-	return Result;
-}
 
 void PerformSessionHooks(int EventType)
 {
diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index 92dd06e9d..b394a0cef 100644
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -59,9 +59,6 @@ char *Dynamic_Module_Init(void);
 void CtdlDestroySessionHooks(void);
 void PerformSessionHooks(int EventType);
 
-int CheckTDAPVeto (int DBType, StrBuf *ErrMsg);
-void CtdlDestroyTDAPVetoHooks(void);
-
 void CtdlDestroyUserHooks(void);
 void PerformUserHooks(struct ctdluser *usbuf, int EventType);
 
diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index e5a829fec..d913866b7 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -968,7 +968,6 @@ void sysdep_master_cleanup(void) {
 	CtdlDestroyCleanupHooks();
 	CtdlDestroyFixedOutputHooks();	
 	CtdlDestroySessionHooks();
-	CtdlDestroyTDAPVetoHooks();
 	CtdlDestroyServiceHook();
 	CtdlDestroyRoomHooks();
 	CtdlDestroySearchHooks();