optimized template string generation

3 files changed, 5 insertions, 8 deletions

diff --git a/runtime/datetime.c b/runtime/datetime.c
index b5514e7c..8f4bfa10 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -556,7 +556,7 @@ int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst)
 	 */
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenDst < 15);
+	assert(iLenDst >= 15);
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
@@ -582,7 +582,7 @@ int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf, size_t iLenDst)
 	/* see note in formatTimestampToMySQL, applies here as well */
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenDst < 20);
+	assert(iLenDst >= 20);
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
@@ -666,7 +666,7 @@ int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 	BEGINfunc
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenBuf < 33);
+	assert(iLenBuf >= 33);
 
 	/* start with fixed parts */
 	/* year yyyy */
@@ -741,7 +741,7 @@ int formatTimestamp3164(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 	assert(ts != NULL);
 	assert(pBuf != NULL);
 	
-	assert(iLenBuf < 16);
+	assert(iLenBuf >= 16);
 
 	pBuf[0] = monthNames[(ts->month - 1)% 12][0];
 	pBuf[1] = monthNames[(ts->month - 1) % 12][1];
diff --git a/runtime/stringbuf.c b/runtime/stringbuf.c
index e7fa8c41..d3ddf33a 100644
--- a/runtime/stringbuf.c
+++ b/runtime/stringbuf.c
@@ -461,14 +461,11 @@ cstrFinalize(cstr_t *pThis)
 	DEFiRet;
 	rsCHECKVALIDOBJECT(pThis, OIDrsCStr);
 	
-	assert(pThis->bIsFinalized == 0);
-
 	if(pThis->iStrLen > 0) {
 		/* terminate string only if one exists */
 		CHKiRet(cstrAppendChar(pThis, '\0'));
 		--pThis->iStrLen;	/* do NOT count the \0 byte */
 	}
-	pThis->bIsFinalized = 1;
 
 finalize_it:
 	RETiRet;
diff --git a/runtime/stringbuf.h b/runtime/stringbuf.h
index b4fc3f3c..9d2e7865 100644
--- a/runtime/stringbuf.h
+++ b/runtime/stringbuf.h
@@ -48,7 +48,7 @@ typedef struct cstr_s
 	size_t iBufSize;	/**< current maximum size of the string buffer */
 	size_t iStrLen;		/**< length of the string in characters. */
 	unsigned short iAllocIncrement;	/**< the amount of bytes the string should be expanded if it needs to */
-	bool bIsFinalized;	/**< is this object finished and ready for use? (a debug aid, may be removed later TODO 2009-06-16) */
+	bool bIsForeignBuf;	/**< is pBuf a buffer provided by someone else? */
 } cstr_t;