From 2b51fcab7b8f16ae9a970670d89e31deef4fe1e1 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 11 Apr 2008 15:08:09 +0200 Subject: applied patch from Tiziano Müller to remove some compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 3 ++- obj.c | 3 ++- stringbuf.h | 3 +++ template.h | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00ec3f12..9b3e6233 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ --------------------------------------------------------------------------- -Version 3.14.2 (rgerhards), 2008-04-?? +Version 3.14.3 (rgerhards), 2008-04-?? - bugfix: omsnmp had a too-small sized buffer for hostname+port. This could not lead to a segfault, as snprintf() was used, but could cause some trouble with extensively long hostnames. +- applied patch from Tiziano Müller to remove some compiler warnings --------------------------------------------------------------------------- Version 3.14.2 (rgerhards), 2008-04-09 - bugfix: segfault with expression-based filters diff --git a/obj.c b/obj.c index 2f16669a..bb907d4f 100644 --- a/obj.c +++ b/obj.c @@ -85,6 +85,7 @@ #include "stream.h" #include "modules.h" #include "errmsg.h" +#include "cfsysline.h" /* static data */ DEFobjCurrIf(obj) /* we define our own interface, as this is expected by some macros! */ @@ -1328,7 +1329,7 @@ objClassInit(modInfo_t *pModInfo) /* init classes we use (limit to as few as possible!) */ CHKiRet(errmsgClassInit(pModInfo)); - CHKiRet(cfsyslineInit(pModInfo)); + CHKiRet(cfsyslineInit()); CHKiRet(varClassInit(pModInfo)); CHKiRet(moduleClassInit(pModInfo)); CHKiRet(objUse(var, CORE_COMPONENT)); diff --git a/stringbuf.h b/stringbuf.h index aa31884e..0d617699 100644 --- a/stringbuf.h +++ b/stringbuf.h @@ -161,4 +161,7 @@ rsRetVal rsCStrAppendCStr(cstr_t *pThis, cstr_t *pstrAppend); #define rsCStrGetBufBeg(x) ((x)->pBuf) +rsRetVal strInit(); +rsRetVal strExit(); + #endif /* single include */ diff --git a/template.h b/template.h index eb9f3045..40ccfa50 100644 --- a/template.h +++ b/template.h @@ -111,6 +111,8 @@ void tplLastStaticInit(struct template *tpl); rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar** ppSz); void doSQLEscape(uchar **pp, size_t *pLen, unsigned short *pbMustBeFreed, int escapeMode); +rsRetVal templateInit(); + #endif /* #ifndef TEMPLATE_H_INCLUDED */ /* vim:set ai: */ -- cgit