some cleanup

3 files changed, 4 insertions, 16 deletions

diff --git a/net.h b/net.h
index 1916f3ed..92a27096 100644
--- a/net.h
+++ b/net.h
@@ -114,15 +114,5 @@ ENDinterface(net)
 /* prototypes */
 PROTOTYPEObj(net);
 
-
-
-#if 0
-extern int     ACLAddHostnameOnFail; /* add hostname to acl when DNS resolving has failed */
-extern int     ACLDontResolve;       /* add hostname to acl instead of resolving it to IP(s) */
-extern struct AllowedSenders *pAllowedSenders_UDP;
-extern struct AllowedSenders *pAllowedSenders_TCP;
-extern struct AllowedSenders *pAllowedSenders_GSS;
-#endif
-
 #endif /* #ifdef SYSLOG_INET */
 #endif /* #ifndef INCLUDED_NET_H */
diff --git a/obj-types.h b/obj-types.h
index 3771d02d..b2f89f9e 100644
--- a/obj-types.h
+++ b/obj-types.h
@@ -65,18 +65,16 @@ typedef enum {	/* IDs of base methods supported by all objects - used for jump t
  */
 typedef struct interface_s {
 	int ifVersion;	/* must be set to version requested */ 
-	//xxxobjID_t oID;	/* our object ID (later dynamically assigned) */
+	int ifIsLoaded; /* is the interface loaded? (0-no, 1-yes; if no, functions can NOT be called! */
 } interface_t;
 
 
 typedef struct objInfo_s {
-objID_t	objID;	
 	uchar *pszID; /* the object ID as a string */
 	size_t lenID; /* length of the ID string */
 	int iObjVers;
 	uchar *pszName;
 	rsRetVal (*objMethods[OBJ_NUM_METHODS])();
-	// TODO: the queryInterface pointer should probably be added here
 	rsRetVal (*QueryIF)(interface_t*);
 } objInfo_t;
 
diff --git a/template.c b/template.c
index 3865354c..01f6452c 100644
--- a/template.c
+++ b/template.c
@@ -484,9 +484,9 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl)
 	int iNum;	/* to compute numbers */
 
 #ifdef FEATURE_REGEXP
-	/* APR: variables for regex */

-	int longitud;

-	unsigned char *regex_char;

+	/* APR: variables for regex */
+	int longitud;
+	unsigned char *regex_char;
 	unsigned char *regex_end;
 #endif