From c8d6fe013753d40d9cb7fd55b3e4d4df3c481407 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sat, 25 Apr 2009 21:52:59 +0000 Subject: Rename getline() to avoid libc collision git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@887 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/ppm/xvminitoppm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'converter/ppm') diff --git a/converter/ppm/xvminitoppm.c b/converter/ppm/xvminitoppm.c index 16626bc2..d76bea87 100644 --- a/converter/ppm/xvminitoppm.c +++ b/converter/ppm/xvminitoppm.c @@ -53,7 +53,7 @@ parseCommandLine(int const argc, static void -getline(FILE * const ifP, +getLine(FILE * const ifP, char * const buf, size_t const size) { @@ -107,7 +107,7 @@ readXvHeader(FILE * const ifP, int rc; bool endOfComments; - getline(ifP, buf, sizeof(buf)); + getLine(ifP, buf, sizeof(buf)); if (!strneq(buf, "P7 332", 6)) pm_error("Input is not a XV thumbnail picture. It does not " @@ -115,14 +115,14 @@ readXvHeader(FILE * const ifP, endOfComments = FALSE; while (!endOfComments) { - getline(ifP, buf, sizeof(buf)); + getLine(ifP, buf, sizeof(buf)); if (strneq(buf, "#END_OF_COMMENTS", 16)) endOfComments = TRUE; else if (strneq(buf, "#BUILTIN", 8)) pm_error("This program does not know how to " "convert builtin XV thumbnail pictures"); } - getline(ifP, buf, sizeof(buf)); + getLine(ifP, buf, sizeof(buf)); rc = sscanf(buf, "%u %u %u", &cols, &rows, &maxval); if (rc != 3) pm_error("error parsing dimension info '%s'. " -- cgit 1.4.1