summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/ctok.c4
-rw-r--r--runtime/ctok_token.h4
-rw-r--r--runtime/datetime.h1
-rw-r--r--runtime/expr.c2
-rw-r--r--runtime/glbl.c8
-rw-r--r--runtime/glbl.h8
-rw-r--r--runtime/module-template.h2
-rw-r--r--runtime/msg.c1
-rw-r--r--runtime/obj-types.h4
-rw-r--r--runtime/obj.c6
-rw-r--r--runtime/queue.c36
-rw-r--r--runtime/stream.c4
-rw-r--r--runtime/wti.c2
-rw-r--r--runtime/wtp.c28
14 files changed, 53 insertions, 57 deletions
diff --git a/runtime/ctok.c b/runtime/ctok.c
index 11951d28..ceab15bd 100644
--- a/runtime/ctok.c
+++ b/runtime/ctok.c
@@ -512,7 +512,7 @@ ctokGetToken(ctok_t *pThis, ctok_token_t **ppToken)
/* push c back, higher level parser needs it */
CHKiRet(ctokUngetCharFromStream(pThis, c));
pToken->tok = ctok_FUNCTION;
- // TODO: fill function name
+ /* TODO: fill function name */
} else { /* give up... */
dbgprintf("parser has an invalid word (token) '%s'\n", szWord);
pToken->tok = ctok_INVALID;
@@ -527,7 +527,7 @@ ctokGetToken(ctok_t *pThis, ctok_token_t **ppToken)
dbgoprint((obj_t*) pToken, "token: %d\n", pToken->tok);
finalize_it:
-//dbgprintf("ctokGetToken, returns %d, returns token %d, addr %p\n", iRet, (*ppToken)->tok, &((*ppToken)->tok));
+/*dbgprintf("ctokGetToken, returns %d, returns token %d, addr %p\n", iRet, (*ppToken)->tok, &((*ppToken)->tok));*/
if(iRet != RS_RET_OK) {
if(pToken != NULL)
ctok_token.Destruct(&pToken);
diff --git a/runtime/ctok_token.h b/runtime/ctok_token.h
index 346d5acd..d36689fa 100644
--- a/runtime/ctok_token.h
+++ b/runtime/ctok_token.h
@@ -63,11 +63,9 @@ typedef struct {
ctok_CMP_STARTSWITH = 106,
ctok_CMP_CONTAINSI = 107,
ctok_CMP_STARTSWITHI = 108,
- ctok_CMP_GTEQ = 109, /* end compare operations */
+ ctok_CMP_GTEQ = 109 /* end compare operations */
} tok;
var_t *pVar;
- //cstr_t *pstrVal;
- //int64 intVal;
} ctok_token_t;
diff --git a/runtime/datetime.h b/runtime/datetime.h
index 1012ccc1..8f1bcb17 100644
--- a/runtime/datetime.h
+++ b/runtime/datetime.h
@@ -36,7 +36,6 @@ typedef struct datetime_s {
/* interfaces */
BEGINinterface(datetime) /* name must also be changed in ENDinterface macro! */
void (*getCurrTime)(struct syslogTime *t);
- //static int srSLMGParseInt32(char** ppsz);
int (*ParseTIMESTAMP3339)(struct syslogTime *pTime, char** ppszTS);
int (*ParseTIMESTAMP3164)(struct syslogTime *pTime, char* pszTS);
int (*formatTimestampToMySQL)(struct syslogTime *ts, char* pDst, size_t iLenDst);
diff --git a/runtime/expr.c b/runtime/expr.c
index 9c357404..9a314855 100644
--- a/runtime/expr.c
+++ b/runtime/expr.c
@@ -85,7 +85,7 @@ terminal(expr_t *pThis, ctok_t *tok)
break;
case ctok_FUNCTION:
dbgoprint((obj_t*) pThis, "function\n");
- // vm: call - well, need to implement that first
+ /* TODO: vm: call - well, need to implement that first */
ABORT_FINALIZE(RS_RET_NOT_IMPLEMENTED);
break;
case ctok_MSGVAR:
diff --git a/runtime/glbl.c b/runtime/glbl.c
index 20840318..deb32471 100644
--- a/runtime/glbl.c
+++ b/runtime/glbl.c
@@ -102,10 +102,10 @@ SIMP_PROP(StripDomains, StripDomains, char**)
SIMP_PROP(LocalHosts, LocalHosts, char**)
SIMP_PROP_SET(LocalHostName, LocalHostName, uchar*)
-SIMP_PROP_SET(DfltNetstrmDrvr, pszDfltNetstrmDrvr, uchar*) // TODO: use custom function which frees existing value
-SIMP_PROP_SET(DfltNetstrmDrvrCAF, pszDfltNetstrmDrvrCAF, uchar*) // TODO: use custom function which frees existing value
-SIMP_PROP_SET(DfltNetstrmDrvrKeyFile, pszDfltNetstrmDrvrKeyFile, uchar*) // TODO: use custom function which frees existing value
-SIMP_PROP_SET(DfltNetstrmDrvrCertFile, pszDfltNetstrmDrvrCertFile, uchar*) // TODO: use custom function which frees existing value
+SIMP_PROP_SET(DfltNetstrmDrvr, pszDfltNetstrmDrvr, uchar*) /* TODO: use custom function which frees existing value */
+SIMP_PROP_SET(DfltNetstrmDrvrCAF, pszDfltNetstrmDrvrCAF, uchar*) /* TODO: use custom function which frees existing value */
+SIMP_PROP_SET(DfltNetstrmDrvrKeyFile, pszDfltNetstrmDrvrKeyFile, uchar*) /* TODO: use custom function which frees existing value */
+SIMP_PROP_SET(DfltNetstrmDrvrCertFile, pszDfltNetstrmDrvrCertFile, uchar*) /* TODO: use custom function which frees existing value */
#undef SIMP_PROP
#undef SIMP_PROP_SET
diff --git a/runtime/glbl.h b/runtime/glbl.h
index adfae27e..90436319 100644
--- a/runtime/glbl.h
+++ b/runtime/glbl.h
@@ -40,10 +40,10 @@ BEGINinterface(glbl) /* name must also be changed in ENDinterface macro! */
#define SIMP_PROP(name, dataType) \
dataType (*Get##name)(void); \
rsRetVal (*Set##name)(dataType);
- SIMP_PROP(DefPFFamily, int);
- SIMP_PROP(DropMalPTRMsgs, int);
- SIMP_PROP(Option_DisallowWarning, int);
- SIMP_PROP(DisableDNS, int);
+ SIMP_PROP(DefPFFamily, int)
+ SIMP_PROP(DropMalPTRMsgs, int)
+ SIMP_PROP(Option_DisallowWarning, int)
+ SIMP_PROP(DisableDNS, int)
SIMP_PROP(LocalHostName, uchar*)
SIMP_PROP(LocalDomain, uchar*)
SIMP_PROP(StripDomains, char**)
diff --git a/runtime/module-template.h b/runtime/module-template.h
index a200c4f2..53f5543a 100644
--- a/runtime/module-template.h
+++ b/runtime/module-template.h
@@ -51,7 +51,7 @@
* a module provides multiple types, several separate modules must be created which
* then should share a single library containing the majority of code. This macro
* must be present in each module. -- rgerhards, 2007-12-14
-* Note that MODULE_TYPE_TESTBENCH is reserved for testbenches, but
+ * Note that MODULE_TYPE_TESTBENCH is reserved for testbenches, but
* declared in their own header files (because the rest does not need these
* defines). -- rgerhards, 2008-06-13
*/
diff --git a/runtime/msg.c b/runtime/msg.c
index 19a75944..cf59f762 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -83,7 +83,6 @@ static syslogCODE rs_facilitynames[] =
{ "kern", LOG_KERN },
{ "lpr", LOG_LPR },
{ "mail", LOG_MAIL },
- //{ "mark", INTERNAL_MARK }, /* INTERNAL */
{ "news", LOG_NEWS },
{ "security", LOG_AUTH }, /* DEPRECATED */
{ "syslog", LOG_SYSLOG },
diff --git a/runtime/obj-types.h b/runtime/obj-types.h
index 5f531eb1..914c2f2c 100644
--- a/runtime/obj-types.h
+++ b/runtime/obj-types.h
@@ -365,7 +365,7 @@ rsRetVal objName##ClassExit(void) \
*/
#define BEGINinterface(obj) \
typedef struct obj##_if_s {\
- ifBEGIN; /* This MUST always be the first interface member */
+ ifBEGIN /* This MUST always be the first interface member */
#define ENDinterface(obj) \
} obj##_if_t;
@@ -403,7 +403,7 @@ rsRetVal objName##ClassExit(void) \
*/
#define PROTOTYPEObj(obj) \
PROTOTYPEObjClassInit(obj); \
- PROTOTYPEObjClassExit(obj);
+ PROTOTYPEObjClassExit(obj)
/* ------------------------------ end object loader system ------------------------------ */
diff --git a/runtime/obj.c b/runtime/obj.c
index af59a955..9c7656c5 100644
--- a/runtime/obj.c
+++ b/runtime/obj.c
@@ -423,7 +423,7 @@ finalize_it:
/* define a helper to make code below a bit cleaner (and quicker to write) */
-#define NEXTC CHKiRet(strmReadChar(pStrm, &c))//;dbgprintf("c: %c\n", c);
+#define NEXTC CHKiRet(strmReadChar(pStrm, &c))/*;dbgprintf("c: %c\n", c)*/
/* de-serialize an embedded, non-octect-counted string. This is useful
@@ -803,7 +803,7 @@ Deserialize(void *ppObj, uchar *pszTypeExpected, strm_t *pStrm, rsRetVal (*fFixu
}
} while(iRetLocal != RS_RET_OK);
- if(rsCStrSzStrCmp(pstrID, pszTypeExpected, strlen((char*)pszTypeExpected))) // TODO: optimize strlen() - caller shall provide
+ if(rsCStrSzStrCmp(pstrID, pszTypeExpected, strlen((char*)pszTypeExpected))) /* TODO: optimize strlen() - caller shall provide */
ABORT_FINALIZE(RS_RET_INVALID_OID);
CHKiRet(FindObjInfo(pstrID, &pObjInfo));
@@ -827,7 +827,7 @@ Deserialize(void *ppObj, uchar *pszTypeExpected, strm_t *pStrm, rsRetVal (*fFixu
finalize_it:
if(iRet != RS_RET_OK && pObj != NULL)
- free(pObj); // TODO: check if we can call destructor 2008-01-13 rger
+ free(pObj); /* TODO: check if we can call destructor 2008-01-13 rger */
if(pstrID != NULL)
rsCStrDestruct(&pstrID);
diff --git a/runtime/queue.c b/runtime/queue.c
index 56711416..24fcee10 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -2253,24 +2253,24 @@ finalize_it:
/* some simple object access methods */
-DEFpropSetMeth(queue, iPersistUpdCnt, int);
-DEFpropSetMeth(queue, iDeqtWinFromHr, int);
-DEFpropSetMeth(queue, iDeqtWinToHr, int);
-DEFpropSetMeth(queue, toQShutdown, long);
-DEFpropSetMeth(queue, toActShutdown, long);
-DEFpropSetMeth(queue, toWrkShutdown, long);
-DEFpropSetMeth(queue, toEnq, long);
-DEFpropSetMeth(queue, iHighWtrMrk, int);
-DEFpropSetMeth(queue, iLowWtrMrk, int);
-DEFpropSetMeth(queue, iDiscardMrk, int);
-DEFpropSetMeth(queue, iFullDlyMrk, int);
-DEFpropSetMeth(queue, iDiscardSeverity, int);
-DEFpropSetMeth(queue, bIsDA, int);
-DEFpropSetMeth(queue, iMinMsgsPerWrkr, int);
-DEFpropSetMeth(queue, bSaveOnShutdown, int);
-DEFpropSetMeth(queue, pUsr, void*);
-DEFpropSetMeth(queue, iDeqSlowdown, int);
-DEFpropSetMeth(queue, sizeOnDiskMax, int64);
+DEFpropSetMeth(queue, iPersistUpdCnt, int)
+DEFpropSetMeth(queue, iDeqtWinFromHr, int)
+DEFpropSetMeth(queue, iDeqtWinToHr, int)
+DEFpropSetMeth(queue, toQShutdown, long)
+DEFpropSetMeth(queue, toActShutdown, long)
+DEFpropSetMeth(queue, toWrkShutdown, long)
+DEFpropSetMeth(queue, toEnq, long)
+DEFpropSetMeth(queue, iHighWtrMrk, int)
+DEFpropSetMeth(queue, iLowWtrMrk, int)
+DEFpropSetMeth(queue, iDiscardMrk, int)
+DEFpropSetMeth(queue, iFullDlyMrk, int)
+DEFpropSetMeth(queue, iDiscardSeverity, int)
+DEFpropSetMeth(queue, bIsDA, int)
+DEFpropSetMeth(queue, iMinMsgsPerWrkr, int)
+DEFpropSetMeth(queue, bSaveOnShutdown, int)
+DEFpropSetMeth(queue, pUsr, void*)
+DEFpropSetMeth(queue, iDeqSlowdown, int)
+DEFpropSetMeth(queue, sizeOnDiskMax, int64)
/* This function can be used as a generic way to set properties. Only the subset
diff --git a/runtime/stream.c b/runtime/stream.c
index 3afa9fcd..f1f69cc8 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -643,7 +643,7 @@ DEFpropSetMeth(strm, iMaxFileSize, int)
DEFpropSetMeth(strm, iFileNumDigits, int)
DEFpropSetMeth(strm, tOperationsMode, int)
DEFpropSetMeth(strm, tOpenMode, mode_t)
-DEFpropSetMeth(strm, sType, strmType_t);
+DEFpropSetMeth(strm, sType, strmType_t)
rsRetVal strmSetiMaxFiles(strm_t *pThis, int iNewVal)
{
@@ -909,7 +909,7 @@ CODESTARTobjQueryInterface(strm)
* work here (if we can support an older interface version - that,
* of course, also affects the "if" above).
*/
- //xxxpIf->oID = OBJvm;
+ /*xxxpIf->oID = OBJvm; SAMPLE */
finalize_it:
ENDobjQueryInterface(strm)
diff --git a/runtime/wti.c b/runtime/wti.c
index 7965fa69..13554232 100644
--- a/runtime/wti.c
+++ b/runtime/wti.c
@@ -431,7 +431,7 @@ wtiWorker(wti_t *pThis)
/* some simple object access methods */
-DEFpropSetMeth(wti, pWtp, wtp_t*);
+DEFpropSetMeth(wti, pWtp, wtp_t*)
/* set the debug header message
* The passed-in string is duplicated. So if the caller does not need
diff --git a/runtime/wtp.c b/runtime/wtp.c
index 967bfaf5..8b041ea2 100644
--- a/runtime/wtp.c
+++ b/runtime/wtp.c
@@ -542,20 +542,20 @@ finalize_it:
/* some simple object access methods */
-DEFpropSetMeth(wtp, toWrkShutdown, long);
-DEFpropSetMeth(wtp, wtpState, wtpState_t);
-DEFpropSetMeth(wtp, iNumWorkerThreads, int);
-DEFpropSetMeth(wtp, pUsr, void*);
-DEFpropSetMethPTR(wtp, pmutUsr, pthread_mutex_t);
-DEFpropSetMethPTR(wtp, pcondBusy, pthread_cond_t);
-DEFpropSetMethFP(wtp, pfChkStopWrkr, rsRetVal(*pVal)(void*, int));
-DEFpropSetMethFP(wtp, pfRateLimiter, rsRetVal(*pVal)(void*));
-DEFpropSetMethFP(wtp, pfIsIdle, rsRetVal(*pVal)(void*, int));
-DEFpropSetMethFP(wtp, pfDoWork, rsRetVal(*pVal)(void*, void*, int));
-DEFpropSetMethFP(wtp, pfOnIdle, rsRetVal(*pVal)(void*, int));
-DEFpropSetMethFP(wtp, pfOnWorkerCancel, rsRetVal(*pVal)(void*, void*));
-DEFpropSetMethFP(wtp, pfOnWorkerStartup, rsRetVal(*pVal)(void*));
-DEFpropSetMethFP(wtp, pfOnWorkerShutdown, rsRetVal(*pVal)(void*));
+DEFpropSetMeth(wtp, toWrkShutdown, long)
+DEFpropSetMeth(wtp, wtpState, wtpState_t)
+DEFpropSetMeth(wtp, iNumWorkerThreads, int)
+DEFpropSetMeth(wtp, pUsr, void*)
+DEFpropSetMethPTR(wtp, pmutUsr, pthread_mutex_t)
+DEFpropSetMethPTR(wtp, pcondBusy, pthread_cond_t)
+DEFpropSetMethFP(wtp, pfChkStopWrkr, rsRetVal(*pVal)(void*, int))
+DEFpropSetMethFP(wtp, pfRateLimiter, rsRetVal(*pVal)(void*))
+DEFpropSetMethFP(wtp, pfIsIdle, rsRetVal(*pVal)(void*, int))
+DEFpropSetMethFP(wtp, pfDoWork, rsRetVal(*pVal)(void*, void*, int))
+DEFpropSetMethFP(wtp, pfOnIdle, rsRetVal(*pVal)(void*, int))
+DEFpropSetMethFP(wtp, pfOnWorkerCancel, rsRetVal(*pVal)(void*, void*))
+DEFpropSetMethFP(wtp, pfOnWorkerStartup, rsRetVal(*pVal)(void*))
+DEFpropSetMethFP(wtp, pfOnWorkerShutdown, rsRetVal(*pVal)(void*))
/* return the current number of worker threads.