X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcstr.c;h=ea7c376c22f391648648025eb1783a165402dd95;hb=2e44cbe1b9bf466718167e9e05077743df36ab21;hp=c683c800a8800a00b87b14dc0544a6c6810b5536;hpb=3ed70071cdc8a03229c009f5565c23948264a5e0;p=fontconfig.git diff --git a/src/fcstr.c b/src/fcstr.c index c683c80..ea7c376 100644 --- a/src/fcstr.c +++ b/src/fcstr.c @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -716,8 +716,8 @@ FcStrBufInit (FcStrBuf *buf, FcChar8 *init, int size) buf->size = size; } else { - buf->buf = buf->static_buf; - buf->size = sizeof (buf->static_buf); + buf->buf = buf->buf_static; + buf->size = sizeof (buf->buf_static); } buf->allocated = FcFalse; buf->failed = FcFalse; @@ -757,8 +757,6 @@ FcStrBufDone (FcStrBuf *buf) FcChar8 * FcStrBufDoneStatic (FcStrBuf *buf) { - FcChar8 *ret; - FcStrBufChar (buf, '\0'); if (buf->failed)