about summary refs log tree commit diff
path: root/converter/ppm
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-04-25 21:52:59 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-04-25 21:52:59 +0000
commitc8d6fe013753d40d9cb7fd55b3e4d4df3c481407 (patch)
treeb961bcc064f8b5fffd410c4b590f39dacab77532 /converter/ppm
parent4bfe47694c23d631b4dec4061515edf7f33b142a (diff)
downloadnetpbm-mirror-c8d6fe013753d40d9cb7fd55b3e4d4df3c481407.tar.gz
netpbm-mirror-c8d6fe013753d40d9cb7fd55b3e4d4df3c481407.tar.xz
netpbm-mirror-c8d6fe013753d40d9cb7fd55b3e4d4df3c481407.zip
Rename getline() to avoid libc collision
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@887 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm')
-rw-r--r--converter/ppm/xvminitoppm.c8
1 files changed, 4 insertions, 4 deletions
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'.  "