X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.h;h=12030b5025f5fcc83d6a39a4181c7401c4425485;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=dd62709eabefe1dab43ce7257a5e812deeee1e4f;hpb=526b71aa90c565b1986f188b920e8c7878c34320;p=gnulib.git diff --git a/lib/linebuffer.h b/lib/linebuffer.h index dd62709ea..12030b502 100644 --- a/lib/linebuffer.h +++ b/lib/linebuffer.h @@ -1,12 +1,12 @@ /* linebuffer.h -- declarations for reading arbitrarily long lines - Copyright (C) 1986, 1991, 1998, 1999, 2002, 2003, 2007 Free Software - Foundation, Inc. + Copyright (C) 1986, 1991, 1998-1999, 2002-2003, 2007, 2009-2013 Free + Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,20 +14,19 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #if !defined LINEBUFFER_H # define LINEBUFFER_H # include -/* A `struct linebuffer' holds a line of text. */ +/* A 'struct linebuffer' holds a line of text. */ struct linebuffer { - size_t size; /* Allocated. */ - size_t length; /* Used. */ + size_t size; /* Allocated. */ + size_t length; /* Used. */ char *buffer; }; @@ -37,15 +36,15 @@ void initbuffer (struct linebuffer *linebuffer); /* Read an arbitrarily long line of text from STREAM into LINEBUFFER. Consider lines to be terminated by DELIMITER. Keep the delimiter; append DELIMITER if we reach EOF and it wasn't - the last character in the file. Do not null terminate. - Return LINEBUFFER, except at end of file return 0. */ + the last character in the file. Do not NUL-terminate. + Return LINEBUFFER, except at end of file return NULL. */ struct linebuffer *readlinebuffer_delim (struct linebuffer *linebuffer, - FILE *stream, char delimiter); + FILE *stream, char delimiter); /* Read an arbitrarily long line of text from STREAM into LINEBUFFER. Keep the newline; append a newline if it's the last line of a file - that ends in a non-newline character. Do not null terminate. - Return LINEBUFFER, except at end of file return 0. */ + that ends in a non-newline character. Do not NUL-terminate. + Return LINEBUFFER, except at end of file return NULL. */ struct linebuffer *readlinebuffer (struct linebuffer *linebuffer, FILE *stream); /* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */