# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 890952741 0
# Node ID f399e51d6d115988f992424c533765a251c4da63
# Parent  e010f11916684ee21ae46fab802dec65c65c9f17
(pop_getline): Renamed from getline.

diff -r e010f1191668 -r f399e51d6d11 lib-src/pop.c
--- a/lib-src/pop.c	Thu Mar 26 06:31:26 1998 +0000
+++ b/lib-src/pop.c	Thu Mar 26 22:52:21 1998 +0000
@@ -139,7 +139,7 @@
 #endif /* ! __P */
 
 static int socket_connection _P((char *, int));
-static int getline _P((popserver, char **));
+static int pop_getline _P((popserver, char **));
 static int sendline _P((popserver, char *));
 static int fullwrite _P((int, char *, int));
 static int getok _P((popserver));
@@ -381,7 +381,7 @@
       return (-1);
     }
      
-  if (sendline (server, "STAT") || (getline (server, &fromserver) < 0))
+  if (sendline (server, "STAT") || (pop_getline (server, &fromserver) < 0))
     return (-1);
 
   if (strncmp (fromserver, "+OK ", 4))
@@ -477,7 +477,7 @@
 	  free ((char *) *sizes);
 	  return (-1);
 	}
-      if (getline (server, &fromserver) < 0)
+      if (pop_getline (server, &fromserver) < 0)
 	{
 	  free ((char *) *IDs);
 	  free ((char *) *sizes);
@@ -737,7 +737,7 @@
       return (-1);
     }
 
-  if (sendline (server, command) || (getline (server, response) < 0))
+  if (sendline (server, command) || (pop_getline (server, response) < 0))
     {
       return (-1);
     }
@@ -784,7 +784,7 @@
       return (-1);
     }
 
-  if ((ret = getline (server, &fromserver)) < 0)
+  if ((ret = pop_getline (server, &fromserver)) < 0)
     {
       return (-1);
     }
@@ -919,7 +919,7 @@
   if (sendline (server, "LAST"))
     return (-1);
 
-  if (getline (server, &fromserver) < 0)
+  if (pop_getline (server, &fromserver) < 0)
     return (-1);
 
   if (! strncmp (fromserver, "-ERR", 4))
@@ -1255,7 +1255,7 @@
 } /* socket_connection */
 
 /*
- * Function: getline
+ * Function: pop_getline
  *
  * Purpose: Get a line of text from the connection and return a
  * 	pointer to it.  The carriage return and linefeed at the end of
@@ -1271,14 +1271,14 @@
  * 	error (in which case the contents of LINE are undefined.  In
  * 	case of error, an error message is copied into pop_error.
  *
- * Notes: The line returned is overwritten with each call to getline.
+ * Notes: The line returned is overwritten with each call to pop_getline.
  *
  * Side effects: Closes the connection on error.
  *
  * THE RETURNED LINE MAY CONTAIN EMBEDDED NULLS!
  */
 static int
-getline (server, line)
+pop_getline (server, line)
      popserver server;
      char **line;
 {
@@ -1341,7 +1341,7 @@
 	  server->buffer = (char *)realloc (server->buffer, server->buffer_size);
 	  if (! server->buffer)
 	    {
-	      strcpy (pop_error, "Out of memory in getline");
+	      strcpy (pop_error, "Out of memory in pop_getline");
 	      pop_trash (server);
 	      return (-1);
 	    }
@@ -1358,7 +1358,7 @@
 	}
       else if (ret == 0)
 	{
-	  strcpy (pop_error, "Unexpected EOF from server in getline");
+	  strcpy (pop_error, "Unexpected EOF from server in pop_getline");
 	  pop_trash (server);
 	  return (-1);
 	}
@@ -1485,7 +1485,7 @@
 {
   char *fromline;
 
-  if (getline (server, &fromline) < 0)
+  if (pop_getline (server, &fromline) < 0)
     {
       return (-1);
     }
@@ -1524,7 +1524,7 @@
 {
   char *fromserver;
 
-  if (getline (server, &fromserver) < 0)
+  if (pop_getline (server, &fromserver) < 0)
     return (-1);
 
   if (strcmp (fromserver, "."))