From 791d8ea863cbd53eccf989e92ffd8b2ac00dd179 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sun, 28 Feb 2010 17:28:52 +0100
Subject: some code cleanup

---
 tools/omfile.c | 12 +++++++-----
 tools/omfile.h |  2 +-
 tools/ompipe.c |  6 ++----
 tools/ompipe.h |  7 ++-----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/tools/omfile.c b/tools/omfile.c
index ad6a30e0..18f683bb 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -5,10 +5,6 @@
  *       works!
  *
  * File begun on 2007-07-21 by RGerhards (extracted from syslogd.c)
- * This file is under development and has not yet arrived at being fully
- * self-contained and a real object. So far, it is mostly an excerpt
- * of the "old" message code without any modifications. However, it
- * helps to have things at the right place one we go to the meat of it.
  *
  * A large re-write of this file was done in June, 2009. The focus was
  * to introduce many more features (like zipped writing), clean up the code
@@ -16,6 +12,10 @@
  * solid basis for the next three to five years to come. During it, bugs
  * may have been introduced ;) -- rgerhards, 2009-06-04
  *
+ * Note that as of 2010-02-28 this module does no longer handle
+ * pipes. These have been moved to ompipe, to reduced the entanglement
+ * between the two different functionalities. -- rgerhards
+ *
  * Copyright 2007-2009 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of rsyslog.
@@ -666,7 +666,9 @@ CODESTARTparseSelectorAct
 				calloc(iDynaFileCacheSize, sizeof(dynaFileCacheEntry*)));
 		break;
 
-        case '|':
+        /* case '|': while pipe support has been removed, I leave the code in in case we 
+	 *           need high-performance pipes at a later stage (unlikely). -- rgerhards, 2010-02-28
+	 */
 	case '/':
 		CODE_STD_STRING_REQUESTparseSelectorAct(1)
 		/* we now have *almost* the same semantics for files and pipes, but we still need
diff --git a/tools/omfile.h b/tools/omfile.h
index 03e081f3..09031dac 100644
--- a/tools/omfile.h
+++ b/tools/omfile.h
@@ -3,7 +3,7 @@
  *
  * File begun on 2007-07-21 by RGerhards (extracted from syslogd.c)
  *
- * Copyright 2007 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2007-2010 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of rsyslog.
  *
diff --git a/tools/ompipe.c b/tools/ompipe.c
index 89fc05ef..3355bcb4 100644
--- a/tools/ompipe.c
+++ b/tools/ompipe.c
@@ -37,11 +37,8 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <assert.h>
 #include <errno.h>
-#include <ctype.h>
-#include <unistd.h>
 #include <sys/file.h>
 
 #include "syslogd.h"
@@ -51,6 +48,7 @@
 #include "ompipe.h"
 #include "cfsysline.h"
 #include "module-template.h"
+#include "conf.h"
 #include "errmsg.h"
 
 MODULE_TYPE_OUTPUT
@@ -93,7 +91,7 @@ ENDdbgPrintInstInfo
  * course). -- rgerhards, 2008-10-22
  * changed to iRet interface - 2009-03-19
  */
-static rsRetVal
+static inline rsRetVal
 preparePipe(instanceData *pData)
 {
 	DEFiRet;
diff --git a/tools/ompipe.h b/tools/ompipe.h
index 7bda4f93..d17346c5 100644
--- a/tools/ompipe.h
+++ b/tools/ompipe.h
@@ -1,9 +1,7 @@
 /* ompipe.h
  * These are the definitions for the build-in pipe output module.
  *
- * File begun on 2007-07-21 by RGerhards (extracted from syslogd.c)
- *
- * Copyright 2007 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2007-2010 Rainer Gerhards and Adiscon GmbH.
  *
  * This pipe is part of rsyslog.
  *
@@ -29,6 +27,5 @@
 rsRetVal modInitPipe(int iIFVersRequested __attribute__((unused)), int *ipIFVersProvided, rsRetVal (**pQueryEtryPt)(), rsRetVal (*pHostQueryEtryPt)(uchar*, rsRetVal (**)()), modInfo_t*);
 
 #endif /* #ifndef OMPIPE_H_INCLUDED */
-/*
- * vi:set ai:
+/* vi:set ai:
  */
-- 
cgit