diff options
author | Bruce Momjian <bruce@momjian.us> | 1997-09-07 05:04:48 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 1997-09-07 05:04:48 +0000 |
commit | 1ccd423235a48739d6f7a4d7889705b5f9ecc69b (patch) | |
tree | 8001c4e839dfad8f29ceda7f8c5f5dbb8759b564 /src/backend/lib/stringinfo.c | |
parent | 8fecd4febf8357f3cc20383ed29ced484877d5ac (diff) | |
download | postgresql-1ccd423235a48739d6f7a4d7889705b5f9ecc69b.tar.gz postgresql-1ccd423235a48739d6f7a4d7889705b5f9ecc69b.zip |
Massive commit to run PGINDENT on all *.c and *.h files.
Diffstat (limited to 'src/backend/lib/stringinfo.c')
-rw-r--r-- | src/backend/lib/stringinfo.c | 142 |
1 files changed, 75 insertions, 67 deletions
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c index 18cfc89f982..34108c04c72 100644 --- a/src/backend/lib/stringinfo.c +++ b/src/backend/lib/stringinfo.c @@ -1,15 +1,15 @@ /*------------------------------------------------------------------------- * * stringinfo.c-- - * These are routines that can be used to write informations to a string, - * without having to worry about string lengths, space allocation etc. - * Ideally the interface should look like the file i/o interface, + * These are routines that can be used to write informations to a string, + * without having to worry about string lengths, space allocation etc. + * Ideally the interface should look like the file i/o interface, * * Copyright (c) 1994, Regents of the University of California * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/stringinfo.c,v 1.3 1997/08/12 20:15:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/stringinfo.c,v 1.4 1997/09/07 04:42:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,30 +30,33 @@ StringInfo makeStringInfo() { - StringInfo res; - long size; - - res = (StringInfo) palloc(sizeof(StringInfoData)); - if (res == NULL) { - elog(WARN, "makeStringInfo: Out of memory!"); - } - - size = 100; - res->data = palloc(size); - if (res->data == NULL) { - elog(WARN, - "makeStringInfo: Out of memory! (%ld bytes requested)", size); - } - res->maxlen = size; - res->len = 0; - /* - * NOTE: we must initialize `res->data' to the empty string because - * we use 'strcat' in 'appendStringInfo', which of course it always - * expects a null terminated string. - */ - res->data[0] = '\0'; - - return(res); + StringInfo res; + long size; + + res = (StringInfo) palloc(sizeof(StringInfoData)); + if (res == NULL) + { + elog(WARN, "makeStringInfo: Out of memory!"); + } + + size = 100; + res->data = palloc(size); + if (res->data == NULL) + { + elog(WARN, + "makeStringInfo: Out of memory! (%ld bytes requested)", size); + } + res->maxlen = size; + res->len = 0; + + /* + * NOTE: we must initialize `res->data' to the empty string because we + * use 'strcat' in 'appendStringInfo', which of course it always + * expects a null terminated string. + */ + res->data[0] = '\0'; + + return (res); } /*--------------------------------------------------------------------- @@ -69,48 +72,53 @@ makeStringInfo() void appendStringInfo(StringInfo str, char *buffer) { - int buflen, newlen; - char *s; - - Assert((str!=NULL)); - - /* - * do we have enough space to append the new string? - * (don't forget to count the null string terminating char!) - * If no, then reallocate some more. - */ - buflen = strlen(buffer); - if (buflen + str->len >= str->maxlen-1) { + int buflen, + newlen; + char *s; + + Assert((str != NULL)); + /* - * how much more space to allocate ? - * Let's say double the current space... - * However we must check if this is enough! + * do we have enough space to append the new string? (don't forget to + * count the null string terminating char!) If no, then reallocate + * some more. */ - newlen = 2 * str->len; - while (buflen + str->len >= newlen-1) { - newlen = 2 * newlen; + buflen = strlen(buffer); + if (buflen + str->len >= str->maxlen - 1) + { + + /* + * how much more space to allocate ? Let's say double the current + * space... However we must check if this is enough! + */ + newlen = 2 * str->len; + while (buflen + str->len >= newlen - 1) + { + newlen = 2 * newlen; + } + + /* + * allocate enough space. + */ + s = palloc(newlen); + if (s == NULL) + { + elog(WARN, + "appendStringInfo: Out of memory (%d bytes requested)", + newlen); + } + memmove(s, str->data, str->len + 1); + pfree(str->data); + str->maxlen = newlen; + str->data = s; } + /* - * allocate enough space. + * OK, we have enough space now, append 'buffer' at the end of the + * string & update the string length. NOTE: this is a text string + * (i.e. printable characters) so 'strcat' will do the job (no need to + * use 'bcopy' et all...) */ - s = palloc(newlen); - if (s==NULL) { - elog(WARN, - "appendStringInfo: Out of memory (%d bytes requested)", - newlen); - } - memmove(s, str->data, str->len+1); - pfree(str->data); - str->maxlen = newlen; - str->data = s; - } - - /* - * OK, we have enough space now, append 'buffer' at the - * end of the string & update the string length. - * NOTE: this is a text string (i.e. printable characters) - * so 'strcat' will do the job (no need to use 'bcopy' et all...) - */ - strcat(str->data, buffer); - str->len += buflen; + strcat(str->data, buffer); + str->len += buflen; } |