[Nmh-commits] nmh/uip popsbr.c

[Peter Maydell]

CVSROOT:        /cvsroot/nmh
Module name:    nmh
Changes by:     Peter Maydell <pm215>   07/04/29 22:01:04

Modified files:
        uip            : popsbr.c 

Log message:
        Change name of internal function to avoid potential conflicts with GNU
        libc's getline() function.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/popsbr.c?cvsroot=nmh&r1=1.17&r2=1.18

Patches:
Index: popsbr.c
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/popsbr.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- popsbr.c    13 Apr 2007 11:53:08 -0000      1.17
+++ popsbr.c    29 Apr 2007 22:01:04 -0000      1.18
@@ -1,7 +1,7 @@
 /*
  * popsbr.c -- POP client subroutines
  *
- * $Id: popsbr.c,v 1.17 2007/04/13 11:53:08 jjr Exp $
+ * $Id: popsbr.c,v 1.18 2007/04/29 22:01:04 pm215 Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -106,7 +106,7 @@
 
 static int traverse (int (*)(), const char *, ...);
 static int vcommand(const char *, va_list);
-static int getline (char *, int, FILE *);
+static int sasl_getline (char *, int, FILE *);
 static int putline (char *, FILE *);
 
 
@@ -597,7 +597,7 @@
 
     SIGNAL (SIGPIPE, SIG_IGN);
 
-    switch (getline (response, sizeof response, input)) {
+    switch (sasl_getline (response, sizeof response, input)) {
        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
@@ -1041,7 +1041,7 @@
        fprintf(stderr, "(decrypted) ");
 #endif /* CYRUS_SASL */
 
-    switch (getline (response, sizeof response, input)) {
+    switch (sasl_getline (response, sizeof response, input)) {
        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
@@ -1072,7 +1072,7 @@
 {
     char buffer[BUFSIZ + TRMLEN];
 
-    if (getline (buffer, sizeof buffer, input) != OK)
+    if (sasl_getline (buffer, sizeof buffer, input) != OK)
        return NOTOK;
 #ifdef DEBUG
     if (poprint) {
@@ -1101,7 +1101,7 @@
  */
 
 static int
-getline (char *s, int n, FILE *iop)
+sasl_getline (char *s, int n, FILE *iop)
 {
     int c;
     char *p;