some stage work for library modules

2 files changed, 6 insertions, 12 deletions

diff --git a/modules.c b/modules.c
index 568ea768..acc65f65 100644
--- a/modules.c
+++ b/modules.c
@@ -125,7 +125,8 @@ uchar *modGetName(modInfo_t *pThis)
 
 /* Add a module to the loaded module linked list
  */
-static inline void addModToList(modInfo_t *pThis)
+static inline void
+addModToList(modInfo_t *pThis)
 {
 	assert(pThis != NULL);
 
@@ -192,17 +193,10 @@ static rsRetVal modPrepareUnload(modInfo_t *pThis)
 
 	assert(pThis != NULL);
 
-	/* WARNING - the current code does NOT work and causes an abort - this is acceptable right now
-	 * as I am DEVELOPING the working code and will NOT release until it is there. If you use a
-	 * CVS snapshot, be aware of this limitation. For now, you can just remove everything up to
-	 * (but not including) the END DEVEL comment. That will do the trick. rgerhards, 2007-11-21
-	 */
 	CHKiRet(pThis->modGetID(&pModCookie));
 	pThis->modExit(); /* tell the module to get ready for unload */
 	CHKiRet(unregCfSysLineHdlrs4Owner(pModCookie));
 
-	/* END DEVEL */
-
 finalize_it:
 	RETiRet;
 }
@@ -266,7 +260,7 @@ rsRetVal doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)())
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"needUDPSocket", &pNew->needUDPSocket));
 			CHKiRet((*pNew->modQueryEtryPt)((uchar*)"tryResume", &pNew->tryResume));
 			break;
-		case eMOD_FILTER:
+		case eMOD_LIB:
 			break;
 	}
 
@@ -312,8 +306,8 @@ void modPrintList(void)
 		case eMOD_IN:
 			dbgprintf("input");
 			break;
-		case eMOD_FILTER:
-			dbgprintf("filter");
+		case eMOD_LIB:
+			dbgprintf("library");
 			break;
 		}
 		dbgprintf(" module.\n");
diff --git a/modules.h b/modules.h
index 759483c2..d6b728fc 100644
--- a/modules.h
+++ b/modules.h
@@ -37,7 +37,7 @@
 typedef enum eModType_ {
 	eMOD_IN,	/* input module */
 	eMOD_OUT,	/* output module */
-	eMOD_FILTER	/* filter module (not know yet if we will once have such at all...) */
+	eMOD_LIB	/* library module - this module provides one or many interfaces */
 } eModType_t;
 
 /* how is this module linked? */