From 63691d7a0f51ca09df58b30d4e62a173b70c4c17 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sun, 25 Sep 2005 10:27:31 +0000
Subject: Rename isafile -> is_a_file, isidletimout -> is_idletimeout to keep
 clear of ctype.h namespace.

svn path=/trunk/; revision=4322
---
 daemon.c    | 2 +-
 driver.c    | 6 +++---
 fetchmail.h | 4 ++--
 transact.c  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/daemon.c b/daemon.c
index 83de920d..dabfb9a6 100644
--- a/daemon.c
+++ b/daemon.c
@@ -259,7 +259,7 @@ nottyDetach:
   return(0);
 }
 
-flag isafile(int fd)
+flag is_a_file(int fd)
 /* is the given fd attached to a file? (used to control logging) */
 {
     struct stat stbuf;
diff --git a/driver.c b/driver.c
index b78baa25..50331450 100644
--- a/driver.c
+++ b/driver.c
@@ -75,7 +75,7 @@ static volatile int idletimeout = 0;	/* timeout occured in idle stage? */
 
 static jmp_buf	restart;
 
-int isidletimeout(void)
+int is_idletimeout(void)
 /* last timeout occured in idle stage? */
 {
     return idletimeout;
@@ -640,7 +640,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
 	    /* tell server we got it OK and resynchronize */
 	    if (separatefetchbody && ctl->server.base_protocol->trail)
 	    {
-		if (outlevel >= O_VERBOSE && !isafile(1))
+		if (outlevel >= O_VERBOSE && !is_a_file(1))
 		{
 		    fputc('\n', stdout);
 		    fflush(stdout);
@@ -698,7 +698,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
 		/* tell server we got it OK and resynchronize */
 		if (ctl->server.base_protocol->trail)
 		{
-		    if (outlevel >= O_VERBOSE && !isafile(1))
+		    if (outlevel >= O_VERBOSE && !is_a_file(1))
 		    {
 			fputc('\n', stdout);
 			fflush(stdout);
diff --git a/fetchmail.h b/fetchmail.h
index bd992827..b3868592 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -465,7 +465,7 @@ void report_at_line ();
 
 /* driver.c -- main driver loop */
 void set_timeout(int);
-int isidletimeout(void);
+int is_idletimeout(void);
 void resetidletimeout(void);
 int do_protocol(struct query *, const struct method *);
 
@@ -648,7 +648,7 @@ void dump_config(struct runctl *runp, struct query *querylist);
 int is_host_alias(const char *, struct query *);
 char *host_fqdn(void);
 char *rfc822timestamp(void);
-flag isafile(int);
+flag is_a_file(int);
 char *rfc2047e(const char*, const char *);
 
 void yyerror(const char *);
diff --git a/transact.c b/transact.c
index 136e7b69..ec625e6a 100644
--- a/transact.c
+++ b/transact.c
@@ -10,7 +10,7 @@
 #include  "config.h"
 #include  <stdio.h>
 #include  <string.h>
-#include  <ctype.h> /* isspace() */
+#include  <ctype.h>
 #ifdef HAVE_MEMORY_H
 #include  <memory.h>
 #endif /* HAVE_MEMORY_H */
@@ -1207,7 +1207,7 @@ int readheaders(int sock,
 	free_str_list(&msgblk.recipients);
 	return(PS_IOERR);
     }
-    else if ((run.poll_interval == 0 || nodetach) && outlevel >= O_VERBOSE && !isafile(1) && !run.use_syslog)
+    else if ((run.poll_interval == 0 || nodetach) && outlevel >= O_VERBOSE && !is_a_file(1) && !run.use_syslog)
 	fputc('#', stdout);
 
     /* write error notifications */
@@ -1377,7 +1377,7 @@ int readbody(int sock, struct query *ctl, flag forward, int len)
 		release_sink(ctl);
 		return(PS_IOERR);
 	    }
-	    else if (outlevel >= O_VERBOSE && !isafile(1) && !run.use_syslog)
+	    else if (outlevel >= O_VERBOSE && !is_a_file(1) && !run.use_syslog)
 	    {
 		fputc('*', stdout);
 		fflush(stdout);
@@ -1464,7 +1464,7 @@ int size;	/* length of buffer */
     {
 	set_timeout(0);
 	phase = oldphase;
-	if(isidletimeout())
+	if(is_idletimeout())
 	{
 	  resetidletimeout();
 	  return(PS_IDLETIMEOUT);
-- 
cgit v1.2.3