disabled compile warnings caused by third-party libraries

9 files changed, 28 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d5c66cd..626036b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---------------------------------------------------------------------------
 Version 3.19.8 (rgerhards), 2008-06-??
+- disabled compile warnings caused by third-party libraries
 ---------------------------------------------------------------------------
 Version 3.19.7 (rgerhards), 2008-06-11
 - added new property replacer option "date-subseconds" that enables
diff --git a/action.c b/action.c
index 216a7804..f229bb9f 100644
--- a/action.c
+++ b/action.c
@@ -369,6 +369,7 @@ rsRetVal actionDbgPrint(action_t *pThis)
 /* call the DoAction output plugin entry point
  * rgerhards, 2008-01-28
  */
+#pragma GCC diagnostic ignored "-Wempty-body"
 rsRetVal
 actionCallDoAction(action_t *pAction, msg_t *pMsg)
 {
@@ -453,6 +454,7 @@ finalize_it:
 
 	RETiRet;
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 /* set the action message queue mode
  * TODO: probably move this into queue object, merge with MainMsgQueue!
@@ -588,6 +590,7 @@ finalize_it:
 /* call the configured action. Does all necessary housekeeping.
  * rgerhards, 2007-08-01
  */
+#pragma GCC diagnostic ignored "-Wempty-body"
 rsRetVal
 actionCallAction(action_t *pAction, msg_t *pMsg)
 {
@@ -672,6 +675,7 @@ finalize_it:
 	pthread_setcancelstate(iCancelStateSave, NULL);
 	RETiRet;
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 
 /* add our cfsysline handlers
diff --git a/configure.ac b/configure.ac
index e3b5a67b..4417e8f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_GNU_SOURCE
 AC_PROG_CC
 AM_PROG_CC_C_O
 if test "$GCC" = "yes"
-then CFLAGS="$CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g"
+then CFLAGS="$CFLAGS -fdiagnostics-show-option -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g"
 fi
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index a5f1cc8f..d4a332eb 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -181,7 +181,10 @@ static void pollFileCancelCleanup(void *pArg)
 		rsCStrDestruct(ppCStr);
 	ENDfunc;
 }
+
+
 /* poll a file, need to check file rollover etc. open file if not open */
+#pragma GCC diagnostic ignored "-Wempty-body"
 static rsRetVal pollFile(fileInfo_t *pThis, int *pbHadFileData)
 {
 	DEFiRet;
@@ -210,6 +213,7 @@ finalize_it:
 
 	RETiRet;
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 
 /* This function is the cancel cleanup handler. It is called when rsyslog decides the
@@ -266,6 +270,7 @@ inputModuleCleanup(void __attribute__((unused)) *arg)
  * On spamming the main queue: keep in mind that it will automatically rate-limit
  * ourselfes if we begin to overrun it. So we really do not need to care here.
  */
+#pragma GCC diagnostic ignored "-Wempty-body"
 BEGINrunInput
 	int i;
 	int bHadFileData; /* were there at least one file with data during this run? */
@@ -298,6 +303,7 @@ CODESTARTrunInput
 	pthread_cleanup_pop(0); /* just for completeness, but never called... */
 	RETiRet;	/* use it to make sure the housekeeping is done! */
 ENDrunInput
+#pragma GCC diagnostic warning "-Wempty-body"
 	/* END no-touch zone                                                                          *
 	 * ------------------------------------------------------------------------------------------ */
 
diff --git a/runtime/debug.c b/runtime/debug.c
index f543efd8..1450d029 100644
--- a/runtime/debug.c
+++ b/runtime/debug.c
@@ -743,6 +743,7 @@ sigsegvHdlr(int signum)
 }
 
 
+#pragma GCC diagnostic ignored "-Wempty-body"
 /* print some debug output when an object is given
  * This is mostly a copy of dbgprintf, but I do not know how to combine it
  * into a single function as we have variable arguments and I don't know how to call
@@ -834,8 +835,10 @@ dbgoprint(obj_t *pObj, char *fmt, ...)
 	if(altdbg != NULL) fflush(altdbg);
 	pthread_cleanup_pop(1);
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 
+#pragma GCC diagnostic ignored "-Wempty-body"
 /* print some debug output when no object is given
  * WARNING: duplicate code, see dbgoprin above!
  */
@@ -908,6 +911,7 @@ dbgprintf(char *fmt, ...)
 	if(altdbg != NULL) fflush(altdbg);
 	pthread_cleanup_pop(1);
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 void tester(void)
 {
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c
index 75887913..932bab62 100644
--- a/runtime/nsd_gtls.c
+++ b/runtime/nsd_gtls.c
@@ -1080,12 +1080,14 @@ gtlsEndSess(nsd_gtls_t *pThis)
  * http://lists.gnu.org/archive/html/help-gnutls/2008-05/msg00000.html
  * rgerhards, 2008.05-07
  */
+#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
 static inline void
 gtlsSetTransportPtr(nsd_gtls_t *pThis, int sock)
 {
 	/* Note: the compiler warning for the next line is OK - see header comment! */
 	gnutls_transport_set_ptr(pThis->sess, (gnutls_transport_ptr_t) sock);
 }
+#pragma GCC diagnostic warning "-Wint-to-pointer-cast"
 
 /* ---------------------------- end GnuTLS specifics ---------------------------- */
 
diff --git a/runtime/wti.c b/runtime/wti.c
index 0e04200c..7965fa69 100644
--- a/runtime/wti.c
+++ b/runtime/wti.c
@@ -340,6 +340,7 @@ wtiWorkerCancelCleanup(void *arg)
  * and would be very hard to debug. The yield() is a sure fix, its performance overhead
  * should be well accepted given the above facts. -- rgerhards, 2008-01-10
  */
+#pragma GCC diagnostic ignored "-Wempty-body"
 rsRetVal
 wtiWorker(wti_t *pThis)
 {
@@ -426,6 +427,7 @@ wtiWorker(wti_t *pThis)
 
 	RETiRet;
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 
 /* some simple object access methods */
diff --git a/runtime/wtp.c b/runtime/wtp.c
index 0658232b..967bfaf5 100644
--- a/runtime/wtp.c
+++ b/runtime/wtp.c
@@ -244,6 +244,7 @@ wtpChkStopWrkr(wtp_t *pThis, int bLockMutex, int bLockUsrMutex)
 }
 
 
+#pragma GCC diagnostic ignored "-Wempty-body"
 /* Send a shutdown command to all workers and see if they terminate.
  * A timeout may be specified.
  * rgerhards, 2008-01-14
@@ -292,6 +293,7 @@ wtpShutdownAll(wtp_t *pThis, wtpState_t tShutdownCmd, struct timespec *ptTimeout
 
 	RETiRet;
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 
 /* indicate that a thread has terminated and awake anyone waiting on it
@@ -382,6 +384,7 @@ wtpWrkrExecCancelCleanup(void *arg)
  * wti worker.
  * rgerhards, 2008-01-21
  */
+#pragma GCC diagnostic ignored "-Wempty-body"
 static void *
 wtpWorker(void *arg) /* the arg is actually a wti object, even though we are in wtp! */
 {
@@ -435,6 +438,7 @@ wtpWorker(void *arg) /* the arg is actually a wti object, even though we are in
 	ENDfunc
 	pthread_exit(0);
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 
 /* start a new worker */
diff --git a/tcpsrv.c b/tcpsrv.c
index 0ae1f423..94bcaaa7 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -392,7 +392,10 @@ RunCancelCleanup(void *arg)
 	if(*ppSel != NULL)
 		nssel.Destruct(ppSel);
 }
+
+
 /* This function is called to gather input. */
+#pragma GCC diagnostic ignored "-Wempty-body"
 static rsRetVal
 Run(tcpsrv_t *pThis)
 {
@@ -496,6 +499,7 @@ finalize_it: /* this is a very special case - this time only we do not exit the
 
 	RETiRet;
 }
+#pragma GCC diagnostic warning "-Wempty-body"
 
 
 /* Standard-Constructor */