X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetnline.c;h=9b2ce3ba0ac7005077e840db7ee1c60921ddd378;hb=30eb45afc54d84b7bfabf44703541b25d3b1ea1b;hp=311bb1d7bffaebd775e66b5ffc5d8959c2a81ee1;hpb=ef2f334e88fcd5daffc4c72dfc51794927c75920;p=gnulib.git diff --git a/lib/getnline.c b/lib/getnline.c index 311bb1d7b..9b2ce3ba0 100644 --- a/lib/getnline.c +++ b/lib/getnline.c @@ -1,6 +1,6 @@ /* getnline - Read a line from a stream, with bounded memory allocation. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. 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 @@ -23,15 +23,17 @@ /* Specification. */ #include "getnline.h" +#include "getndelim2.h" + ssize_t -getnline (char **lineptr, size_t *linesize, size_t nmax, FILE *stream) +getndelim (char **lineptr, size_t *linesize, size_t nmax, + int delimiter, FILE *stream) { - return getndelim2 (lineptr, linesize, (size_t)(-1), stream, '\n', 0, 0); + return getndelim2 (lineptr, linesize, 0, nmax, delimiter, EOF, stream); } ssize_t -getndelim (char **lineptr, size_t *linesize, size_t nmax, - int delimiter, FILE *stream) +getnline (char **lineptr, size_t *linesize, size_t nmax, FILE *stream) { - return getndelim2 (lineptr, linesize, (size_t)(-1), stream, delimiter, 0, 0); + return getndelim (lineptr, linesize, nmax, '\n', stream); }