some cleanup

5 files changed, 25 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index 0e647f7f..41b2de73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -154,5 +154,25 @@ SUBDIRS += tests
 # temporarily be removed below. The intent behind forcing everthing to compile
 # in a make distcheck is so that we detect code that accidently was not updated
 # when some global update happened.
-DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog  --enable-diagtools --enable-gnutls --enable-omstdout --enable-omruleset --enable-omprog --enable-imdiag --enable-shave --enable-extended-tests --enable-memcheck
+DISTCHECK_CONFIGURE_FLAGS=	--enable-gssapi_krb5 \
+				--enable-imfile \
+				--enable-snmp \
+				--enable-pgsql \
+				--enable-libdbi \
+				--enable-mysql \
+				--enable-omtemplate \
+				--enable-imtemplate \
+				--enable-relp \
+				--enable-rsyslogd \
+				--enable-mail \
+				--enable-klog \
+				--enable-diagtools \
+				--enable-gnutls \
+				--enable-omstdout \
+				--enable-omruleset \
+				--enable-omprog \
+				--enable-imdiag \
+				--enable-shave \
+				--enable-extended-tests \
+				--enable-memcheck
 ACLOCAL_AMFLAGS = -I m4
diff --git a/runtime/stream.c b/runtime/stream.c
index f4dae24e..e3f020ae 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -215,7 +215,7 @@ doPhysOpen(strm_t *pThis)
 	}
 
 	pThis->fd = open((char*)pThis->pszCurrFName, iFlags, pThis->tOpenMode);
-	DBGPRINTF("file '%s' opened as #%d with mode %d\n", pThis->pszCurrFName, pThis->fd, pThis->tOpenMode);
+	DBGPRINTF("file '%s' opened as #%d with mode %d\n", pThis->pszCurrFName, pThis->fd, (int) pThis->tOpenMode);
 	if(pThis->fd == -1) {
 		char errStr[1024];
 		int err = errno;
diff --git a/template.c b/template.c
index 050905b0..3c04aefa 100644
--- a/template.c
+++ b/template.c
@@ -61,7 +61,6 @@ static inline rsRetVal ExtendBuf(uchar **pBuf, size_t *pLenBuf, size_t iMinSize)
 	CHKmalloc(pNewBuf = (uchar*) realloc(*pBuf, iNewSize));
 	*pBuf = pNewBuf;
 	*pLenBuf = iNewSize;
-dbgprintf("extend buf to at least %ld, done %ld\n", iMinSize, iNewSize);
 
 finalize_it:
 	RETiRet;
diff --git a/tools/omfile.c b/tools/omfile.c
index 3c17e7bc..5e49afa9 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -212,9 +212,9 @@ CODESTARTdbgPrintInstInfo
 	dbgprintf("\tflush interval=%d\n", pData->iFlushInterval);
 	dbgprintf("\tfile cache size=%d\n", pData->iDynaFileCacheSize);
 	dbgprintf("\tcreate directories: %s\n", pData->bCreateDirs ? "yes" : "no");
-	dbgprintf("\tfile owner %d, group %d\n", pData->fileUID, pData->fileGID);
+	dbgprintf("\tfile owner %d, group %d\n", (int) pData->fileUID, (int) pData->fileGID);
 	dbgprintf("\tforce chown() for all files: %s\n", pData->bForceChown ? "yes" : "no"); 
-	dbgprintf("\tdirectory owner %d, group %d\n", pData->dirUID, pData->dirGID);
+	dbgprintf("\tdirectory owner %d, group %d\n", (int) pData->dirUID, (int) pData->dirGID);
 	dbgprintf("\tdir create mode 0%3.3o, file create mode 0%3.3o\n",
 		  pData->fDirCreateMode, pData->fCreateMode);
 	dbgprintf("\tfail if owner/group can not be set: %s\n", pData->bFailOnChown ? "yes" : "no");
diff --git a/tools/ompipe.c b/tools/ompipe.c
index 7cf61822..40e9e79b 100644
--- a/tools/ompipe.c
+++ b/tools/ompipe.c
@@ -37,6 +37,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>