Mercurial > hg > mlmmj
changeset 187:a287d5580e44
Comment out myfgetline since it's not used at all anymore
author | mmj |
---|---|
date | Mon, 07 Jun 2004 22:35:58 +1000 |
parents | 304a883f5f40 |
children | 2da457be244c |
files | include/mygetline.h src/mygetline.c |
diffstat | 2 files changed, 36 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/include/mygetline.h Mon Jun 07 21:24:32 2004 +1000 +++ b/include/mygetline.h Mon Jun 07 22:35:58 2004 +1000 @@ -1,10 +1,12 @@ #ifndef MYGETLINE_H #define MYGETLINE_H -#include <stdio.h> #define BUFSIZE 256 +#if 0 +#include <stdio.h> char *myfgetline(FILE *infile); +#endif char *mygetline(int fd); #endif /* #ifndef MYGETLINE_H */
--- a/src/mygetline.c Mon Jun 07 21:24:32 2004 +1000 +++ b/src/mygetline.c Mon Jun 07 22:35:58 2004 +1000 @@ -7,46 +7,12 @@ * Public License as described at http://www.gnu.org/licenses/gpl.txt */ -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <errno.h> #include "mygetline.h" -char *myfgetline(FILE *infile) -{ - size_t buf_size = BUFSIZE; /* initial buffer size */ - size_t buf_used; - char *buf = malloc(buf_size); - - buf[0] = '\0'; - - if(infile == NULL) - return NULL; - - for (;;) { - buf_used = strlen(buf); - if (fgets(buf+buf_used, buf_size-buf_used, infile) == NULL) { - if (buf[0]) { - return buf; - } else { - free(buf); - return NULL; - } - } - - if ((strlen(buf) < buf_size-1) || (buf[buf_size-1] == '\n')) { - return buf; - } - - /* grow buffer */ - buf_size *= 2; - buf = realloc(buf, buf_size); - - } -} - char *mygetline(int fd) { size_t i = 0, res, buf_size = BUFSIZE; /* initial buffer size */ @@ -87,6 +53,39 @@ } #if 0 +char *myfgetline(FILE *infile) +{ + size_t buf_size = BUFSIZE; /* initial buffer size */ + size_t buf_used; + char *buf = malloc(buf_size); + + buf[0] = '\0'; + + if(infile == NULL) + return NULL; + + for (;;) { + buf_used = strlen(buf); + if (fgets(buf+buf_used, buf_size-buf_used, infile) == NULL) { + if (buf[0]) { + return buf; + } else { + free(buf); + return NULL; + } + } + + if ((strlen(buf) < buf_size-1) || (buf[buf_size-1] == '\n')) { + return buf; + } + + /* grow buffer */ + buf_size *= 2; + buf = realloc(buf, buf_size); + + } +} + int main(int argc, char **argv) { char *str;