X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.c;h=b5109e68e6888adf5c4725cae6356e60e80e8dec;hb=9b71dd21dd3425978a8b121335bfca267a45a617;hp=90e4cca869ab86613c6be75e0c1fa90ab11f9164;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/linebuffer.c b/lib/linebuffer.c index 90e4cca86..b5109e68e 100644 --- a/lib/linebuffer.c +++ b/lib/linebuffer.c @@ -1,6 +1,6 @@ /* linebuffer.c -- read arbitrarily long lines - Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004, 2006, 2007 + Copyright (C) 1986, 1991, 1998-1999, 2001, 2003-2004, 2006-2007, 2009-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -57,7 +57,7 @@ readlinebuffer (struct linebuffer *linebuffer, FILE *stream) Otherwise, return LINEBUFFER. */ struct linebuffer * readlinebuffer_delim (struct linebuffer *linebuffer, FILE *stream, - char delimiter) + char delimiter) { int c; char *buffer = linebuffer->buffer; @@ -71,21 +71,21 @@ readlinebuffer_delim (struct linebuffer *linebuffer, FILE *stream, { c = getc (stream); if (c == EOF) - { - if (p == buffer || ferror (stream)) - return NULL; - if (p[-1] == delimiter) - break; - c = delimiter; - } + { + if (p == buffer || ferror (stream)) + return NULL; + if (p[-1] == delimiter) + break; + c = delimiter; + } if (p == end) - { - size_t oldsize = linebuffer->size; - buffer = x2realloc (buffer, &linebuffer->size); - p = buffer + oldsize; - linebuffer->buffer = buffer; - end = buffer + linebuffer->size; - } + { + size_t oldsize = linebuffer->size; + buffer = x2realloc (buffer, &linebuffer->size); + p = buffer + oldsize; + linebuffer->buffer = buffer; + end = buffer + linebuffer->size; + } *p++ = c; } while (c != delimiter);