Date: Wed, 11 May 2016 21:51:01 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415037 - head/news/cg/files Message-ID: <201605112151.u4BLp1UI029108@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed May 11 21:51:01 2016 New Revision: 415037 URL: https://svnweb.freebsd.org/changeset/ports/415037 Log: Prevent collision with get_line Added: head/news/cg/files/ head/news/cg/files/patch-util.c (contents, props changed) head/news/cg/files/patch-util.h (contents, props changed) Added: head/news/cg/files/patch-util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/news/cg/files/patch-util.c Wed May 11 21:51:01 2016 (r415037) @@ -0,0 +1,20 @@ +--- util.c.orig 2002-05-13 16:27:29 UTC ++++ util.c +@@ -180,7 +180,7 @@ rename_uniq(const char *from, char **to) + + + char * +-getline(FILE *f) ++get_line(FILE *f) + { + static char *b; + static int bsize; +@@ -234,7 +234,7 @@ getline(FILE *f) + void + skip_rest(FILE *f) + { +- while (getline(f) != NULL) ++ while (get_line(f) != NULL) + ; + } + Added: head/news/cg/files/patch-util.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/news/cg/files/patch-util.h Wed May 11 21:51:01 2016 (r415037) @@ -0,0 +1,11 @@ +--- util.h.orig 2002-04-24 15:45:24 UTC ++++ util.h +@@ -57,7 +57,7 @@ void copy_stream(stream *in, out_state * + void debug(out_state *out, char *fmt, ...); + char *expand(char *path); + FILE *fopen_uniq(char **s); +-char *getline(FILE *f); ++char *get_line(FILE *f); + void output_header(out_state *out, symbol name, struct header *h); + void prdebug(int level, char *fmt, ...); + void prdebug_init(int do_file, int do_stdout);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605112151.u4BLp1UI029108>