diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2005-09-09 12:52:23 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2005-09-09 12:52:23 +0000 |
| commit | 9a39532d953ac2a486635316ffd1970c993753de (patch) | |
| tree | 63e02509d3d211d6be13e94c6ea34e51473b7a09 /outchannel.c | |
| parent | 602fb17d3307d3dbe619ec559688c5b0c2ebc47c (diff) | |
| download | rsyslog-9a39532d953ac2a486635316ffd1970c993753de.tar.gz rsyslog-9a39532d953ac2a486635316ffd1970c993753de.tar.xz rsyslog-9a39532d953ac2a486635316ffd1970c993753de.zip | |
initial implementation of the counted string class completed (but so far
only a very feature-less class). code compiles again.
Diffstat (limited to 'outchannel.c')
| -rw-r--r-- | outchannel.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/outchannel.c b/outchannel.c index cade0492..d6351b68 100644 --- a/outchannel.c +++ b/outchannel.c @@ -79,7 +79,7 @@ static void skip_Comma(char **pp) static int get_Field(char **pp, char **pField) { register char *p; - sbStrBObj *pStrB; + rsCStrObj *pStrB; assert(pp != NULL); assert(*pp != NULL); @@ -88,17 +88,18 @@ static int get_Field(char **pp, char **pField) skip_Comma(pp); p = *pp; - if((pStrB = sbStrBConstruct()) == NULL) + if((pStrB = rsCStrConstruct()) == NULL) return 1; - sbStrBSetAllocIncrement(pStrB, 32); + rsCStrSetAllocIncrement(pStrB, 32); /* copy the field */ while(*p && *p != ' ' && *p != ',') { - sbStrBAppendChar(pStrB, *p++); + rsCStrAppendChar(pStrB, *p++); } *pp = p; - *pField = sbStrBFinish(pStrB); + rsCStrFinish(pStrB); + *pField = rsCStrConvSzStrAndDestruct(pStrB); return 0; } @@ -142,7 +143,7 @@ static int get_off_t(char **pp, off_t *pOff_t) static int get_restOfLine(char **pp, char **pBuf) { register char *p; - sbStrBObj *pStrB; + rsCStrObj *pStrB; assert(pp != NULL); assert(*pp != NULL); @@ -151,17 +152,18 @@ static int get_restOfLine(char **pp, char **pBuf) skip_Comma(pp); p = *pp; - if((pStrB = sbStrBConstruct()) == NULL) + if((pStrB = rsCStrConstruct()) == NULL) return 1; - sbStrBSetAllocIncrement(pStrB, 32); + rsCStrSetAllocIncrement(pStrB, 32); /* copy the field */ while(*p) { - sbStrBAppendChar(pStrB, *p++); + rsCStrAppendChar(pStrB, *p++); } *pp = p; - *pBuf = sbStrBFinish(pStrB); + rsCStrFinish(pStrB); + *pBuf = rsCStrConvSzStrAndDestruct(pStrB); return 0; } |