INN commit: trunk (5 files)

INN Commit rra at isc.org
Sat Jul 1 19:59:25 UTC 2017


    Date: Saturday, July 1, 2017 @ 12:59:25
  Author: iulius
Revision: 10155

Homogeneize argument names between functions and prototypes

Modified:
  trunk/innd/cc.c
  trunk/innd/innd.h
  trunk/innd/keywords.c
  trunk/innfeed/article.c
  trunk/innfeed/buffer.c

-------------------+
 innd/cc.c         |    4 ++--
 innd/innd.h       |   32 ++++++++++++++++----------------
 innd/keywords.c   |    2 +-
 innfeed/article.c |    4 ++--
 innfeed/buffer.c  |    4 ++--
 5 files changed, 23 insertions(+), 23 deletions(-)

Modified: innd/cc.c
===================================================================
--- innd/cc.c	2017-07-01 19:58:26 UTC (rev 10154)
+++ innd/cc.c	2017-07-01 19:59:25 UTC (rev 10155)
@@ -126,7 +126,7 @@
     {	SC_XEXEC,	1, CCxexec	}
 };
 
-static void CCresetup(int unused);
+static void CCresetup(int s);
 
 
 void
@@ -459,7 +459,7 @@
 **  Syntax-check the newsfeeds file.
 */
 const char *
-CCcheckfile(char *unused[] UNUSED)
+CCcheckfile(char *av[] UNUSED)
 {
   char		**strings;
   char		*p;

Modified: innd/innd.h
===================================================================
--- innd/innd.h	2017-07-01 19:58:26 UTC (rev 10154)
+++ innd/innd.h	2017-07-01 19:59:25 UTC (rev 10155)
@@ -699,7 +699,7 @@
 extern char         *	MaxLength(const char *p, const char *q);
 extern pid_t		Spawn(int niceval, int fd0, int fd1, int fd2,
 			      char * const av[]);
-extern void		CleanupAndExit(int x, const char *why)
+extern void		CleanupAndExit(int status, const char *why)
     __attribute__ ((__noreturn__));
 extern void		JustCleanup(void);
 extern void		ThrottleIOError(const char *when);
@@ -711,7 +711,7 @@
 extern const char   *	ARTreadarticle(char *files);
 extern char	    *   ARTreadheader(char *files);
 extern bool		ARTpost(CHANNEL *cp);
-extern void		ARTcancel(const ARTDATA *Data,
+extern void		ARTcancel(const ARTDATA *data,
 				  const char *MessageID, bool Trusted);
 extern void		ARTclose(void);
 extern void		ARTsetup(void);
@@ -721,11 +721,11 @@
 extern void		ARTreject(Reject_type, CHANNEL *);
 
 extern bool		CHANsleeping(CHANNEL *cp);
-extern CHANNEL      *	CHANcreate(int fd, enum channel_type Type,
-				   enum channel_state State,
-				   innd_callback_func Reader,
-				   innd_callback_func WriteDone);
-extern CHANNEL      *	CHANiter(int *cp, enum channel_type Type);
+extern CHANNEL      *	CHANcreate(int fd, enum channel_type type,
+				   enum channel_state state,
+				   innd_callback_func reader,
+				   innd_callback_func write_done);
+extern CHANNEL      *	CHANiter(int *ip, enum channel_type type);
 extern CHANNEL      *	CHANfromdescriptor(int fd);
 extern char	    *   CHANname(CHANNEL *cp);
 extern int		CHANreadtext(CHANNEL *cp);
@@ -732,18 +732,18 @@
 extern void		CHANclose(CHANNEL *cp, const char *name);
 extern void		CHANreadloop(void)
     __attribute__ ((__noreturn__));
-extern void		CHANsetup(int i);
+extern void		CHANsetup(int count);
 extern void		CHANshutdown(void);
-extern void		CHANtracing(CHANNEL *cp, bool Flag);
+extern void		CHANtracing(CHANNEL *cp, bool flag);
 extern void		CHANcount_active(CHANNEL *cp);
 
 extern void		RCHANadd(CHANNEL *cp);
 extern void		RCHANremove(CHANNEL *cp);
 
-extern void		SCHANadd(CHANNEL *cp, time_t Waketime, void *Event,
-				 innd_callback_func Waker, void *Argument);
+extern void		SCHANadd(CHANNEL *cp, time_t wake, void *event,
+				 innd_callback_func waker, void *arg);
 extern void		SCHANremove(CHANNEL *cp);
-extern void		SCHANwakeup(void *Event);
+extern void		SCHANwakeup(void *event);
 
 extern bool		WCHANflush(CHANNEL *cp);
 extern void		WCHANadd(CHANNEL *cp);
@@ -769,12 +769,12 @@
 extern void		CCclose(void);
 extern void		CCsetup(void);
 
-extern void             KEYgenerate(HDRCONTENT *, const char *body, size_t bodylen);
+extern void             KEYgenerate(HDRCONTENT *, const char *, size_t);
 
 extern void		LCclose(void);
 extern void		LCsetup(void);
 
-extern int		NGsplit(char *p, int size, LISTBUFFER *List);
+extern int		NGsplit(char *p, int size, LISTBUFFER *list);
 extern NEWSGROUP    *	NGfind(const char *Name);
 extern void		NGclose(void);
 extern CHANNEL	    *	NCcreate(int fd, bool MustAuthorize, bool IsLocal);
@@ -842,8 +842,8 @@
 extern void		WIPprecomfree(CHANNEL *cp);
 extern void		WIPfree(WIP *wp);
 extern bool		WIPinprogress(const char *msgid, CHANNEL *cp,
-				      bool Add);
-extern WIP	    *	WIPbyid(const char *mesageid);
+				      bool Precommit);
+extern WIP	    *	WIPbyid(const char *messageid);
 extern WIP	    *	WIPbyhash(const HASH hash);
 
 /*

Modified: innd/keywords.c
===================================================================
--- innd/keywords.c	2017-07-01 19:58:26 UTC (rev 10154)
+++ innd/keywords.c	2017-07-01 19:59:25 UTC (rev 10155)
@@ -26,7 +26,7 @@
 */
 #if !DO_KEYWORDS
 void
-KEYgenerate(HDRCONTENT *header UNUSED, const char *body UNUSED,
+KEYgenerate(HDRCONTENT *hc UNUSED, const char *body UNUSED,
             size_t bodylen UNUSED)
 {
 }

Modified: innfeed/article.c
===================================================================
--- innfeed/article.c	2017-07-01 19:58:26 UTC (rev 10154)
+++ innfeed/article.c	2017-07-01 19:59:25 UTC (rev 10155)
@@ -87,7 +87,7 @@
                                                      up. */
 
   /* Log statistics on article memory usage. */
-static void logArticleStats (TimeoutId id, void *data) ;
+static void logArticleStats (TimeoutId, void *) ;
 
 static bool fillContents (Article article) ;  /* Read the article's bits
                                                  off the disk. */
@@ -102,7 +102,7 @@
                                                 its contents buffer if
                                                 possible. */
 
-static void artUnmap (Article art) ; /* munmap an mmap()ed
+static void artUnmap (Article article) ; /* munmap an mmap()ed
                                                      article */
 
 

Modified: innfeed/buffer.c
===================================================================
--- innfeed/buffer.c	2017-07-01 19:58:26 UTC (rev 10154)
+++ innfeed/buffer.c	2017-07-01 19:59:25 UTC (rev 10155)
@@ -376,9 +376,9 @@
 }
 
 
-unsigned int bufferRefCount (Buffer buf)
+unsigned int bufferRefCount (Buffer buff)
 {
-  return buf->refCount ;
+  return buff->refCount ;
 }
 
 



More information about the inn-committers mailing list