Merge branch 'master' into omfile

Conflicts:
	ChangeLog
	runtime/msg.h
	tcps_sess.c
	tcpsrv.c
	tools/syslogd.c

1 files changed, 6 insertions, 6 deletions

diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
index c39e54f6..184c0d87 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -462,7 +462,7 @@ getWord(uchar **pp, cstr_t **ppStrB)
 	ASSERT(*pp != NULL);
 	ASSERT(ppStrB != NULL);
 
-	CHKiRet(rsCStrConstruct(ppStrB));
+	CHKiRet(cstrConstruct(ppStrB));
 
 	skipWhiteSpace(pp); /* skip over any whitespace */
 
@@ -470,9 +470,9 @@ getWord(uchar **pp, cstr_t **ppStrB)
 	p = *pp;
 
 	while(*p && !isspace((int) *p)) {
-		CHKiRet(rsCStrAppendChar(*ppStrB, *p++));
+		CHKiRet(cstrAppendChar(*ppStrB, *p++));
 	}
-	CHKiRet(rsCStrFinish(*ppStrB));
+	CHKiRet(cstrFinalize(*ppStrB));
 
 	*pp = p;
 
@@ -506,7 +506,7 @@ static rsRetVal doGetWord(uchar **pp, rsRetVal (*pSetHdlr)(void*, uchar*), void
 	ASSERT(*pp != NULL);
 
 	CHKiRet(getWord(pp, &pStrB));
-	CHKiRet(rsCStrConvSzStrAndDestruct(pStrB, &pNewVal, 0));
+	CHKiRet(cstrConvSzStrAndDestruct(pStrB, &pNewVal, 0));
 	pStrB = NULL;
 
 	/* we got the word, now set it */
@@ -525,7 +525,7 @@ static rsRetVal doGetWord(uchar **pp, rsRetVal (*pSetHdlr)(void*, uchar*), void
 finalize_it:
 	if(iRet != RS_RET_OK) {
 		if(pStrB != NULL)
-			rsCStrDestruct(&pStrB);
+			cstrDestruct(&pStrB);
 	}
 
 	RETiRet;
@@ -548,7 +548,7 @@ doSyslogName(uchar **pp, rsRetVal (*pSetHdlr)(void*, int), void *pVal, syslogNam
 	ASSERT(*pp != NULL);
 
 	CHKiRet(getWord(pp, &pStrB)); /* get word */
-	iNewVal = decodeSyslogName(rsCStrGetSzStr(pStrB), pNameTable);
+	iNewVal = decodeSyslogName(cstrGetSzStr(pStrB), pNameTable);
 
 	if(pSetHdlr == NULL) {
 		/* we should set value directly to var */