OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

libs/libc/stdio/lib_getdelim.c: Initial allocation should be larger; incremental reallocs should be smaller. Update some comments.

This commit is contained in:
Gregory Nutt 2019-11-13 11:45:26 -06:00
parent 675bf4e9b7
commit dbf266b9d4
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/libc/stdio/lib_getdelim.c
View File

@ -61,6 +61,7 @@
# define EOLCH '/n'
#endif
#define BUFSIZE_INIT 64
#define BUFSIZE_INCR 32
/****************************************************************************
@ -94,6 +95,17 @@
* read, including any delimiter, will be stored in the object, and a
* terminating NUL added when the delimiter or end-of-file is encountered.
*
* Returned Value:
* Upon successful completion, the getline() and getdelim() functions will
* return the number of bytes written into the buffer, including the
* delimiter character if one was encountered before EOF, but excluding
* the terminating NUL character. If the end-of-file indicator for the
* stream is set, or if no characters were read and the stream is at
* end-of-file, the end-of-file indicator for the stream will be set and
* the function will return -1. If an error occurs, the error indicator for
* the stream will be set, and the function will return -1 and set errno to
* indicate the error.
*
****************************************************************************/
ssize_t getdelim(FAR char **lineptr, size_t *n, int delimiter,
@ -121,8 +133,8 @@ ssize_t getdelim(FAR char **lineptr, size_t *n, int delimiter,
{
/* Pick an initial buffer size */
bufsize = BUFSIZE_INCR;
*n = BUFSIZE_INCR;
bufsize = BUFSIZE_INIT;
*n = BUFSIZE_INIT;
/* Free any mystery buffer. It will be reallocated below. */
@ -167,6 +179,11 @@ ssize_t getdelim(FAR char **lineptr, size_t *n, int delimiter,
{
FAR char *newbuffer;
/* This function should fail with EOVERFLOW if bufize exeeds
* SSIZE_MAX. However, I think we will have crashed long before
* that occurs.
*/
bufsize += BUFSIZE_INCR;
newbuffer = (FAR char *)lib_realloc(*lineptr, bufsize);
if (newbuffer == NULL)