- extracted logerror*() family of functions from syslogd, made them their

    own class and converted to new object calling conventions
    (interface-based)
- converted gss-misc into a loadable library module

1 files changed, 9 insertions, 6 deletions

diff --git a/omfwd.c b/omfwd.c
index 654e4d86..84f3fdc7 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -58,6 +58,7 @@
 #include "tcpsyslog.h"
 #include "cfsysline.h"
 #include "module-template.h"
+#include "errmsg.h"
 
 MODULE_TYPE_OUTPUT
 
@@ -81,6 +82,7 @@ MODULE_TYPE_OUTPUT
 /* internal structures
  */
 DEF_OMOD_STATIC_DATA
+DEFobjCurrIf(errmsg)
 
 typedef struct _instanceData {
 	char	f_hname[MAXHOSTNAMELEN+1];
@@ -480,12 +482,12 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 						++p; /* eat */
 						pData->compressionLevel = iLevel;
 					} else {
-						logerrorInt("Invalid compression level '%c' specified in "
+						errmsg.LogError(NO_ERRCODE, "Invalid compression level '%c' specified in "
 						         "forwardig action - NOT turning on compression.",
 							 *p);
 					}
 #					else
-					logerror("Compression requested, but rsyslogd is not compiled "
+					errmsg.LogError(NO_ERRCODE, "Compression requested, but rsyslogd is not compiled "
 					         "with compression support - request ignored.");
 #					endif /* #ifdef USE_NETZIP */
 				} else if(*p == 'o') { /* octet-couting based TCP framing? */
@@ -493,7 +495,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 					/* no further options settable */
 					pData->tcp_framing = TCP_FRAMING_OCTET_COUNTING;
 				} else { /* invalid option! Just skip it... */
-					logerrorInt("Invalid option %c in forwarding action - ignoring.", *p);
+					errmsg.LogError(NO_ERRCODE, "Invalid option %c in forwarding action - ignoring.", *p);
 					++p; /* eat invalid option */
 				}
 				/* the option processing is done. We now do a generic skip
@@ -509,7 +511,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 				/* we probably have end of string - leave it for the rest
 				 * of the code to handle it (but warn the user)
 				 */
-				logerror("Option block not terminated in forwarding action.");
+				errmsg.LogError(NO_ERRCODE, "Option block not terminated in forwarding action.");
 		}
 		/* extract the host first (we do a trick - we replace the ';' or ':' with a '\0')
 		 * now skip to port and then template name. rgerhards 2005-07-06
@@ -527,7 +529,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 				/* SKIP AND COUNT */;
 			pData->port = malloc(i + 1);
 			if(pData->port == NULL) {
-				logerror("Could not get memory to store syslog forwarding port, "
+				errmsg.LogError(NO_ERRCODE, "Could not get memory to store syslog forwarding port, "
 					 "using default port, results may not be what you intend\n");
 				/* we leave f_forw.port set to NULL, this is then handled by
 				 * getFwdSyslogPt().
@@ -545,7 +547,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 				if(bErr == 0) { /* only 1 error msg! */
 					bErr = 1;
 					errno = 0;
-					logerror("invalid selector line (port), probably not doing "
+					errmsg.LogError(NO_ERRCODE, "invalid selector line (port), probably not doing "
 					         "what was intended");
 				}
 			}
@@ -618,6 +620,7 @@ BEGINmodInit(Fwd)
 CODESTARTmodInit
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
+	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 ENDmodInit
 
 #endif /* #ifdef SYSLOG_INET */