patch 2
Bear Giles
bear at coyotesong.com
Sat Jun 9 19:05:57 UTC 2001
diff -Naur --recursive inn2-2.3.1.orig/backends/archive.c inn2-2.3.1/backends/archive.c
--- inn2-2.3.1.orig/backends/archive.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/backends/archive.c Fri Jun 8 20:08:24 2001
@@ -20,16 +20,16 @@
#include "qio.h"
-STATIC char *Archive = NULL;
-STATIC char *ERRLOG = NULL;
+static char *Archive = NULL;
+static char *ERRLOG = NULL;
/*
** Return a YYYYMM string that represents the current year/month
*/
-STATIC char *
+static char *
DateString()
{
- STATIC char ds[10];
+ static char ds[10];
time_t now;
struct tm *x;
@@ -44,7 +44,7 @@
/*
** Try to make one directory. Return FALSE on error.
*/
-STATIC BOOL
+static BOOL
MakeDir(Name)
char *Name;
{
@@ -62,7 +62,7 @@
** Given an entry, comp/foo/bar/1123, create the directory and all
** parent directories needed. Return FALSE on error.
*/
-STATIC BOOL
+static BOOL
MakeArchiveDirectory(Name)
register char *Name;
{
@@ -103,7 +103,7 @@
/*
** Copy a file. Return FALSE if error.
*/
-STATIC BOOL
+static BOOL
Copy(src, dest)
char *src;
char *dest;
@@ -175,7 +175,7 @@
/*
** Copy an article from memory into a file.
*/
-STATIC BOOL
+static BOOL
CopyArt(ARTHANDLE *art, char *dest, BOOL Concat)
{
register FILE *out;
@@ -263,7 +263,7 @@
/*
** Write an index entry. Ignore I/O errors; our caller checks for them.
*/
-STATIC void
+static void
WriteArtIndex(art, FullName, ShortName)
ARTHANDLE *art;
char *FullName;
@@ -302,7 +302,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage error.\n");
diff -Naur --recursive inn2-2.3.1.orig/backends/batcher.c inn2-2.3.1/backends/batcher.c
--- inn2-2.3.1.orig/backends/batcher.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/backends/batcher.c Fri Jun 8 20:08:24 2001
@@ -23,31 +23,31 @@
/*
** Global variables.
*/
-STATIC BOOL BATCHopen;
-STATIC BOOL STATprint;
-STATIC double STATbegin;
-STATIC double STATend;
-STATIC char *Host;
-STATIC char *InitialString;
-STATIC char *Input;
-STATIC char *Processor;
-STATIC int ArtsInBatch;
-STATIC int ArtsWritten;
-STATIC int BATCHcount;
-STATIC int MaxBatches;
-STATIC int BATCHstatus;
-STATIC long BytesInBatch = 60 * 1024;
-STATIC long BytesWritten;
-STATIC long MaxArts;
-STATIC long MaxBytes;
-STATIC sig_atomic_t GotInterrupt;
-STATIC STRING Separator = "#! rnews %ld";
-STATIC char *ERRLOG;
+static BOOL BATCHopen;
+static BOOL STATprint;
+static double STATbegin;
+static double STATend;
+static char *Host;
+static char *InitialString;
+static char *Input;
+static char *Processor;
+static int ArtsInBatch;
+static int ArtsWritten;
+static int BATCHcount;
+static int MaxBatches;
+static int BATCHstatus;
+static long BytesInBatch = 60 * 1024;
+static long BytesWritten;
+static long MaxArts;
+static long MaxBytes;
+static sig_atomic_t GotInterrupt;
+static STRING Separator = "#! rnews %ld";
+static char *ERRLOG;
/*
** Start a batch process.
*/
-STATIC FILE *
+static FILE *
BATCHstart()
{
FILE *F;
@@ -70,7 +70,7 @@
/*
** Close a batch, return exit status.
*/
-STATIC int
+static int
BATCHclose(F)
FILE *F;
{
@@ -84,7 +84,7 @@
/*
** Update the batch file and exit.
*/
-STATIC NORETURN
+static NORETURN
RequeueAndExit(Cookie, line, BytesInArt)
OFFSET_T Cookie;
char *line;
@@ -184,7 +184,7 @@
/*
** Mark that we got interrupted.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
CATCHinterrupt(s)
int s;
{
@@ -198,7 +198,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "batcher usage_error.\n");
diff -Naur --recursive inn2-2.3.1.orig/backends/buffchan.c inn2-2.3.1/backends/buffchan.c
--- inn2-2.3.1.orig/backends/buffchan.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/backends/buffchan.c Fri Jun 8 20:08:24 2001
@@ -57,16 +57,16 @@
/* Global variables. */
-STATIC char *Format;
-STATIC STRING Map;
-STATIC int BufferMode;
-STATIC int CloseEvery;
-STATIC int FlushEvery;
-STATIC int CloseSeconds;
-STATIC int FlushSeconds;
-STATIC sig_atomic_t GotInterrupt;
-STATIC SITEHASH SITEtable[SITE_SIZE];
-STATIC TIMEINFO Now;
+static char *Format;
+static STRING Map;
+static int BufferMode;
+static int CloseEvery;
+static int FlushEvery;
+static int CloseSeconds;
+static int FlushSeconds;
+static sig_atomic_t GotInterrupt;
+static SITEHASH SITEtable[SITE_SIZE];
+static TIMEINFO Now;
#if !defined(HAVE_FCHMOD)
@@ -85,7 +85,7 @@
/*
** Set up the site information. Basically creating empty buckets.
*/
-STATIC void
+static void
SITEsetup()
{
register SITEHASH *shp;
@@ -101,7 +101,7 @@
/*
** Close a site
*/
-STATIC void
+static void
SITEclose(sp)
register SITE *sp;
{
@@ -120,7 +120,7 @@
/*
** Close all open sites.
*/
-STATIC void
+static void
SITEcloseall()
{
register SITEHASH *shp;
@@ -136,7 +136,7 @@
/*
** Open the file for a site.
*/
-STATIC void SITEopen(SITE *sp)
+static void SITEopen(SITE *sp)
{
int e;
@@ -171,7 +171,7 @@
/*
** Find a site, possibly create if not found.
*/
-STATIC SITE *
+static SITE *
SITEfind(Name, CanCreate)
char *Name;
BOOL CanCreate;
@@ -218,7 +218,7 @@
/*
** Flush a site -- close and re-open the file.
*/
-STATIC void
+static void
SITEflush(sp)
register SITE *sp;
{
@@ -240,7 +240,7 @@
/*
** Flush all open sites.
*/
-STATIC void
+static void
SITEflushall()
{
register SITEHASH *shp;
@@ -256,7 +256,7 @@
/*
** Write data to a site.
*/
-STATIC void
+static void
SITEwrite(name, text, len)
register char *name;
register char *text;
@@ -301,7 +301,7 @@
/*
** Handle a command message.
*/
-STATIC void
+static void
Process(p)
register char *p;
{
@@ -351,7 +351,7 @@
/*
** Print usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage error.\n");
@@ -362,7 +362,7 @@
/*
** Mark that we got a signal; let two signals kill us.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
CATCHinterrupt(s)
int s;
{
diff -Naur --recursive inn2-2.3.1.orig/backends/cvtbatch.c inn2-2.3.1/backends/cvtbatch.c
--- inn2-2.3.1.orig/backends/cvtbatch.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/backends/cvtbatch.c Fri Jun 8 20:08:24 2001
@@ -17,7 +17,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "convertbatch usage_error.\n");
diff -Naur --recursive inn2-2.3.1.orig/backends/innxbatch.c inn2-2.3.1/backends/innxbatch.c
--- inn2-2.3.1.orig/backends/innxbatch.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/backends/innxbatch.c Fri Jun 8 20:08:24 2001
@@ -57,38 +57,38 @@
/*
** Syslog formats - collected together so they remain consistent
*/
-STATIC char STAT1[] =
+static char STAT1[] =
"%s stats offered %lu accepted %lu refused %lu rejected %lu";
-STATIC char STAT2[] = "%s times user %.3f system %.3f elapsed %.3f";
-STATIC char CANT_CONNECT[] = "%s connect failed %s";
-STATIC char CANT_AUTHENTICATE[] = "%s authenticate failed %s";
-STATIC char XBATCH_FAIL[] = "%s xbatch failed %s";
-STATIC char UNKNOWN_REPLY[] = "Unknown reply after sending batch -- %s";
-STATIC char CANNOT_UNLINK[] = "cannot unlink %s: %m";
+static char STAT2[] = "%s times user %.3f system %.3f elapsed %.3f";
+static char CANT_CONNECT[] = "%s connect failed %s";
+static char CANT_AUTHENTICATE[] = "%s authenticate failed %s";
+static char XBATCH_FAIL[] = "%s xbatch failed %s";
+static char UNKNOWN_REPLY[] = "Unknown reply after sending batch -- %s";
+static char CANNOT_UNLINK[] = "cannot unlink %s: %m";
/*
** Global variables.
*/
-STATIC BOOL Debug = 0;
-STATIC BOOL STATprint;
-STATIC char *REMhost;
-STATIC double STATbegin;
-STATIC double STATend;
-STATIC char *XBATCHname;
-STATIC int FromServer;
-STATIC int ToServer;
-STATIC sig_atomic_t GotAlarm;
-STATIC sig_atomic_t GotInterrupt;
-STATIC sig_atomic_t JMPyes;
-STATIC jmp_buf JMPwhere;
-STATIC unsigned long STATaccepted;
-STATIC unsigned long STAToffered;
-STATIC unsigned long STATrefused;
-STATIC unsigned long STATrejected;
+static BOOL Debug = 0;
+static BOOL STATprint;
+static char *REMhost;
+static double STATbegin;
+static double STATend;
+static char *XBATCHname;
+static int FromServer;
+static int ToServer;
+static sig_atomic_t GotAlarm;
+static sig_atomic_t GotInterrupt;
+static sig_atomic_t JMPyes;
+static jmp_buf JMPwhere;
+static unsigned long STATaccepted;
+static unsigned long STAToffered;
+static unsigned long STATrefused;
+static unsigned long STATrejected;
/*
** Send a line to the server. \r\n will be appended
*/
-STATIC BOOL
+static BOOL
REMwrite(fd, p)
register int fd;
register char *p;
@@ -120,7 +120,7 @@
/*
** Print transfer statistics, clean up, and exit.
*/
-STATIC NORETURN
+static NORETURN
ExitWithStats(x)
int x;
{
@@ -158,7 +158,7 @@
/*
** Clean up the NNTP escapes from a line.
*/
-STATIC char *
+static char *
REMclean(buff)
char *buff;
{
@@ -179,7 +179,7 @@
** we ignore \r\n-->\n mapping and the dot escape.
** Return TRUE if okay, *or we got interrupted.*
*/
-STATIC BOOL
+static BOOL
REMread(start, size)
char *start;
int size;
@@ -238,7 +238,7 @@
** Send a whole xbatch to the server. Uses the global variables
** REMbuffer & friends
*/
-STATIC BOOL
+static BOOL
REMsendxbatch(fd, buf, size)
int fd;
char *buf;
@@ -305,7 +305,7 @@
/*
** Mark that we got interrupted.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
CATCHinterrupt(s)
int s;
{
@@ -319,7 +319,7 @@
** Mark that the alarm went off.
*/
/* ARGSUSED0 */
-STATIC SIGHANDLER
+static SIGHANDLER
CATCHalarm(s)
int s;
{
@@ -332,7 +332,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr,
diff -Naur --recursive inn2-2.3.1.orig/backends/innxmit.c inn2-2.3.1/backends/innxmit.c
--- inn2-2.3.1.orig/backends/innxmit.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/backends/innxmit.c Fri Jun 8 20:08:24 2001
@@ -80,58 +80,58 @@
/*
** Syslog formats - collected together so they remain consistent
*/
-STATIC char STAT1[] =
+static char STAT1[] =
"%s stats offered %lu accepted %lu refused %lu rejected %lu missing %lu accsize %.0f rejsize %.0f";
-STATIC char STAT2[] = "%s times user %.3f system %.3f elapsed %.3f";
-STATIC char GOT_RESENDIT[] = "%s requeued %s %s";
-STATIC char GOT_BADCOMMAND[] = "%s rejected %s %s";
-STATIC char REJECTED[] = "%s rejected %s (%s) %s";
-STATIC char CANT_CONNECT[] = "%s connect failed %s";
-STATIC char CANT_AUTHENTICATE[] = "%s authenticate failed %s";
-STATIC char IHAVE_FAIL[] = "%s ihave failed %s";
-
-STATIC char CANT_FINDIT[] = "%s can't find %s";
-STATIC char CANT_PARSEIT[] = "%s can't parse ID %s";
-STATIC char UNEXPECTED[] = "%s unexpected response code %s";
+static char STAT2[] = "%s times user %.3f system %.3f elapsed %.3f";
+static char GOT_RESENDIT[] = "%s requeued %s %s";
+static char GOT_BADCOMMAND[] = "%s rejected %s %s";
+static char REJECTED[] = "%s rejected %s (%s) %s";
+static char CANT_CONNECT[] = "%s connect failed %s";
+static char CANT_AUTHENTICATE[] = "%s authenticate failed %s";
+static char IHAVE_FAIL[] = "%s ihave failed %s";
+
+static char CANT_FINDIT[] = "%s can't find %s";
+static char CANT_PARSEIT[] = "%s can't parse ID %s";
+static char UNEXPECTED[] = "%s unexpected response code %s";
/*
** Global variables.
*/
-STATIC BOOL AlwaysRewrite;
-STATIC BOOL Debug;
-STATIC BOOL DoRequeue = TRUE;
-STATIC BOOL Purging;
-STATIC BOOL STATprint;
-STATIC char *BATCHname;
-STATIC char *BATCHtemp;
-STATIC char *REMhost;
-STATIC double STATbegin;
-STATIC double STATend;
-STATIC FILE *BATCHfp;
-STATIC int FromServer;
-STATIC int ToServer;
-STATIC QIOSTATE *BATCHqp;
-STATIC sig_atomic_t GotAlarm;
-STATIC sig_atomic_t GotInterrupt;
-STATIC sig_atomic_t JMPyes;
-STATIC jmp_buf JMPwhere;
-STATIC char *REMbuffer;
-STATIC char *REMbuffptr;
-STATIC char *REMbuffend;
-STATIC unsigned long STATaccepted;
-STATIC unsigned long STAToffered;
-STATIC unsigned long STATrefused;
-STATIC unsigned long STATrejected;
-STATIC unsigned long STATmissing;
-STATIC double STATacceptedsize;
-STATIC double STATrejectedsize;
+static BOOL AlwaysRewrite;
+static BOOL Debug;
+static BOOL DoRequeue = TRUE;
+static BOOL Purging;
+static BOOL STATprint;
+static char *BATCHname;
+static char *BATCHtemp;
+static char *REMhost;
+static double STATbegin;
+static double STATend;
+static FILE *BATCHfp;
+static int FromServer;
+static int ToServer;
+static QIOSTATE *BATCHqp;
+static sig_atomic_t GotAlarm;
+static sig_atomic_t GotInterrupt;
+static sig_atomic_t JMPyes;
+static jmp_buf JMPwhere;
+static char *REMbuffer;
+static char *REMbuffptr;
+static char *REMbuffend;
+static unsigned long STATaccepted;
+static unsigned long STAToffered;
+static unsigned long STATrefused;
+static unsigned long STATrejected;
+static unsigned long STATmissing;
+static double STATacceptedsize;
+static double STATrejectedsize;
/*
** Find the history file entry for the Message-ID and return a file
** positioned at the third field.
*/
-STATIC FILE *HistorySeek(char *MessageID)
+static FILE *HistorySeek(char *MessageID)
{
static char *History = NULL;
static FILE *F;
@@ -169,7 +169,7 @@
/*
** Return TRUE if the history file has the article expired.
*/
-STATIC BOOL
+static BOOL
Expired(char *MessageID) {
int c;
int i;
@@ -198,7 +198,7 @@
/*
** Flush and reset the site's output buffer. Return FALSE on error.
*/
-STATIC BOOL
+static BOOL
REMflush() {
int i;
@@ -213,7 +213,7 @@
** The hash is to speed up the search.
** the protocol.
*/
-STATIC int
+static int
stindex(char *MessageID, int hash) {
int i;
@@ -235,7 +235,7 @@
}
/* stidhash(): calculate a hash value for message IDs to speed comparisons */
-STATIC int
+static int
stidhash(char *MessageID) {
char *p;
int hash;
@@ -253,7 +253,7 @@
}
/* stalloc(): save path, ID, and qp into one of the streaming mode entries */
-STATIC int
+static int
stalloc(char *Article, char *MessageID, ARTHANDLE *art, int hash) {
int i;
@@ -285,7 +285,7 @@
}
/* strel(): release for reuse one of the streaming mode entries */
-STATIC void
+static void
strel(int i) {
if (stbuf[i].art) {
SMfreearticle(stbuf[i].art);
@@ -299,7 +299,7 @@
/*
** Send a line to the server, adding the dot escape and \r\n.
*/
-STATIC BOOL
+static BOOL
REMwrite(char *p, int i, BOOL escdot) {
int size;
@@ -330,7 +330,7 @@
/*
** Print transfer statistics, clean up, and exit.
*/
-STATIC NORETURN
+static NORETURN
ExitWithStats(int x) {
static char QUIT[] = "quit";
TIMEINFO Now;
@@ -376,7 +376,7 @@
** Close the batchfile and the temporary file, and rename the temporary
** to be the batchfile.
*/
-STATIC void
+static void
CloseAndRename() {
/* Close the files, rename the temporary. */
if (BATCHqp) {
@@ -403,7 +403,7 @@
** Requeue an article, opening the temp file if we have to. If we get
** a file write error, exit so that the original input is left alone.
*/
-STATIC void
+static void
Requeue(char *Article, char *MessageID) {
/* Temp file already open? */
if (BATCHfp == NULL) {
@@ -434,7 +434,7 @@
/*
** Requeue an article then copy the rest of the batch file out.
*/
-STATIC void
+static void
RequeueRestAndExit(char *Article, char *MessageID) {
char *p;
@@ -496,7 +496,7 @@
/*
** Clean up the NNTP escapes from a line.
*/
-STATIC char *
+static char *
REMclean(char *buff) {
char *p;
@@ -514,7 +514,7 @@
** Read a line of input, with timeout. Also handle \r\n-->\n mapping
** and the dot escape. Return TRUE if okay, *or we got interrupted.*
*/
-STATIC BOOL
+static BOOL
REMread(char *start, int size) {
static int count;
static char buffer[BUFSIZ];
@@ -596,7 +596,7 @@
/*
** Send a whole article to the server.
*/
-STATIC BOOL
+static BOOL
REMsendarticle(char *Article, char *MessageID, ARTHANDLE *art) {
char buff[NNTP_STRLEN];
@@ -667,7 +667,7 @@
/*
** Get the Message-ID header from an open article.
*/
-STATIC char *
+static char *
GetMessageID(ARTHANDLE *art) {
static char *buff;
static int buffsize = 0;
@@ -697,7 +697,7 @@
/*
** Mark that we got interrupted.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
CATCHinterrupt(int s) {
GotInterrupt = TRUE;
/* Let two interrupts kill us. */
@@ -709,7 +709,7 @@
** Mark that the alarm went off.
*/
/* ARGSUSED0 */
-STATIC SIGHANDLER
+static SIGHANDLER
CATCHalarm(int s) {
GotAlarm = TRUE;
if (JMPyes)
@@ -719,7 +719,7 @@
/* check articles in streaming NNTP mode
** return TRUE on failure.
*/
-STATIC BOOL
+static BOOL
check(int i) {
char buff[NNTP_STRLEN];
@@ -747,7 +747,7 @@
/* Send article in "takethis <id> streaming NNTP mode.
** return TRUE on failure.
*/
-STATIC BOOL
+static BOOL
takethis(int i) {
char buff[NNTP_STRLEN];
ARTHANDLE *art;
@@ -804,7 +804,7 @@
** the queue. Also sends the articles on request. Returns TRUE on error.
** return TRUE on failure.
*/
-STATIC BOOL
+static BOOL
strlisten() {
int resp;
int i;
@@ -902,7 +902,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage() {
(void)fprintf(stderr,
"Usage: innxmit [-a] [-c] [-d] [-p] [-r] [-s] [-t#] [-T#] host file\n");
diff -Naur --recursive inn2-2.3.1.orig/backends/map.c inn2-2.3.1/backends/map.c
--- inn2-2.3.1.orig/backends/map.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/backends/map.c Fri Jun 8 20:08:24 2001
@@ -17,8 +17,8 @@
char *Value;
} PAIR;
-STATIC PAIR *MAPdata;
-STATIC PAIR *MAPend;
+static PAIR *MAPdata;
+static PAIR *MAPend;
/*
diff -Naur --recursive inn2-2.3.1.orig/backends/nntpget.c inn2-2.3.1/backends/nntpget.c
--- inn2-2.3.1.orig/backends/nntpget.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/backends/nntpget.c Fri Jun 8 20:08:24 2001
@@ -50,20 +50,20 @@
/*
** Global variables.
*/
-STATIC struct iovec SITEvec[2];
-STATIC char SITEv1[] = "\r\n";
-STATIC char READER[] = "mode reader";
-STATIC unsigned long STATgot;
-STATIC unsigned long STAToffered;
-STATIC unsigned long STATsent;
-STATIC unsigned long STATrejected;
+static struct iovec SITEvec[2];
+static char SITEv1[] = "\r\n";
+static char READER[] = "mode reader";
+static unsigned long STATgot;
+static unsigned long STAToffered;
+static unsigned long STATsent;
+static unsigned long STATrejected;
/*
** Read a line of input, with timeout.
*/
-STATIC BOOL
+static BOOL
SITEread(sp, start)
SITE *sp;
char *start;
@@ -120,7 +120,7 @@
** since it's only for sending DATA to local site, and the data we got from
** the remote site already is escaped.
*/
-STATIC BOOL
+static BOOL
SITEwrite(sp, p, i)
SITE *sp;
char *p;
@@ -132,7 +132,7 @@
}
-STATIC SITE *
+static SITE *
SITEconnect(host)
char *host;
{
@@ -180,7 +180,7 @@
/*
** Send "quit" to a site, and get its reply.
*/
-STATIC void
+static void
SITEquit(sp)
SITE *sp;
{
@@ -191,7 +191,7 @@
}
-STATIC BOOL
+static BOOL
HIShaveit(mesgid)
char *mesgid;
{
@@ -199,7 +199,7 @@
}
-STATIC NORETURN
+static NORETURN
Usage(p)
char *p;
{
diff -Naur --recursive inn2-2.3.1.orig/backends/overchan.c inn2-2.3.1/backends/overchan.c
--- inn2-2.3.1.orig/backends/overchan.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/backends/overchan.c Fri Jun 8 20:08:24 2001
@@ -50,7 +50,7 @@
*/
#define TEXT_TOKEN_LEN (2*sizeof(TOKEN)+2)
-STATIC void ProcessIncoming(QIOSTATE *qp)
+static void ProcessIncoming(QIOSTATE *qp)
{
char *Data;
char *p;
diff -Naur --recursive inn2-2.3.1.orig/backends/shlock.c inn2-2.3.1/backends/shlock.c
--- inn2-2.3.1.orig/backends/shlock.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/backends/shlock.c Fri Jun 8 20:08:24 2001
@@ -14,16 +14,16 @@
#endif
-STATIC BOOL BinaryLock;
-STATIC char CANTUNLINK[] = "Can't unlink \"%s\", %s\n";
-STATIC char CANTOPEN[] = "Can't open \"%s\", %s\n";
+static BOOL BinaryLock;
+static char CANTUNLINK[] = "Can't unlink \"%s\", %s\n";
+static char CANTOPEN[] = "Can't open \"%s\", %s\n";
/*
** See if the process named in an existing lock still exists by
** sending it a null signal.
*/
-STATIC BOOL
+static BOOL
ValidLock(name, JustChecking)
char *name;
BOOL JustChecking;
@@ -72,7 +72,7 @@
/*
** Unlink a file, print a message on error, and exit.
*/
-STATIC NORETURN
+static NORETURN
UnlinkAndExit(name, x)
char *name;
int x;
@@ -86,7 +86,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage: shlock [-u|-b] -f file -p pid\n");
diff -Naur --recursive inn2-2.3.1.orig/backends/shrinkfile.c inn2-2.3.1/backends/shrinkfile.c
--- inn2-2.3.1.orig/backends/shrinkfile.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/backends/shrinkfile.c Fri Jun 8 20:08:24 2001
@@ -40,7 +40,7 @@
/*
** Open a safe unique temporary file that will go away when closed.
*/
-STATIC FILE *
+static FILE *
OpenTemp()
{
FILE *F;
@@ -70,7 +70,7 @@
/*
** Does file end with \n? Assume it does on I/O error, to avoid doing I/O.
*/
-STATIC int
+static int
EndsWithNewline(F)
FILE *F;
{
@@ -96,7 +96,7 @@
/*
** Add a newline to location of a file.
*/
-STATIC BOOL
+static BOOL
AppendNewline(name)
char *name;
{
@@ -123,7 +123,7 @@
/*
** Just check if it is too big
*/
-STATIC BOOL
+static BOOL
TooBig(F, maxsize)
FILE *F;
OFFSET_T maxsize;
@@ -144,7 +144,7 @@
/*
** This routine does all the work.
*/
-STATIC BOOL
+static BOOL
Process(F, name, size, maxsize, Changedp)
FILE *F;
char *name;
@@ -270,7 +270,7 @@
/*
** Convert size argument to numeric value. Return -1 on error.
*/
-STATIC OFFSET_T
+static OFFSET_T
ParseSize(p)
char *p;
{
@@ -322,7 +322,7 @@
/*
** Print usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage: %s [-n] [ -m maxsize ] [-s size] [-v] file...\n", program);
diff -Naur --recursive inn2-2.3.1.orig/expire/convdate.c inn2-2.3.1/expire/convdate.c
--- inn2-2.3.1.orig/expire/convdate.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/expire/convdate.c Fri Jun 8 20:08:24 2001
@@ -12,10 +12,10 @@
/* This is sloppy, but good enough. */
-STATIC STRING Program = "convdate";
+static STRING Program = "convdate";
-STATIC BOOL
+static BOOL
AllDigits(p)
register char *p;
{
@@ -28,7 +28,7 @@
/*
** Print usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage: %s [-c|-n|-s] arg...\n", Program);
diff -Naur --recursive inn2-2.3.1.orig/expire/expire.c inn2-2.3.1/expire/expire.c
--- inn2-2.3.1.orig/expire/expire.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/expire/expire.c Fri Jun 8 20:08:24 2001
@@ -70,37 +70,37 @@
BOOL HasDirectory;
} BADGROUP;
-STATIC BOOL EXPtracing;
-STATIC BOOL EXPusepost;
-STATIC BOOL Ignoreselfexpire = FALSE;
-STATIC char *ACTIVE;
-STATIC char *SPOOL = NULL;
-STATIC int nGroups;
-STATIC FILE *EXPunlinkfile;
-STATIC NEWSGROUP *Groups;
-STATIC NEWSGROUP EXPdefault;
-STATIC EXPIRECLASS EXPclasses[NUM_STORAGE_CLASSES+1];
-STATIC STRING EXPreason;
-STATIC time_t EXPremember;
-STATIC time_t Now;
-STATIC time_t RealNow;
+static BOOL EXPtracing;
+static BOOL EXPusepost;
+static BOOL Ignoreselfexpire = FALSE;
+static char *ACTIVE;
+static char *SPOOL = NULL;
+static int nGroups;
+static FILE *EXPunlinkfile;
+static NEWSGROUP *Groups;
+static NEWSGROUP EXPdefault;
+static EXPIRECLASS EXPclasses[NUM_STORAGE_CLASSES+1];
+static STRING EXPreason;
+static time_t EXPremember;
+static time_t Now;
+static time_t RealNow;
/* Statistics; for -v flag. */
-STATIC char *EXPgraph;
-STATIC int EXPverbose;
-STATIC long EXPprocessed;
-STATIC long EXPunlinked;
-STATIC long EXPhistdrop;
-STATIC long EXPhistremember;
-STATIC long EXPallgone;
-STATIC long EXPstillhere;
+static char *EXPgraph;
+static int EXPverbose;
+static long EXPprocessed;
+static long EXPunlinked;
+static long EXPhistdrop;
+static long EXPhistremember;
+static long EXPallgone;
+static long EXPstillhere;
-STATIC NORETURN CleanupAndExit(BOOL Server, BOOL Paused, int x);
+static NORETURN CleanupAndExit(BOOL Server, BOOL Paused, int x);
#if ! defined (atof) /* NEXT defines aotf as a macro */
extern double atof();
#endif
-STATIC int EXPsplit(char *p, char sep, char **argv, int count);
+static int EXPsplit(char *p, char sep, char **argv, int count);
enum KR {Keep, Remove};
@@ -109,7 +109,7 @@
/*
** Open a file or give up.
*/
-STATIC FILE *EXPfopen(BOOL Remove, STRING Name, char *Mode, BOOL Needclean, BOOL Server, BOOL Paused)
+static FILE *EXPfopen(BOOL Remove, STRING Name, char *Mode, BOOL Needclean, BOOL Server, BOOL Paused)
{
FILE *F;
@@ -132,7 +132,7 @@
** Split a line at a specified field separator into a vector and return
** the number of fields found, or -1 on error.
*/
-STATIC int EXPsplit(char *p, char sep, char **argv, int count)
+static int EXPsplit(char *p, char sep, char **argv, int count)
{
int i;
@@ -175,7 +175,7 @@
** just about everything you expect. Print a message and return FALSE
** on error.
*/
-STATIC BOOL EXPgetnum(int line, char *word, time_t *v, char *name)
+static BOOL EXPgetnum(int line, char *word, time_t *v, char *name)
{
char *p;
BOOL SawDot;
@@ -216,7 +216,7 @@
/*
** Set the expiration fields for all groups that match this pattern.
*/
-STATIC void EXPmatch(char *p, NEWSGROUP *v, char mod)
+static void EXPmatch(char *p, NEWSGROUP *v, char mod)
{
NEWSGROUP *ngp;
int i;
@@ -247,7 +247,7 @@
/*
** Parse the expiration control file. Return TRUE if okay.
*/
-STATIC BOOL EXPreadfile(FILE *F)
+static BOOL EXPreadfile(FILE *F)
{
char *p;
int i;
@@ -361,7 +361,7 @@
/*
** Should we keep the specified article?
*/
-STATIC enum KR EXPkeepit(TOKEN token, time_t when, time_t Expires)
+static enum KR EXPkeepit(TOKEN token, time_t when, time_t Expires)
{
EXPIRECLASS class;
@@ -422,7 +422,7 @@
** An article can be removed. Either print a note, or actually remove it.
** Also fill in the article size.
*/
-STATIC void EXPremove(TOKEN token, OFFSET_T *size, BOOL index)
+static void EXPremove(TOKEN token, OFFSET_T *size, BOOL index)
{
/* Turn into a filename and get the size if we need it. */
if (EXPverbose > 1)
@@ -452,7 +452,7 @@
/*
** Do the work of expiring one line.
*/
-STATIC BOOL EXPdoline(FILE *out, char *line, int length)
+static BOOL EXPdoline(FILE *out, char *line, int length)
{
static char IGNORING[] = "Ignoring bad line, \"%.20s...\"\n";
static OFFSET_T Offset;
@@ -659,7 +659,7 @@
/*
** Clean up link with the server and exit.
*/
-STATIC NORETURN CleanupAndExit(BOOL Server, BOOL Paused, int x)
+static NORETURN CleanupAndExit(BOOL Server, BOOL Paused, int x)
{
FILE *F;
@@ -708,7 +708,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN Usage(void)
+static NORETURN Usage(void)
{
(void)fprintf(stderr, "Usage: expire [flags] [expire.ctl]\n");
exit(1);
diff -Naur --recursive inn2-2.3.1.orig/expire/fastrm.c inn2-2.3.1/expire/fastrm.c
--- inn2-2.3.1.orig/expire/fastrm.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/expire/fastrm.c Fri Jun 8 20:08:24 2001
@@ -22,10 +22,10 @@
#include "libinn.h"
#include "storage.h"
-STATIC char *MyName;
+static char *MyName;
-STATIC void err_exit(char *s)
+static void err_exit(char *s)
{
(void)fprintf(stderr, "%s: %s\n", MyName, s);
SMshutdown();
diff -Naur --recursive inn2-2.3.1.orig/expire/grephistory.c inn2-2.3.1/expire/grephistory.c
--- inn2-2.3.1.orig/expire/grephistory.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/expire/grephistory.c Fri Jun 8 20:08:24 2001
@@ -17,7 +17,7 @@
/*
** Get the next filename from the history file.
*/
-STATIC BOOL GetName(FILE *F, char *buff, BOOL *Againp)
+static BOOL GetName(FILE *F, char *buff, BOOL *Againp)
{
int c;
char *p;
@@ -45,7 +45,7 @@
/*
** Given a DBZ value, seek to the right spot.
*/
-STATIC BOOL HistorySeek(FILE *F, OFFSET_T offset)
+static BOOL HistorySeek(FILE *F, OFFSET_T offset)
{
int c;
int i;
@@ -73,7 +73,7 @@
/*
** Print the full line from the history file.
*/
-STATIC void FullLine(FILE *F, OFFSET_T offset)
+static void FullLine(FILE *F, OFFSET_T offset)
{
int c;
@@ -92,7 +92,7 @@
** Read stdin for list of Message-ID's, output list of ones we
** don't have. Or, output list of files for ones we DO have.
*/
-STATIC void
+static void
IhaveSendme(STRING History, char What)
{
FILE *F;
@@ -162,7 +162,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage(void)
{
(void)fprintf(stderr, "Usage: grephistory [flags] MessageID\n");
diff -Naur --recursive inn2-2.3.1.orig/expire/makedbz.c inn2-2.3.1/expire/makedbz.c
--- inn2-2.3.1.orig/expire/makedbz.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/expire/makedbz.c Fri Jun 8 20:08:24 2001
@@ -20,7 +20,7 @@
/*
** Remove the DBZ files for the specified base text file.
*/
-STATIC void
+static void
RemoveDBZFiles(char *p)
{
static char NOCANDO[] = "Can't remove \"%s\", %s\n";
@@ -46,7 +46,7 @@
/*
** Rebuild the DBZ file from the text file.
*/
-STATIC void Rebuild(OFFSET_T size, BOOL IgnoreOld, BOOL Overwrite)
+static void Rebuild(OFFSET_T size, BOOL IgnoreOld, BOOL Overwrite)
{
QIOSTATE *qp;
char *p;
diff -Naur --recursive inn2-2.3.1.orig/expire/makehistory.c inn2-2.3.1/expire/makehistory.c
--- inn2-2.3.1.orig/expire/makehistory.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/expire/makehistory.c Fri Jun 8 20:08:24 2001
@@ -64,20 +64,20 @@
TIMEINFO Now;
/* Misc variables needed for the overview creation code. */
-STATIC char MESSAGEID[] = "Message-ID:";
-STATIC char EXPIRES[] = "Expires:";
-STATIC char DATE[] = "Date:";
-STATIC char XREF[] = "Xref:";
-STATIC ARTOVERFIELD *ARTfields; /* overview fields listed in overview.fmt */
-STATIC int ARTfieldsize;
-STATIC ARTOVERFIELD *Datep = (ARTOVERFIELD *)NULL;
-STATIC ARTOVERFIELD *Msgidp = (ARTOVERFIELD *)NULL;
-STATIC ARTOVERFIELD *Expp = (ARTOVERFIELD *)NULL;
-STATIC ARTOVERFIELD *Xrefp = (ARTOVERFIELD *)NULL;
-STATIC ARTOVERFIELD *Missfields; /* header fields not listed in
+static char MESSAGEID[] = "Message-ID:";
+static char EXPIRES[] = "Expires:";
+static char DATE[] = "Date:";
+static char XREF[] = "Xref:";
+static ARTOVERFIELD *ARTfields; /* overview fields listed in overview.fmt */
+static int ARTfieldsize;
+static ARTOVERFIELD *Datep = (ARTOVERFIELD *)NULL;
+static ARTOVERFIELD *Msgidp = (ARTOVERFIELD *)NULL;
+static ARTOVERFIELD *Expp = (ARTOVERFIELD *)NULL;
+static ARTOVERFIELD *Xrefp = (ARTOVERFIELD *)NULL;
+static ARTOVERFIELD *Missfields; /* header fields not listed in
overview.fmt, but ones that we need
(e.g. message-id */
-STATIC int Missfieldsize = 0;
+static int Missfieldsize = 0;
typedef struct _BUFFER {
long Size;
diff -Naur --recursive inn2-2.3.1.orig/expire/newsrequeue.c inn2-2.3.1/expire/newsrequeue.c
--- inn2-2.3.1.orig/expire/newsrequeue.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/expire/newsrequeue.c Fri Jun 8 20:08:24 2001
@@ -58,18 +58,18 @@
** Bit array, indexed by character (8bit chars only). If ARTpathbits['x']
** is non-zero, then 'x' is a valid character for a host name.
*/
-STATIC char ARTpathbits[256];
+static char ARTpathbits[256];
#define ARThostchar(c) (ARTpathbits[(int) c] != '\0')
/*
** Global variables.
*/
-STATIC SITE *Sites;
-STATIC int nSites;
-STATIC NEWSGROUP *Groups;
-STATIC int nGroups;
-STATIC NGHASH NGHtable[NGH_SIZE];
+static SITE *Sites;
+static int nSites;
+static NEWSGROUP *Groups;
+static int nGroups;
+static NGHASH NGHtable[NGH_SIZE];
@@ -77,7 +77,7 @@
** Read the active file and fill in the Groups array. Note that
** NEWSGROUP.Sites is filled in later.
*/
-STATIC void
+static void
ParseActive(name)
STRING name;
{
@@ -151,7 +151,7 @@
/*
** Split text into comma-separated fields.
*/
-STATIC char **
+static char **
CommaSplit(text)
char *text;
{
@@ -181,7 +181,7 @@
** Read the newsfeeds file and fill in the Sites array. Finish off the
** Groups array.
*/
-STATIC void
+static void
ParseNewsfeeds(name)
STRING name;
{
@@ -281,7 +281,7 @@
/*
** Build the subscription list for a site.
*/
-STATIC void
+static void
BuildSubList(sp, subbed)
register SITE *sp;
char *subbed;
@@ -361,7 +361,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage error.\n");
diff -Naur --recursive inn2-2.3.1.orig/expire/prunehistory.c inn2-2.3.1/expire/prunehistory.c
--- inn2-2.3.1.orig/expire/prunehistory.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/expire/prunehistory.c Fri Jun 8 20:08:24 2001
@@ -28,7 +28,7 @@
/*
** Convert a pathname into a history-like entry.
*/
-STATIC void
+static void
Splice(name, Line)
register char *name;
BUFFER *Line;
@@ -72,7 +72,7 @@
/*
** Print usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage: prunehistory [-f file] [input]\n");
diff -Naur --recursive inn2-2.3.1.orig/frontends/ctlinnd.c inn2-2.3.1/frontends/ctlinnd.c
--- inn2-2.3.1.orig/frontends/ctlinnd.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/frontends/ctlinnd.c Fri Jun 8 20:08:24 2001
@@ -27,7 +27,7 @@
} COMMAND;
-STATIC COMMAND Commands[] = {
+static COMMAND Commands[] = {
{ "addhist", "id arr exp post path...\tAdd history line",
5, SC_ADDHIST, TRUE },
{ "allow", "reason...\t\t\tAllow remote connections",
@@ -117,7 +117,7 @@
/*
** Print a help summary.
*/
-STATIC NORETURN
+static NORETURN
Help(p)
char *p;
{
@@ -145,7 +145,7 @@
/*
** Print a command-usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
WrongArgs(cp)
COMMAND *cp;
{
@@ -158,7 +158,7 @@
/*
** Print an error message and exit.
*/
-STATIC NORETURN
+static NORETURN
Failed(p)
char *p;
{
@@ -175,7 +175,7 @@
/*
** Print an error reporting incorrect usage.
*/
-STATIC NORETURN
+static NORETURN
Usage(what)
char *what;
{
diff -Naur --recursive inn2-2.3.1.orig/frontends/feedone.c inn2-2.3.1/frontends/feedone.c
--- inn2-2.3.1.orig/frontends/feedone.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/frontends/feedone.c Fri Jun 8 20:08:24 2001
@@ -12,15 +12,15 @@
#include "macros.h"
-STATIC FILE *FromServer;
-STATIC FILE *ToServer;
-STATIC int Tracing;
+static FILE *FromServer;
+static FILE *ToServer;
+static int Tracing;
/*
** Print and error message (with errno) and exit with an error code.
*/
-STATIC NORETURN
+static NORETURN
PerrorExit(s)
char *s;
{
@@ -32,7 +32,7 @@
/*
** Read a line from the server or die trying.
*/
-STATIC NORETURN
+static NORETURN
GetFromServer(buff, size, text)
char *buff;
int size;
@@ -48,7 +48,7 @@
/*
** Flush a stdio FILE; exit if there are any errors.
*/
-STATIC void
+static void
SafeFlush(F)
FILE *F;
{
@@ -57,7 +57,7 @@
}
-STATIC NORETURN
+static NORETURN
SendQuit(x)
int x;
{
@@ -72,7 +72,7 @@
}
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr,
diff -Naur --recursive inn2-2.3.1.orig/frontends/inews.c inn2-2.3.1/frontends/inews.c
--- inn2-2.3.1.orig/frontends/inews.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/frontends/inews.c Fri Jun 8 20:08:24 2001
@@ -51,23 +51,23 @@
char *Value;
} HEADER;
-STATIC char *tmpPtr ;
-STATIC BOOL Dump;
-STATIC BOOL Revoked;
-STATIC BOOL Spooling;
-STATIC char **OtherHeaders;
-STATIC char NGSEPS[] = NG_SEPARATOR;
-STATIC char SIGSEP[] = SIG_SEPARATOR;
-STATIC FILE *FromServer;
-STATIC FILE *ToServer;
-STATIC int OtherCount;
-STATIC int OtherSize;
-STATIC char *Exclusions = "";
-STATIC STRING BadDistribs[] = {
+static char *tmpPtr ;
+static BOOL Dump;
+static BOOL Revoked;
+static BOOL Spooling;
+static char **OtherHeaders;
+static char NGSEPS[] = NG_SEPARATOR;
+static char SIGSEP[] = SIG_SEPARATOR;
+static FILE *FromServer;
+static FILE *ToServer;
+static int OtherCount;
+static int OtherSize;
+static char *Exclusions = "";
+static STRING BadDistribs[] = {
BAD_DISTRIBS
};
-STATIC HEADER Table[] = {
+static HEADER Table[] = {
/* Name Canset Type */
{ "Path", TRUE, HTstd },
#define _path 0
@@ -122,7 +122,7 @@
/*
** Send the server a quit message, wait for a reply.
*/
-STATIC NORETURN
+static NORETURN
QuitServer(x)
int x;
{
@@ -162,7 +162,7 @@
/*
** Print and error message (with errno) and exit with an error code.
*/
-STATIC NORETURN
+static NORETURN
PerrorExit(ShouldQuit, s)
BOOL ShouldQuit;
char *s;
@@ -178,7 +178,7 @@
/*
** Flush a stdio FILE; exit if there are any errors.
*/
-STATIC void
+static void
SafeFlush(F)
FILE *F;
{
@@ -190,7 +190,7 @@
/*
** Trim trailing spaces, return pointer to first non-space char.
*/
-STATIC char *
+static char *
TrimSpaces(p)
register char *p;
{
@@ -208,7 +208,7 @@
** Mark the end of the header starting at p, and return a pointer
** to the start of the next one. Handles continuations.
*/
-STATIC char *
+static char *
NextHeader(p)
register char *p;
{
@@ -228,7 +228,7 @@
/*
** Strip any headers off the article and dump them into the table.
*/
-STATIC char *
+static char *
StripOffHeaders(article)
char *article;
{
@@ -318,7 +318,7 @@
** See if the user is allowed to cancel the indicated message. Assumes
** that the Sender or From line has already been filled in.
*/
-STATIC void
+static void
CheckCancel(msgid, JustReturn)
char *msgid;
BOOL JustReturn;
@@ -383,7 +383,7 @@
/*
** See if the user is the news administrator.
*/
-STATIC BOOL
+static BOOL
AnAdministrator(name, group)
char *name;
gid_t group;
@@ -419,7 +419,7 @@
/*
** Check the control message, and see if it's legit.
*/
-STATIC void
+static void
CheckControl(ctrl, pwp)
char *ctrl;
struct passwd *pwp;
@@ -487,7 +487,7 @@
** into the login name, with perhaps an initial capital. (Everyone seems
** to hate that, but everyone also supports it.)
*/
-STATIC char *
+static char *
FormatUserName(pwp, node)
struct passwd *pwp;
char *node;
@@ -565,7 +565,7 @@
/*
** Check the Distribution header, and exit on error.
*/
-STATIC void CheckDistribution(char *p)
+static void CheckDistribution(char *p)
{
static char SEPS[] = " \t,";
register STRING **dp;
@@ -587,7 +587,7 @@
/*
** Process all the headers. FYI, they're done in RFC-order.
*/
-STATIC void
+static void
ProcessHeaders(AddOrg, linecount, pwp)
BOOL AddOrg;
int linecount;
@@ -771,7 +771,7 @@
** out in order to avoid postings like "Sorry, I forgot my .signature
** -- here's the article again."
*/
-STATIC char *
+static char *
AppendSignature(UseMalloc, article, homedir, linesp)
BOOL UseMalloc;
char *article;
@@ -850,7 +850,7 @@
** with > is included text. Decrement the count on lines starting with <
** so that we don't reject diff(1) output.
*/
-STATIC void
+static void
CheckIncludedText(p, lines)
register char *p;
register int lines;
@@ -888,7 +888,7 @@
** Read stdin into a string and return it. Can't use ReadInDescriptor
** since that will fail if stdin is a tty.
*/
-STATIC char *
+static char *
ReadStdin()
{
register int size;
@@ -920,7 +920,7 @@
/*
** Offer the article to the server, return its reply.
*/
-STATIC int
+static int
OfferArticle(buff, Authorized)
char *buff;
BOOL Authorized;
@@ -938,7 +938,7 @@
/*
** Spool article to temp file.
*/
-STATIC void
+static void
Spoolit(article, Length, deadfile)
char *article;
size_t Length;
@@ -978,7 +978,7 @@
/*
** Print usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage: inews [-D] [-h] [header_flags] [article]\n");
diff -Naur --recursive inn2-2.3.1.orig/frontends/innconfval.c inn2-2.3.1/frontends/innconfval.c
--- inn2-2.3.1.orig/frontends/innconfval.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/frontends/innconfval.c Fri Jun 8 20:08:24 2001
@@ -12,9 +12,9 @@
#include "paths.h"
/* Global and initialized; to work around SunOS -Bstatic bug, sigh. */
-STATIC char ConfigBuff[SMBUF] = "";
+static char ConfigBuff[SMBUF] = "";
int format = 0;
-STATIC BOOL version = FALSE;
+static BOOL version = FALSE;
int isnum(const char *v)
{
diff -Naur --recursive inn2-2.3.1.orig/frontends/rnews.c inn2-2.3.1/frontends/rnews.c
--- inn2-2.3.1.orig/frontends/rnews.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/frontends/rnews.c Fri Jun 8 20:08:24 2001
@@ -31,15 +31,15 @@
} HEADER;
-STATIC BOOL Verbose;
-STATIC char *InputFile = "stdin";
-STATIC char *UUCPHost;
-STATIC char *PathBadNews = NULL;
-STATIC char *remoteServer;
-STATIC FILE *FromServer;
-STATIC FILE *ToServer;
-STATIC char UNPACK[] = "gzip";
-STATIC HEADER RequiredHeaders[] = {
+static BOOL Verbose;
+static char *InputFile = "stdin";
+static char *UUCPHost;
+static char *PathBadNews = NULL;
+static char *remoteServer;
+static FILE *FromServer;
+static FILE *ToServer;
+static char UNPACK[] = "gzip";
+static HEADER RequiredHeaders[] = {
{ "Message-ID", 10 },
#define _messageid 0
{ "Newsgroups", 10 },
@@ -61,7 +61,7 @@
/*
** Do perror, making sure errno is preserved.
*/
-STATIC void
+static void
xperror(p)
char *p;
{
@@ -77,7 +77,7 @@
** Open up a pipe to a process with fd tied to its stdin. Return a
** descriptor tied to its stdout or -1 on error.
*/
-STATIC int
+static int
StartChild(fd, path, argv)
int fd;
char *path;
@@ -140,7 +140,7 @@
/*
** Wait for the specified number of children.
*/
-STATIC void
+static void
WaitForChildren(i)
register int i;
{
@@ -163,7 +163,7 @@
/*
** Clean up the NNTP escapes from a line.
*/
-STATIC char *REMclean(char *buff)
+static char *REMclean(char *buff)
{
char *p;
@@ -180,7 +180,7 @@
/*
** Write an article to the rejected directory.
*/
-STATIC void Reject(const char *article, const char *reason, const char *arg)
+static void Reject(const char *article, const char *reason, const char *arg)
{
#if defined(DO_RNEWS_SAVE_BAD)
char buff[SMBUF];
@@ -215,7 +215,7 @@
** whole batch needs to be saved (such as when the server goes down or if
** the file is corrupted).
*/
-STATIC BOOL Process(char *article)
+static BOOL Process(char *article)
{
HEADER *hp;
char *p;
@@ -333,7 +333,7 @@
** Read the rest of the input as an article. Just punt to stdio in
** this case and let it do the buffering.
*/
-STATIC BOOL
+static BOOL
ReadRemainder(fd, first, second)
register int fd;
char first;
@@ -399,7 +399,7 @@
/*
** Read an article from the input stream that is artsize bytes long.
*/
-STATIC BOOL
+static BOOL
ReadBytecount(fd, artsize)
register int fd;
int artsize;
@@ -448,7 +448,7 @@
/*
** Read a single text line; not unlike fgets(). Just more inefficient.
*/
-STATIC BOOL
+static BOOL
ReadLine(p, size, fd)
char *p;
int size;
@@ -477,7 +477,7 @@
/*
** Unpack a single batch.
*/
-STATIC BOOL
+static BOOL
UnpackOne(fdp, countp)
int *fdp;
int *countp;
@@ -614,7 +614,7 @@
** errors with xperror as well as syslog, since we're probably being run
** interactively.
*/
-STATIC void
+static void
Unspool()
{
register DIR *dp;
@@ -697,7 +697,7 @@
** we can do if this routine fails, unfortunately. Perhaps try to use
** an alternate filesystem?
*/
-STATIC void
+static void
Spool(fd, mode)
register int fd;
int mode;
@@ -765,7 +765,7 @@
** Try to read the password file and open a connection to a remote
** NNTP server.
*/
-STATIC BOOL OpenRemote(char *server, int port, char *buff)
+static BOOL OpenRemote(char *server, int port, char *buff)
{
int i;
@@ -792,7 +792,7 @@
/*
** Can't connect to server; print message and spool if necessary.
*/
-STATIC NORETURN
+static NORETURN
CantConnect(buff, mode, fd)
char *buff;
int mode;
@@ -811,7 +811,7 @@
/*
** Log an incorrect usage.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
syslog(L_FATAL, "usage error");
diff -Naur --recursive inn2-2.3.1.orig/include/acconfig.h inn2-2.3.1/include/acconfig.h
--- inn2-2.3.1.orig/include/acconfig.h Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/include/acconfig.h Fri Jun 8 20:08:24 2001
@@ -277,7 +277,6 @@
/* All occurrances of these typedefs anywhere should be replaced by their
ANSI/ISO/standard C definitions given in these typedefs and #defines. */
-#define STATIC static
#define FUNCTYPE void
typedef FUNCTYPE (*FUNCPTR)();
diff -Naur --recursive inn2-2.3.1.orig/include/config.h.in inn2-2.3.1/include/config.h.in
--- inn2-2.3.1.orig/include/config.h.in Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/include/config.h.in Fri Jun 8 20:08:37 2001
@@ -568,7 +568,6 @@
/* All occurrances of these typedefs anywhere should be replaced by their
ANSI/ISO/standard C definitions given in these typedefs and #defines. */
-#define STATIC static
#define FUNCTYPE void
typedef FUNCTYPE (*FUNCPTR)();
diff -Naur --recursive inn2-2.3.1.orig/innd/art.c inn2-2.3.1/innd/art.c
--- inn2-2.3.1.orig/innd/art.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/art.c Fri Jun 8 20:08:24 2001
@@ -37,7 +37,7 @@
struct _TREE *After;
} TREE;
-STATIC TREE *ARTheadertree;
+static TREE *ARTheadertree;
/*
** For doing the overview database, we keep a list of the headers and
@@ -48,15 +48,15 @@
BOOL NeedHeader;
} ARTOVERFIELD;
-STATIC ARTOVERFIELD *ARTfields;
+static ARTOVERFIELD *ARTfields;
/*
** General newsgroup we care about, and what we put in the Path line.
*/
-STATIC char ARTctl[] = "control";
-STATIC char ARTjnk[] = "junk";
-STATIC char *ARTpathme;
+static char ARTctl[] = "control";
+static char ARTjnk[] = "junk";
+static char *ARTpathme;
/*
** Different types of rejected articles.
@@ -67,7 +67,7 @@
/*
** Flag array, indexed by character. Character classes for Message-ID's.
*/
-STATIC char ARTcclass[256];
+static char ARTcclass[256];
#define CC_MSGID_ATOM 01
#define CC_MSGID_NORM 02
#define CC_HOSTNAME 04
@@ -75,8 +75,8 @@
#define ARTatomchar(c) ((ARTcclass[(unsigned char)(c)] & CC_MSGID_ATOM) != 0)
#define ARThostchar(c) ((ARTcclass[(unsigned char)(c)] & CC_HOSTNAME) != 0)
-STATIC int CRwithoutLF;
-STATIC int LFwithoutCR;
+static int CRwithoutLF;
+static int LFwithoutCR;
/*
** The header table. Not necessarily sorted, but the first character
@@ -274,7 +274,7 @@
/*
** Sorting predicate for qsort call in ARTsetup.
*/
-STATIC int
+static int
ARTcompare(p1, p2)
CPOINTER p1;
CPOINTER p2;
@@ -346,7 +346,7 @@
}
-STATIC void
+static void
ARTfreetree(tp)
TREE *tp;
{
@@ -381,11 +381,11 @@
** Parse a Path line, splitting it up into NULL-terminated array of strings.
** The argument is modified!
*/
-STATIC char **ARTparsepath(char *p, int *countp)
+static char **ARTparsepath(char *p, int *countp)
{
- STATIC char *NULLPATH[1] = { NULL };
- STATIC int oldlength;
- STATIC char **hosts;
+ static char *NULLPATH[1] = { NULL };
+ static int oldlength;
+ static char **hosts;
int i;
char **hp;
@@ -427,7 +427,7 @@
/* Write an article using the storage api. Put it together in memory and
call out to the api. */
-STATIC TOKEN ARTstore(BUFFER *Article, ARTDATA *Data) {
+static TOKEN ARTstore(BUFFER *Article, ARTDATA *Data) {
char *path;
char *p;
char *end;
@@ -568,7 +568,7 @@
** get added to the output pointer. (This nicely lets us clobber obsolete
** headers by setting it to zero.)
*/
-STATIC char *ARTparseheader(char *in, char *out, int *deltap, STRING *errorp)
+static char *ARTparseheader(char *in, char *out, int *deltap, STRING *errorp)
{
static char buff[SMBUF];
static char COLONSPACE[] = "No colon-space in \"%s\" header";
@@ -767,7 +767,7 @@
** headers. Also fill in the article data block with what we can find.
** Return NULL if the article is okay, or a string describing the error.
*/
-STATIC STRING ARTclean(BUFFER *Article, ARTDATA *Data)
+static STRING ARTclean(BUFFER *Article, ARTDATA *Data)
{
static char buff[SMBUF];
ARTHEADER *hp;
@@ -909,7 +909,7 @@
/*
** Start a log message about an article.
*/
-STATIC void
+static void
ARTlog(Data, code, text)
ARTDATA *Data;
char code;
@@ -946,7 +946,7 @@
** We are going to reject an article, record the reason and
** and the article.
*/
-STATIC void
+static void
ARTreject(code, cp, buff, article)
Reject_type code;
CHANNEL *cp;
@@ -992,7 +992,7 @@
** matches the user who posted the article, return the list of filenames
** otherwise return NULL.
*/
-STATIC TOKEN *ARTcancelverify(const ARTDATA *Data, const char *MessageID, const HASH hash)
+static TOKEN *ARTcancelverify(const ARTDATA *Data, const char *MessageID, const HASH hash)
{
char *p, *q;
char *local;
@@ -1103,7 +1103,7 @@
** are passed out to an external program in a specific directory that
** has the same name as the first word of the control message.
*/
-STATIC void ARTcontrol(ARTDATA *Data, HASH hash, char *Control, CHANNEL *cp)
+static void ARTcontrol(ARTDATA *Data, HASH hash, char *Control, CHANNEL *cp)
{
char *p;
char buff[SMBUF];
@@ -1198,7 +1198,7 @@
** Split a Distribution header, making a copy and skipping leading and
** trailing whitespace (which the RFC allows).
*/
-STATIC void DISTparse(char **list, ARTDATA *Data)
+static void DISTparse(char **list, ARTDATA *Data)
{
static BUFFER Dist;
char *p;
@@ -1242,7 +1242,7 @@
** A somewhat similar routine, except that this handles negated entries
** in the list and is used to check the distribution sub-field.
*/
-STATIC BOOL DISTwanted(char **list, char *p)
+static BOOL DISTwanted(char **list, char *p)
{
char *q;
char c;
@@ -1266,7 +1266,7 @@
/*
** See if any of the distributions in the article are wanted by the site.
*/
-STATIC BOOL DISTwantany(char **site, char **article)
+static BOOL DISTwantany(char **site, char **article)
{
for ( ; *article; article++)
if (DISTwanted(site, *article))
@@ -1279,7 +1279,7 @@
** Send the current article to all sites that would get it if the
** group were created.
*/
-STATIC void ARTsendthegroup(char *name)
+static void ARTsendthegroup(char *name)
{
SITE *sp;
int i;
@@ -1296,7 +1296,7 @@
** Check if site doesn't want this group even if it's crossposted
** to a wanted group.
*/
-STATIC void ARTpoisongroup(char *name)
+static void ARTpoisongroup(char *name)
{
SITE *sp;
int i;
@@ -1313,7 +1313,7 @@
** If we end up not being able to write the article, we'll get "holes"
** in the directory and active file.
*/
-STATIC void ARTassignnumbers(void)
+static void ARTassignnumbers(void)
{
char *p;
int i;
@@ -1347,7 +1347,7 @@
** Parse the data from the xref header and assign the numbers.
** This involves replacing the GroupPointers entries.
*/
-STATIC BOOL
+static BOOL
ARTxrefslave()
{
char *p;
@@ -1426,7 +1426,7 @@
** Return TRUE if a list of strings has a specific one. This is a
** generic routine, but is used for seeing if a host is in the Path line.
*/
-STATIC BOOL ListHas(char **list, char *p)
+static BOOL ListHas(char **list, char *p)
{
char *q;
char c;
@@ -1441,7 +1441,7 @@
/*
** Propagate an article to the sites have "expressed an interest."
*/
-STATIC void ARTpropagate(ARTDATA *Data, char **hops, int hopcount, char **list, BOOL ControlStore, BOOL OverviewCreated)
+static void ARTpropagate(ARTDATA *Data, char **hops, int hopcount, char **list, BOOL ControlStore, BOOL OverviewCreated)
{
SITE *sp;
int i;
@@ -1657,7 +1657,7 @@
** Build new Keywords.
*/
-STATIC void
+static void
ARTmakekeys(hp, body, v, l)
register ARTHEADER *hp; /* header data */
register char *body, *v; /* article body, old kw value */
@@ -1848,7 +1848,7 @@
/*
** Build up the overview data.
*/
-STATIC void ARTmakeoverview(ARTDATA *Data, BOOL Filename)
+static void ARTmakeoverview(ARTDATA *Data, BOOL Filename)
{
static char SEP[] = "\t";
static char COLONSPACE[] = ": ";
diff -Naur --recursive inn2-2.3.1.orig/innd/cc.c inn2-2.3.1/innd/cc.c
--- inn2-2.3.1.orig/innd/cc.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/cc.c Fri Jun 8 20:08:24 2001
@@ -37,62 +37,62 @@
} CCDISPATCH;
-/*STATIC STRING CCaddhist();*/
-STATIC STRING CCallow();
-STATIC STRING CCbegin();
-STATIC STRING CCchgroup();
-STATIC STRING CCdrop();
-STATIC STRING CCfeedinfo();
-STATIC STRING CCflush();
-STATIC STRING CCflushlogs();
-STATIC STRING CCgo();
-STATIC STRING CChangup();
-STATIC STRING CCreserve();
-STATIC STRING CClogmode();
-STATIC STRING CCmode();
-STATIC STRING CCname();
-STATIC STRING CCnewgroup();
-STATIC STRING CCparam();
-STATIC STRING CCpause();
-STATIC STRING CCreaders();
-STATIC STRING CCreject();
-STATIC STRING CCreload();
-STATIC STRING CCrenumber();
-STATIC STRING CCrmgroup();
-STATIC STRING CCsend();
-STATIC STRING CCshutdown();
-STATIC STRING CCsignal();
-STATIC STRING CCstatus();
-STATIC STRING CCthrottle();
-STATIC STRING CCtimer();
-STATIC STRING CCtrace();
-STATIC STRING CCxabort();
-STATIC STRING CCxexec();
+/*static STRING CCaddhist();*/
+static STRING CCallow();
+static STRING CCbegin();
+static STRING CCchgroup();
+static STRING CCdrop();
+static STRING CCfeedinfo();
+static STRING CCflush();
+static STRING CCflushlogs();
+static STRING CCgo();
+static STRING CChangup();
+static STRING CCreserve();
+static STRING CClogmode();
+static STRING CCmode();
+static STRING CCname();
+static STRING CCnewgroup();
+static STRING CCparam();
+static STRING CCpause();
+static STRING CCreaders();
+static STRING CCreject();
+static STRING CCreload();
+static STRING CCrenumber();
+static STRING CCrmgroup();
+static STRING CCsend();
+static STRING CCshutdown();
+static STRING CCsignal();
+static STRING CCstatus();
+static STRING CCthrottle();
+static STRING CCtimer();
+static STRING CCtrace();
+static STRING CCxabort();
+static STRING CCxexec();
#if defined(DO_TCL)
-STATIC STRING CCfilter();
+static STRING CCfilter();
#endif /* defined(DO_TCL) */
#if defined(DO_PERL)
-STATIC STRING CCperl();
+static STRING CCperl();
#endif /* defined(DO_PERL) */
#if defined(DO_PYTHON)
-STATIC STRING CCpython();
+static STRING CCpython();
#endif /* defined(DO_PYTHON) */
-STATIC STRING CClowmark();
+static STRING CClowmark();
-STATIC char *CCpath = NULL;
-STATIC char **CCargv;
-STATIC char CCnosite[] = "1 No such site";
-STATIC char CCwrongtype[] = "1 Wrong site type";
-STATIC char CCnogroup[] = "1 No such group";
-STATIC char CCnochannel[] = "1 No such channel";
-STATIC char CCnoreason[] = "1 Empty reason";
-STATIC char CCbigreason[] = "1 Reason too long";
-STATIC char CCnotrunning[] = "1 Must be running";
-STATIC BUFFER CCreply;
-STATIC CHANNEL *CCchan;
-STATIC int CCwriter;
-STATIC CCDISPATCH CCcommands[] = {
+static char *CCpath = NULL;
+static char **CCargv;
+static char CCnosite[] = "1 No such site";
+static char CCwrongtype[] = "1 Wrong site type";
+static char CCnogroup[] = "1 No such group";
+static char CCnochannel[] = "1 No such channel";
+static char CCnoreason[] = "1 Empty reason";
+static char CCbigreason[] = "1 Reason too long";
+static char CCnotrunning[] = "1 Must be running";
+static BUFFER CCreply;
+static CHANNEL *CCchan;
+static int CCwriter;
+static CCDISPATCH CCcommands[] = {
{ SC_ADDHIST, 5, CCaddhist },
{ SC_ALLOW, 1, CCallow },
{ SC_BEGIN, 1, CCbegin },
@@ -138,7 +138,7 @@
{ SC_XEXEC, 1, CCxexec }
};
-STATIC SIGHANDLER CCresetup();
+static SIGHANDLER CCresetup();
void
@@ -166,7 +166,7 @@
/*
** Return a string representing our operating mode.
*/
-STATIC STRING
+static STRING
CCcurrmode()
{
static char buff[32];
@@ -189,7 +189,7 @@
/*
** Add <> around Message-ID if needed.
*/
-STATIC STRING
+static STRING
CCgetid(p, store)
char *p;
char **store;
@@ -226,7 +226,7 @@
/*
** Abort and dump core.
*/
-STATIC STRING
+static STRING
CCxabort(av)
char *av[];
{
@@ -320,7 +320,7 @@
/*
** Do the work to allow foreign connectiosn.
*/
-STATIC STRING
+static STRING
CCallow(av)
char *av[];
{
@@ -340,7 +340,7 @@
/*
** Do the work needed to start feeding a (new) site.
*/
-STATIC STRING
+static STRING
CCbegin(char *av[])
{
SITE *sp;
@@ -410,7 +410,7 @@
/*
** Common code to change a group's flags.
*/
-STATIC STRING
+static STRING
CCdochange(ngp, Rest)
register NEWSGROUP *ngp;
char *Rest;
@@ -441,7 +441,7 @@
/*
** Change the mode of a newsgroup.
*/
-STATIC STRING
+static STRING
CCchgroup(av)
char *av[];
{
@@ -544,7 +544,7 @@
/*
** Drop a site.
*/
-STATIC STRING
+static STRING
CCdrop(av)
char *av[];
{
@@ -576,7 +576,7 @@
/*
** Return info on the feeds for one, or all, sites
*/
-STATIC STRING
+static STRING
CCfeedinfo(av)
char *av[];
{
@@ -605,7 +605,7 @@
#if defined(DO_TCL)
-STATIC STRING
+static STRING
CCfilter(av)
char *av[];
{
@@ -637,7 +637,7 @@
extern CV *perl_filter_cv ;
-STATIC STRING
+static STRING
CCperl(av)
char *av[];
{
@@ -665,7 +665,7 @@
#if defined(DO_PYTHON)
-STATIC STRING
+static STRING
CCpython(av)
char *av[];
{
@@ -677,7 +677,7 @@
/*
** Flush all sites or one site.
*/
-STATIC STRING
+static STRING
CCflush(av)
char *av[];
{
@@ -706,7 +706,7 @@
** Flush the log files.
*/
/* ARGSUSED0 */
-STATIC STRING
+static STRING
CCflushlogs(av)
char *av[];
{
@@ -724,7 +724,7 @@
/*
** Leave paused or throttled mode.
*/
-STATIC STRING
+static STRING
CCgo(av)
char *av[];
{
@@ -777,7 +777,7 @@
/*
** Hangup a channel.
*/
-STATIC STRING
+static STRING
CChangup(av)
char *av[];
{
@@ -819,7 +819,7 @@
** Return our operating mode.
*/
/* ARGSUSED */
-STATIC STRING
+static STRING
CCmode(av)
char *av[];
{
@@ -959,7 +959,7 @@
** Log our operating mode (via syslog).
*/
/* ARGSUSED */
-STATIC STRING
+static STRING
CClogmode(av)
char *av[];
{
@@ -971,7 +971,7 @@
/*
** Name the channels. ("Name the bats -- simple names.")
*/
-STATIC STRING
+static STRING
CCname(char *av[])
{
static char NL[] = "\n";
@@ -1037,7 +1037,7 @@
/*
** Create a newsgroup.
*/
-STATIC STRING
+static STRING
CCnewgroup(av)
char *av[];
{
@@ -1126,7 +1126,7 @@
/*
** Parse and set a boolean flag.
*/
-STATIC BOOL
+static BOOL
CCparsebool(name, bp, value)
char name;
BOOL *bp;
@@ -1150,7 +1150,7 @@
/*
** Change a running parameter.
*/
-STATIC STRING
+static STRING
CCparam(av)
char *av[];
{
@@ -1267,7 +1267,7 @@
/*
** Enter paused mode.
*/
-STATIC STRING
+static STRING
CCpause(av)
char *av[];
{
@@ -1286,7 +1286,7 @@
/*
** Allow or disallow newsreaders.
*/
-STATIC STRING
+static STRING
CCreaders(av)
char *av[];
{
@@ -1322,7 +1322,7 @@
/*
** Re-exec ourselves.
*/
-STATIC STRING
+static STRING
CCxexec(av)
char *av[];
{
@@ -1358,7 +1358,7 @@
/*
** Reject remote readers.
*/
-STATIC STRING
+static STRING
CCreject(av)
char *av[];
{
@@ -1374,7 +1374,7 @@
/*
** Re-read all in-core data.
*/
-STATIC STRING
+static STRING
CCreload(av)
char *av[];
{
@@ -1477,7 +1477,7 @@
/*
** Renumber the active file.
*/
-STATIC STRING
+static STRING
CCrenumber(av)
char *av[];
{
@@ -1505,7 +1505,7 @@
/*
** Reserve a lock.
*/
-STATIC STRING
+static STRING
CCreserve(av)
char *av[];
{
@@ -1536,7 +1536,7 @@
/*
** Remove a newsgroup.
*/
-STATIC STRING
+static STRING
CCrmgroup(av)
char *av[];
{
@@ -1559,7 +1559,7 @@
/*
** Send a command line to an exploder.
*/
-STATIC STRING
+static STRING
CCsend(av)
char *av[];
{
@@ -1577,7 +1577,7 @@
/*
** Shut down the system.
*/
-STATIC STRING
+static STRING
CCshutdown(av)
char *av[];
{
@@ -1591,7 +1591,7 @@
/*
** Send a signal to a site's feed.
*/
-STATIC STRING
+static STRING
CCsignal(av)
char *av[];
{
@@ -1639,7 +1639,7 @@
/*
** Enter throttled mode.
*/
-STATIC STRING
+static STRING
CCthrottle(av)
char *av[];
{
@@ -1662,7 +1662,7 @@
/*
** Turn on or off performance monitoring
*/
-STATIC STRING CCtimer(char *av[]) {
+static STRING CCtimer(char *av[]) {
int value;
char *p;
@@ -1682,7 +1682,7 @@
/*
** Turn innd status creation on or off
*/
-STATIC STRING CCstatus(char *av[]) {
+static STRING CCstatus(char *av[]) {
int value;
char *p;
@@ -1702,7 +1702,7 @@
/*
** Add or remove tracing.
*/
-STATIC STRING
+static STRING
CCtrace(av)
char *av[];
{
@@ -1748,7 +1748,7 @@
** Split up the text into fields and stuff them in argv. Return the
** number of elements or -1 on error.
*/
-STATIC int
+static int
CCargsplit(p, end, argv, size)
register char *p;
register char *end;
@@ -1772,7 +1772,7 @@
/*
** Read function. Read and process the message.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
CCreader(cp)
CHANNEL *cp;
{
@@ -1956,7 +1956,7 @@
/*
** Called when a write-in-progress is done on the channel. Shouldn't happen.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
CCwritedone()
{
syslog(L_ERROR, "%s internal CCwritedone", LogName);
@@ -2056,7 +2056,7 @@
/*
** Restablish the control channel.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
CCresetup(s)
int s;
{
@@ -2072,7 +2072,7 @@
* Read a file containing lines of the form "newsgroup lowmark",
* and reset the low article number for the specified groups.
*/
-STATIC STRING CClowmark(char *av[])
+static STRING CClowmark(char *av[])
{
long lo;
char *line, *cp, *ret = NULL;
diff -Naur --recursive inn2-2.3.1.orig/innd/chan.c inn2-2.3.1/innd/chan.c
--- inn2-2.3.1.orig/innd/chan.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/chan.c Fri Jun 8 20:08:24 2001
@@ -22,22 +22,22 @@
readloop */
#define COMP_THRESHOLD 10
-STATIC FDSET RCHANmask;
-STATIC FDSET SCHANmask;
-STATIC FDSET WCHANmask;
-STATIC int SCHANcount;
-STATIC int CHANlastfd;
-STATIC int CHANlastsleepfd;
-STATIC int CHANccfd;
-STATIC int CHANtablesize;
-STATIC CHANNEL *CHANtable;
-STATIC CHANNEL *CHANcc;
-STATIC CHANNEL CHANnull = { CTfree, CSerror, -1 };
+static FDSET RCHANmask;
+static FDSET SCHANmask;
+static FDSET WCHANmask;
+static int SCHANcount;
+static int CHANlastfd;
+static int CHANlastsleepfd;
+static int CHANccfd;
+static int CHANtablesize;
+static CHANNEL *CHANtable;
+static CHANNEL *CHANcc;
+static CHANNEL CHANnull = { CTfree, CSerror, -1 };
#define PRIORITISE_REMCONN
#ifdef PRIORITISE_REMCONN
-STATIC int CHANrcfd;
-STATIC CHANNEL *CHANrc;
+static int CHANrcfd;
+static CHANNEL *CHANrc;
#endif /* PRIORITISE_REMCONN */
/*
@@ -670,7 +670,7 @@
** happens we want to do the I/O in chunks. We assume stdio's BUFSIZ is
** a good chunk value.
*/
-STATIC int
+static int
CHANwrite(int fd, char *p, long length)
{
int i;
@@ -726,7 +726,7 @@
/*
** Wakeup routine called after a write channel was put to sleep.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
CHANwakeup(CHANNEL *cp)
{
syslog(L_NOTICE, "%s wakeup", CHANname(cp));
@@ -737,7 +737,7 @@
/*
** Attempting to write would block; stop output or give up.
*/
-STATIC void
+static void
CHANwritesleep(CHANNEL *cp, char *p)
{
int i;
@@ -768,7 +768,7 @@
** We got an unknown error in select. Find out the culprit.
** Not really ready for production use yet, and it's expensive, too.
*/
-STATIC void
+static void
CHANdiagnose(void)
{
FDSET Test;
diff -Naur --recursive inn2-2.3.1.orig/innd/his.c inn2-2.3.1/innd/his.c
--- inn2-2.3.1.orig/innd/his.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/innd/his.c Fri Jun 8 20:08:24 2001
@@ -16,18 +16,18 @@
typedef enum {HIScachehit, HIScachemiss, HIScachedne} HISresult;
-STATIC char *HIShistpath = NULL;
-STATIC FILE *HISwritefp;
-STATIC int HISreadfd;
-STATIC int HISdirty;
-STATIC int HISincore = INND_DBZINCORE;
-STATIC _HIScache *HIScache;
-STATIC int HIScachesize; /* Number of entries in HIScache */
-STATIC int HIShitpos; /* The entry existed in the cache and in history */
-STATIC int HIShitneg; /* The entry existed in the cache but not in history */
-STATIC int HISmisses; /* The entry was not in the cache, but was in the history file */
-STATIC int HISdne; /* The entry was not in cache or history */
-STATIC time_t HISlastlog; /* Last time that we logged stats */
+static char *HIShistpath = NULL;
+static FILE *HISwritefp;
+static int HISreadfd;
+static int HISdirty;
+static int HISincore = INND_DBZINCORE;
+static _HIScache *HIScache;
+static int HIScachesize; /* Number of entries in HIScache */
+static int HIShitpos; /* The entry existed in the cache and in history */
+static int HIShitneg; /* The entry existed in the cache but not in history */
+static int HISmisses; /* The entry was not in the cache, but was in the history file */
+static int HISdne; /* The entry was not in cache or history */
+static time_t HISlastlog; /* Last time that we logged stats */
/*
** Put an entry into the history cache
@@ -145,7 +145,7 @@
}
-STATIC void HISlogstats() {
+static void HISlogstats() {
syslog(L_NOTICE, "ME HISstats %d hitpos %d hitneg %d missed %d dne",
HIShitpos, HIShitneg, HISmisses, HISdne);
HIShitpos = HIShitneg = HISmisses = HISdne = 0;
diff -Naur --recursive inn2-2.3.1.orig/innd/icd.c inn2-2.3.1/innd/icd.c
--- inn2-2.3.1.orig/innd/icd.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/icd.c Fri Jun 8 20:08:24 2001
@@ -17,10 +17,10 @@
typedef struct iovec IOVEC;
-STATIC char *ICDactpath = NULL;
-STATIC char *ICDactpointer;
-STATIC int ICDactfd;
-STATIC int ICDactsize;
+static char *ICDactpath = NULL;
+static char *ICDactpointer;
+static int ICDactfd;
+static int ICDactsize;
/*
@@ -48,7 +48,7 @@
/*
** Close the active file, releasing its resources.
*/
-STATIC void
+static void
ICDcloseactive()
{
if (ICDactpointer) {
@@ -151,7 +151,7 @@
/*
** Use writev() to replace the active file.
*/
-STATIC BOOL ICDwritevactive(IOVEC *vp, int vpcount)
+static BOOL ICDwritevactive(IOVEC *vp, int vpcount)
{
static char *BACKUP = NULL;
static char *NEWACT = NULL;
diff -Naur --recursive inn2-2.3.1.orig/innd/innd.c inn2-2.3.1/innd/innd.c
--- inn2-2.3.1.orig/innd/innd.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/innd.c Fri Jun 8 20:08:24 2001
@@ -24,10 +24,10 @@
#if defined(HAVE_SETBUFFER)
# define SETBUFFER(F, buff, size) setbuffer((F), (buff), (size))
-STATIC int LogBufferSize = 4096;
+static int LogBufferSize = 4096;
#else
# define SETBUFFER(F, buff, size) setbuf((F), (buff))
-STATIC int LogBufferSize = BUFSIZ;
+static int LogBufferSize = BUFSIZ;
#endif /* defined(HAVE_SETBUFFER) */
@@ -57,13 +57,13 @@
#endif /* defined(lint) || defined(__CENTERLINE__) */
-STATIC char *ErrlogBuffer;
-STATIC char *LogBuffer;
-STATIC char *ERRLOG = NULL;
-STATIC char *LOG = NULL;
-STATIC char *PID = NULL;
-STATIC uid_t NewsUID;
-STATIC gid_t NewsGID;
+static char *ErrlogBuffer;
+static char *LogBuffer;
+static char *ERRLOG = NULL;
+static char *LOG = NULL;
+static char *PID = NULL;
+static uid_t NewsUID;
+static gid_t NewsGID;
@@ -108,7 +108,7 @@
** Turn any \r or \n in text into spaces. Used to splice back multi-line
** headers into a single line.
*/
-STATIC char *
+static char *
Join(text)
register char *text;
{
@@ -315,7 +315,7 @@
/*
** Stat our control directory and see who should own things.
*/
-STATIC BOOL
+static BOOL
GetNewsOwnerships()
{
struct stat Sb;
@@ -509,7 +509,7 @@
** Set the limit on the number of open files we can have. I don't
** like having to do this.
*/
-STATIC void
+static void
SetDescriptorLimit(i)
int i;
{
@@ -531,7 +531,7 @@
/*
** Signal handler to catch SIGTERM and queue a clean shutdown.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
CatchTerminate(s)
int s;
{
@@ -546,7 +546,7 @@
/*
** Print a usage message and exit.
*/
-STATIC NORETURN
+static NORETURN
Usage()
{
(void)fprintf(stderr, "Usage error.\n");
diff -Naur --recursive inn2-2.3.1.orig/innd/lc.c inn2-2.3.1/innd/lc.c
--- inn2-2.3.1.orig/innd/lc.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/innd/lc.c Fri Jun 8 20:08:24 2001
@@ -14,14 +14,14 @@
#if defined(HAVE_UNIX_DOMAIN_SOCKETS)
#include <sys/un.h>
-STATIC char *LCpath = NULL;
-STATIC CHANNEL *LCchan;
+static char *LCpath = NULL;
+static CHANNEL *LCchan;
/*
** Read function. Accept the connection and create an NNTP channel.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
LCreader(cp)
CHANNEL *cp;
{
@@ -49,7 +49,7 @@
/*
** Write-done function. Shouldn't happen.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
LCwritedone()
{
syslog(L_ERROR, "%s internal LCwritedone", LogName);
diff -Naur --recursive inn2-2.3.1.orig/innd/nc.c inn2-2.3.1/innd/nc.c
--- inn2-2.3.1.orig/innd/nc.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/nc.c Fri Jun 8 20:08:24 2001
@@ -45,8 +45,8 @@
static FUNCTYPE NCtakethis();
static FUNCTYPE NCwritedone();
-STATIC int NCcount; /* Number of open connections */
-STATIC NCDISPATCH NCcommands[] = {
+static int NCcount; /* Number of open connections */
+static NCDISPATCH NCcommands[] = {
#if 0
{ "article", NCarticle },
#else
@@ -74,12 +74,12 @@
{ "xhdr", NC_unimp },
{ "xpath", NCxpath },
};
-STATIC char *NCquietlist[] = {
+static char *NCquietlist[] = {
INND_QUIET_BADLIST
};
-STATIC char NCterm[] = "\r\n";
-STATIC char NCdot[] = "." ;
-STATIC char NCbadcommand[] = NNTP_BAD_COMMAND;
+static char NCterm[] = "\r\n";
+static char NCdot[] = "." ;
+static char NCbadcommand[] = NNTP_BAD_COMMAND;
/*
** Clear the WIP entry for the given channel
@@ -163,7 +163,7 @@
/*
** If a Message-ID is bad, write a reject message and return TRUE.
*/
-STATIC BOOL
+static BOOL
NCbadid(CHANNEL *cp, char *p)
{
if (ARTidok(p))
@@ -179,7 +179,7 @@
** We have an entire article collected; try to post it. If we're
** not running, drop the article or just pause and reschedule.
*/
-STATIC void
+static void
NCpostit(CHANNEL *cp)
{
STRING response;
@@ -242,7 +242,7 @@
** Write-done function. Close down or set state for what we expect to
** read next.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NCwritedone(CHANNEL *cp)
{
switch (cp->State) {
@@ -271,7 +271,7 @@
/*
** The "head" command.
*/
-STATIC FUNCTYPE NChead(CHANNEL *cp)
+static FUNCTYPE NChead(CHANNEL *cp)
{
char *p;
TOKEN *token;
@@ -307,7 +307,7 @@
/*
** The "stat" command.
*/
-STATIC FUNCTYPE NCstat(CHANNEL *cp)
+static FUNCTYPE NCstat(CHANNEL *cp)
{
char *p;
TOKEN *token;
@@ -345,7 +345,7 @@
** The "authinfo" command. Actually, we come in here whenever the
** channel is in CSgetauth state and we just got a command.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NCauthinfo(CHANNEL *cp)
{
static char AUTHINFO[] = "authinfo ";
@@ -398,7 +398,7 @@
/*
** The "help" command.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NChelp(CHANNEL *cp)
{
static char LINE1[] = "For more information, contact \"";
@@ -427,7 +427,7 @@
** The "ihave" command. Check the Message-ID, and see if we want the
** article or not. Set the state appropriately.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NCihave(CHANNEL *cp)
{
char *p;
@@ -524,7 +524,7 @@
** The "xbatch" command. Set the state appropriately.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NCxbatch(CHANNEL *cp)
{
char *p;
@@ -574,7 +574,7 @@
/*
** The "list" command. Send the active file.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NClist(CHANNEL *cp)
{
char *p;
@@ -627,7 +627,7 @@
/*
** The "mode" command. Hand off the channel.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NCmode(CHANNEL *cp)
{
char *p;
@@ -661,7 +661,7 @@
/*
** The "quit" command. Acknowledge, and set the state to closing down.
*/
-STATIC FUNCTYPE NCquit(CHANNEL *cp)
+static FUNCTYPE NCquit(CHANNEL *cp)
{
cp->State = CSwritegoodbye;
NCwritereply(cp, NNTP_GOODBYE_ACK);
@@ -671,7 +671,7 @@
/*
** The "xpath" command. Return the paths for an article is.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NCxpath(CHANNEL *cp)
{
/* not available for storageapi */
@@ -682,7 +682,7 @@
/*
** The catch-all for inimplemented commands.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NC_unimp(CHANNEL *cp)
{
char *p;
@@ -702,7 +702,7 @@
/*
** Remove the \r\n and leading dot escape that the NNTP protocol adds.
*/
-STATIC void
+static void
NCclean(BUFFER *bp)
{
char *end;
@@ -730,7 +730,7 @@
** Check whatever data is available on the channel. If we got the
** full amount (i.e., the command or the whole article) process it.
*/
-STATIC FUNCTYPE NCproc(CHANNEL *cp)
+static FUNCTYPE NCproc(CHANNEL *cp)
{
char *p;
NCDISPATCH *dp;
@@ -1189,7 +1189,7 @@
** Read whatever data is available on the channel. If we got the
** full amount (i.e., the command or the whole article) process it.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NCreader(CHANNEL *cp)
{
int i;
@@ -1334,7 +1334,7 @@
** The "check" command. Check the Message-ID, and see if we want the
** article or not. Stay in command state.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
NCcheck(CHANNEL *cp)
{
char *p;
@@ -1420,7 +1420,7 @@
** The "takethis" command. Article follows.
** Remember <id> for later ack.
*/
-STATIC FUNCTYPE NCtakethis(CHANNEL *cp)
+static FUNCTYPE NCtakethis(CHANNEL *cp)
{
char *p;
int msglen;
diff -Naur --recursive inn2-2.3.1.orig/innd/newsfeeds.c inn2-2.3.1/innd/newsfeeds.c
--- inn2-2.3.1.orig/innd/newsfeeds.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/newsfeeds.c Fri Jun 8 20:08:24 2001
@@ -10,14 +10,14 @@
#include "innd.h"
-STATIC SITE SITEnull;
-STATIC char *SITEfeedspath = NULL;
+static SITE SITEnull;
+static char *SITEfeedspath = NULL;
/*
** Return a copy of an array of strings.
*/
-STATIC char **
+static char **
SITEcopystrings(av)
char **av;
{
@@ -112,7 +112,7 @@
/*
** Modify "subbed" according to the patterns in "patlist."
*/
-STATIC void
+static void
SITEsetlist(patlist, subbed, poison, poisonEntry)
char **patlist;
char *subbed;
diff -Naur --recursive inn2-2.3.1.orig/innd/ng.c inn2-2.3.1/innd/ng.c
--- inn2-2.3.1.orig/innd/ng.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/ng.c Fri Jun 8 20:08:24 2001
@@ -40,11 +40,11 @@
} NGHASH;
-STATIC BUFFER NGdirs;
-STATIC BUFFER NGnames;
-STATIC NGHASH NGHtable[NGH_SIZE];
-STATIC int NGHbuckets;
-STATIC int NGHcount;
+static BUFFER NGdirs;
+static BUFFER NGnames;
+static NGHASH NGHtable[NGH_SIZE];
+static int NGHbuckets;
+static int NGHcount;
@@ -53,7 +53,7 @@
** rough order of their activity. Will be better if we write a "counts"
** file sometime.
*/
-STATIC int
+static int
NGcompare(p1, p2)
CPOINTER p1;
CPOINTER p2;
@@ -70,7 +70,7 @@
/*
** Convert a newsgroup name into a directory name.
*/
-STATIC void
+static void
NGdirname(p)
register char *p;
{
@@ -85,7 +85,7 @@
** not to write NUL's into the in-core copy, since we're either mmap(2)'d,
** or we want to just blat it out to disk later.
*/
-STATIC BOOL NGparseentry(NEWSGROUP *ngp, char *p, char *end)
+static BOOL NGparseentry(NEWSGROUP *ngp, char *p, char *end)
{
register char *q;
register unsigned int j;
diff -Naur --recursive inn2-2.3.1.orig/innd/proc.c inn2-2.3.1/innd/proc.c
--- inn2-2.3.1.orig/innd/proc.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/proc.c Fri Jun 8 20:08:24 2001
@@ -10,15 +10,15 @@
#include "innd.h"
-STATIC PROCESS *PROCtable;
-STATIC int PROCtablesize;
-STATIC PROCESS PROCnull = { PSfree };
+static PROCESS *PROCtable;
+static int PROCtablesize;
+static PROCESS PROCnull = { PSfree };
/*
** Collect dead processes.
*/
-STATIC void
+static void
PROCreap()
{
int status;
@@ -50,7 +50,7 @@
/*
** Signal handler that collects the processes, then resets the signal.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
PROCcatchsignal(s)
int s;
{
diff -Naur --recursive inn2-2.3.1.orig/innd/rc.c inn2-2.3.1/innd/rc.c
--- inn2-2.3.1.orig/innd/rc.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/rc.c Fri Jun 8 20:08:24 2001
@@ -63,14 +63,14 @@
time_t Expires;
} REMOTETABLE;
-STATIC char *RCslaveflag;
-STATIC char *RCnnrpd = NULL;
-STATIC char *RCnntpd = NULL;
-STATIC CHANNEL *RCchan;
-STATIC REMOTEHOST_DATA *RCpeerlistfile;
-STATIC REMOTEHOST *RCpeerlist;
-STATIC int RCnpeerlist;
-STATIC char RCbuff[BIG_BUFFER];
+static char *RCslaveflag;
+static char *RCnnrpd = NULL;
+static char *RCnntpd = NULL;
+static CHANNEL *RCchan;
+static REMOTEHOST_DATA *RCpeerlistfile;
+static REMOTEHOST *RCpeerlist;
+static int RCnpeerlist;
+static char RCbuff[BIG_BUFFER];
#define PEER "peer"
#define GROUP "group"
@@ -107,10 +107,10 @@
/*
** Stuff needed for limiting incoming connects.
*/
-STATIC char RCterm[] = "\r\n";
-STATIC REMOTETABLE remotetable[REMOTETABLESIZE];
-STATIC int remotecount;
-STATIC int remotefirst;
+static char RCterm[] = "\r\n";
+static REMOTETABLE remotetable[REMOTETABLESIZE];
+static int remotecount;
+static int remotefirst;
/*
@@ -266,7 +266,7 @@
/*
** Called when input is ready to read. Shouldn't happen.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
RCrejectreader(CHANNEL *cp)
{
syslog(L_ERROR, "%s internal RCrejectreader (%s)", LogName,
@@ -277,7 +277,7 @@
/*
** Write-done function for rejects.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
RCrejectwritedone(register CHANNEL *cp)
{
switch (cp->State) {
@@ -344,7 +344,7 @@
** Read function. Accept the connection and either create an NNTP channel
** or spawn an nnrpd to handle it.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
RCreader(CHANNEL *cp)
{
int fd;
@@ -540,7 +540,7 @@
/*
** Write-done function. Shouldn't happen.
*/
-STATIC FUNCTYPE
+static FUNCTYPE
RCwritedone()
{
syslog(L_ERROR, "%s internal RCwritedone", LogName);
@@ -655,7 +655,7 @@
** first element of the address list in modern systems, while it's a field
** name in old ones.
*/
-STATIC void
+static void
RCreadfile (REMOTEHOST_DATA **data, REMOTEHOST **list, int *count,
char *filename)
{
diff -Naur --recursive inn2-2.3.1.orig/innd/site.c inn2-2.3.1/innd/site.c
--- inn2-2.3.1.orig/innd/site.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/site.c Fri Jun 8 20:08:24 2001
@@ -11,17 +11,17 @@
#include "innd.h"
-STATIC int SITEcount;
-STATIC int SITEhead = NOSITE;
-STATIC int SITEtail = NOSITE;
-STATIC char SITEshell[] = _PATH_SH;
+static int SITEcount;
+static int SITEhead = NOSITE;
+static int SITEtail = NOSITE;
+static char SITEshell[] = _PATH_SH;
/*
** Called when input is ready to read. Shouldn't happen.
*/
/* ARGSUSED0 */
-STATIC FUNCTYPE SITEreader(CHANNEL *cp)
+static FUNCTYPE SITEreader(CHANNEL *cp)
{
syslog(L_ERROR, "%s internal SITEreader", LogName);
}
@@ -31,7 +31,7 @@
** Called when write is done. No-op.
*/
/* ARGSUSED0 */
-STATIC FUNCTYPE SITEwritedone(CHANNEL *cp)
+static FUNCTYPE SITEwritedone(CHANNEL *cp)
{
}
@@ -111,7 +111,7 @@
/*
** Find the oldest "file feed" site and buffer it.
*/
-STATIC void SITEbufferoldest(void)
+static void SITEbufferoldest(void)
{
SITE *sp;
BUFFER *bp;
@@ -171,7 +171,7 @@
/*
* * Bilge Site's Channel out buffer.
*/
-STATIC BOOL SITECHANbilge(SITE *sp)
+static BOOL SITECHANbilge(SITE *sp)
{
int fd;
int i;
@@ -217,7 +217,7 @@
** Check if we need to write out the site's buffer. If we're buffered
** or the feed is backed up, this gets a bit complicated.
*/
-STATIC void SITEflushcheck(SITE *sp, BUFFER *bp)
+static void SITEflushcheck(SITE *sp, BUFFER *bp)
{
int i;
CHANNEL *cp;
@@ -315,7 +315,7 @@
/*
** Send the desired data about an article down a channel.
*/
-STATIC void SITEwritefromflags(SITE *sp, ARTDATA *Data)
+static void SITEwritefromflags(SITE *sp, ARTDATA *Data)
{
static char ITEMSEP[] = " ";
static char NL[] = "\n";
@@ -547,7 +547,7 @@
** The channel was sleeping because we had to spool our output to
** a file. Flush and restart.
*/
-STATIC FUNCTYPE SITEspoolwake(CHANNEL *cp)
+static FUNCTYPE SITEspoolwake(CHANNEL *cp)
{
SITE *sp;
int *ip;
@@ -570,7 +570,7 @@
** Start up a process for a channel, or a spool to a file if we can't.
** Create a channel for the site to talk to.
*/
-STATIC BOOL SITEstartprocess(SITE *sp)
+static BOOL SITEstartprocess(SITE *sp)
{
pid_t i;
STRING argv[MAX_BUILTIN_ARGV];
@@ -637,7 +637,7 @@
/*
** Set up a site for internal buffering.
*/
-STATIC void SITEbuffer(SITE *sp)
+static void SITEbuffer(SITE *sp)
{
BUFFER *bp;
diff -Naur --recursive inn2-2.3.1.orig/innd/tcl.c inn2-2.3.1/innd/tcl.c
--- inn2-2.3.1.orig/innd/tcl.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/innd/tcl.c Fri Jun 8 20:08:24 2001
@@ -20,8 +20,8 @@
BUFFER *TCLCurrArticle;
ARTDATA *TCLCurrData;
-STATIC char *TCLSTARTUP = NULL;
-STATIC char *TCLFILTER = NULL;
+static char *TCLSTARTUP = NULL;
+static char *TCLFILTER = NULL;
void
diff -Naur --recursive inn2-2.3.1.orig/innd/wip.c inn2-2.3.1/innd/wip.c
--- inn2-2.3.1.orig/innd/wip.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/innd/wip.c Fri Jun 8 20:08:24 2001
@@ -17,7 +17,7 @@
#define WIPTABLESIZE 1024
#define WIP_ARTMAX 300 /* innfeed default max send time */
-STATIC WIP *WIPtable[WIPTABLESIZE]; /* Top level of the WIP hash table */
+static WIP *WIPtable[WIPTABLESIZE]; /* Top level of the WIP hash table */
void WIPsetup(void) {
memset(WIPtable, '\0', sizeof(WIPtable));
diff -Naur --recursive inn2-2.3.1.orig/lib/clientactive.c inn2-2.3.1/lib/clientactive.c
--- inn2-2.3.1.orig/lib/clientactive.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/clientactive.c Fri Jun 8 20:08:24 2001
@@ -12,8 +12,8 @@
#include "macros.h"
-STATIC char CApathname[256];
-STATIC FILE *CAfp;
+static char CApathname[256];
+static FILE *CAfp;
/*
diff -Naur --recursive inn2-2.3.1.orig/lib/getconfig.c inn2-2.3.1/lib/getconfig.c
--- inn2-2.3.1.orig/lib/getconfig.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/getconfig.c Fri Jun 8 20:08:24 2001
@@ -11,9 +11,9 @@
#include "paths.h"
/* Global and initialized; to work around SunOS -Bstatic bug, sigh. */
-STATIC char ConfigBuff[SMBUF] = "";
-STATIC char *ConfigBit;
-STATIC int ConfigBitsize;
+static char ConfigBuff[SMBUF] = "";
+static char *ConfigBit;
+static int ConfigBitsize;
#define TEST_CONFIG(a, b) \
{ \
int byte, offset; \
diff -Naur --recursive inn2-2.3.1.orig/lib/getmodaddr.c inn2-2.3.1/lib/getmodaddr.c
--- inn2-2.3.1.orig/lib/getmodaddr.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/getmodaddr.c Fri Jun 8 20:08:24 2001
@@ -12,8 +12,8 @@
#include "nntp.h"
-STATIC char GMApathname[256];
-STATIC FILE *GMAfp = NULL;
+static char GMApathname[256];
+static FILE *GMAfp = NULL;
/*
diff -Naur --recursive inn2-2.3.1.orig/lib/hash.c inn2-2.3.1/lib/hash.c
--- inn2-2.3.1.orig/lib/hash.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/hash.c Fri Jun 8 20:08:24 2001
@@ -11,7 +11,7 @@
#include "macros.h"
#include "md5.h"
-STATIC HASH empty= { { 0, 0, 0, 0, 0, 0, 0, 0,
+static HASH empty= { { 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0 }};
/* cipoint - where in this message-ID does it become case-insensitive?
@@ -27,7 +27,7 @@
*
* Returns: pointer into s, or NULL for "nowhere"
*/
-STATIC char *cipoint(char *s, size_t size) {
+static char *cipoint(char *s, size_t size) {
char *p;
static char post[] = "postmaster";
static int plen = sizeof(post) - 1;
@@ -96,10 +96,10 @@
** messages and logs.
*/
char *HashToText(const HASH hash) {
- STATIC char hex[] = "0123456789ABCDEF";
+ static char hex[] = "0123456789ABCDEF";
char *p;
unsigned int i;
- STATIC char hashstr[(sizeof(HASH)*2) + 1];
+ static char hashstr[(sizeof(HASH)*2) + 1];
for (p = (char *)&hash, i = 0; i < sizeof(HASH); i++, p++) {
hashstr[i * 2] = hex[(*p & 0xF0) >> 4];
@@ -112,7 +112,7 @@
/*
** Converts a hex digit and converts it to a int
*/
-STATIC int hextodec(const int c) {
+static int hextodec(const int c) {
return isdigit(c) ? (c - '0') : ((c - 'A') + 10);
}
diff -Naur --recursive inn2-2.3.1.orig/lib/inndcomm.c inn2-2.3.1/lib/inndcomm.c
--- inn2-2.3.1.orig/lib/inndcomm.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/lib/inndcomm.c Fri Jun 8 20:08:24 2001
@@ -37,13 +37,13 @@
#define MIN_BUFFER_SIZE 4096
-STATIC char *ICCsockname = NULL;
+static char *ICCsockname = NULL;
#if defined(HAVE_UNIX_DOMAIN_SOCKETS)
-STATIC struct sockaddr_un ICCserv;
-STATIC struct sockaddr_un ICCclient;
+static struct sockaddr_un ICCserv;
+static struct sockaddr_un ICCclient;
#endif /* defined(HAVE_UNIX_DOMAIN_SOCKETS) */
-STATIC int ICCfd;
-STATIC int ICCtimeout;
+static int ICCfd;
+static int ICCtimeout;
char *ICCfailure;
@@ -155,7 +155,7 @@
/*
** Get the server's pid.
*/
-STATIC pid_t
+static pid_t
ICCserverpid()
{
pid_t pid;
@@ -177,7 +177,7 @@
** Cache the pid since a rebooted server won't know about our pending
** message.
*/
-STATIC BOOL
+static BOOL
ICCserveralive(pid)
pid_t pid;
{
diff -Naur --recursive inn2-2.3.1.orig/lib/makedir.c inn2-2.3.1/lib/makedir.c
--- inn2-2.3.1.orig/lib/makedir.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/makedir.c Fri Jun 8 20:08:24 2001
@@ -9,7 +9,7 @@
/*
** Try to make one directory. Return FALSE on error.
*/
-STATIC BOOL MakeDir(char *Name)
+static BOOL MakeDir(char *Name)
{
struct stat Sb;
diff -Naur --recursive inn2-2.3.1.orig/lib/reservedfd.c inn2-2.3.1/lib/reservedfd.c
--- inn2-2.3.1.orig/lib/reservedfd.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/reservedfd.c Fri Jun 8 20:08:24 2001
@@ -10,8 +10,8 @@
#include "libinn.h"
-STATIC FILE **Reserved_fd = NULL;
-STATIC int Maxfd = -1;
+static FILE **Reserved_fd = NULL;
+static int Maxfd = -1;
BOOL fdreserve(int fdnum) {
static int allocated = 0;
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/article.c inn2-2.3.1/nnrpd/article.c
--- inn2-2.3.1.orig/nnrpd/article.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/nnrpd/article.c Fri Jun 8 20:08:24 2001
@@ -40,27 +40,27 @@
STRING Item;
} SENDDATA;
-STATIC char ARTnotingroup[] = NNTP_NOTINGROUP;
-STATIC char ARTnoartingroup[] = NNTP_NOARTINGRP;
-STATIC char ARTnocurrart[] = NNTP_NOCURRART;
-STATIC ARTHANDLE *ARThandle = NULL;
-STATIC int ARTxreffield = 0;
-STATIC SENDDATA SENDbody = {
+static char ARTnotingroup[] = NNTP_NOTINGROUP;
+static char ARTnoartingroup[] = NNTP_NOARTINGRP;
+static char ARTnocurrart[] = NNTP_NOCURRART;
+static ARTHANDLE *ARThandle = NULL;
+static int ARTxreffield = 0;
+static SENDDATA SENDbody = {
STbody, NNTP_BODY_FOLLOWS_VAL, "body"
};
-STATIC SENDDATA SENDarticle = {
+static SENDDATA SENDarticle = {
STarticle, NNTP_ARTICLE_FOLLOWS_VAL, "article"
};
-STATIC SENDDATA SENDstat = {
+static SENDDATA SENDstat = {
STstat, NNTP_NOTHING_FOLLOWS_VAL, "status"
};
-STATIC SENDDATA SENDhead = {
+static SENDDATA SENDhead = {
SThead, NNTP_HEAD_FOLLOWS_VAL, "head"
};
-STATIC struct iovec iov[IOV_MAX];
-STATIC int queued_iov = 0;
+static struct iovec iov[IOV_MAX];
+static int queued_iov = 0;
BOOL PushIOvRateLimited(void) {
struct timeval start, end;
@@ -158,8 +158,8 @@
return TRUE;
}
-STATIC char *_IO_buffer_ = NULL;
-STATIC int highwater = 0;
+static char *_IO_buffer_ = NULL;
+static int highwater = 0;
BOOL PushIOb(void) {
fflush(stdout);
@@ -300,7 +300,7 @@
return FALSE;
}
-STATIC BOOL ARTinstorebyartnum(int artnum)
+static BOOL ARTinstorebyartnum(int artnum)
{
ARTHANDLE *art;
struct timeval stv, etv;
@@ -327,7 +327,7 @@
/*
** If the article name is valid, open it and stuff in the ID.
*/
-STATIC BOOL ARTopen(int artnum)
+static BOOL ARTopen(int artnum)
{
static ARTNUM save_artnum;
TOKEN token;
@@ -353,7 +353,7 @@
/*
** Open the article for a given Message-ID.
*/
-STATIC BOOL ARTopenbyid(char *msg_id, ARTNUM *ap)
+static BOOL ARTopenbyid(char *msg_id, ARTNUM *ap)
{
char *p;
HASH hash = HashMessageID(msg_id);
@@ -375,7 +375,7 @@
/*
** Send a (part of) a file to stdout, doing newline and dot conversion.
*/
-STATIC void ARTsendmmap(SENDTYPE what)
+static void ARTsendmmap(SENDTYPE what)
{
char *p, *q, *r, *s, *path, *xref, *virtualpath;
struct timeval stv, etv;
@@ -774,7 +774,7 @@
}
-STATIC BOOL CMDgetrange(int ac, char *av[], ARTRANGE *rp, BOOL *DidReply)
+static BOOL CMDgetrange(int ac, char *av[], ARTRANGE *rp, BOOL *DidReply)
{
char *p;
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/commands.c inn2-2.3.1/nnrpd/commands.c
--- inn2-2.3.1.orig/nnrpd/commands.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/nnrpd/commands.c Fri Jun 8 20:08:24 2001
@@ -28,39 +28,39 @@
extern int LLOGenable;
-STATIC LISTINFO INFOactive = {
+static LISTINFO INFOactive = {
NULL, _PATH_ACTIVE, TRUE, "active newsgroups",
"Newsgroups in form \"group high low flags\""
};
-STATIC LISTINFO INFOactivetimes = {
+static LISTINFO INFOactivetimes = {
NULL, _PATH_ACTIVETIMES, FALSE, "creation times",
"Group creations in form \"name time who\""
};
-STATIC LISTINFO INFOdistribs = {
+static LISTINFO INFOdistribs = {
NULL, _PATH_NNRPDIST, FALSE, "newsgroup distributions",
"Distributions in form \"area description\""
};
-STATIC LISTINFO INFOsubs = {
+static LISTINFO INFOsubs = {
NULL, _PATH_NNRPSUBS, FALSE, "automatic group subscriptions",
"Subscriptions in form \"group\""
};
-STATIC LISTINFO INFOdistribpats = {
+static LISTINFO INFOdistribpats = {
NULL, _PATH_DISTPATS, FALSE, "distribution patterns",
"Default distributions in form \"weight:pattern:value\""
};
-STATIC LISTINFO INFOgroups = {
+static LISTINFO INFOgroups = {
NULL, _PATH_NEWSGROUPS, FALSE, "newsgroup descriptions",
"Descriptions in form \"group description\""
};
-STATIC LISTINFO INFOmoderators = {
+static LISTINFO INFOmoderators = {
NULL, _PATH_MODERATORS, FALSE, "moderator patterns",
"Newsgroup moderators in form \"group-pattern:mail-address-pattern\""
};
-STATIC LISTINFO INFOschema = {
+static LISTINFO INFOschema = {
NULL, _PATH_SCHEMA, TRUE, "overview format",
"Order of fields in overview database"
};
-STATIC LISTINFO INFOmotd = {
+static LISTINFO INFOmotd = {
NULL, _PATH_MOTD, FALSE, "motd",
"Message of the day text."
};
@@ -564,7 +564,7 @@
Reply("%d What?\r\n", NNTP_BAD_COMMAND_VAL);
}
-STATIC int GroupCompare(const void *a1, const void* b1) {
+static int GroupCompare(const void *a1, const void* b1) {
const GROUPDATA *a = a1;
const GROUPDATA *b = b1;
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/loadave.c inn2-2.3.1/nnrpd/loadave.c
--- inn2-2.3.1.orig/nnrpd/loadave.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/nnrpd/loadave.c Fri Jun 8 20:08:24 2001
@@ -32,7 +32,7 @@
#else
#include <nlist.h>
-STATIC struct nlist NameList[] = {
+static struct nlist NameList[] = {
{ "_avenrun" },
#define X_AVENRUN 0
{ NULL }
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/misc.c inn2-2.3.1/nnrpd/misc.c
--- inn2-2.3.1.orig/nnrpd/misc.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/nnrpd/misc.c Fri Jun 8 20:08:24 2001
@@ -23,9 +23,9 @@
#include "sasl_config.h"
#endif
-STATIC BOOL setup = FALSE;
-STATIC FILE *hfp = NULL;
-STATIC ino_t ino = 0;
+static BOOL setup = FALSE;
+static FILE *hfp = NULL;
+static ino_t ino = 0;
#define ASCtoNUM(c) ((c) - '0')
#define CHARStoINT(c1, c2) (ASCtoNUM((c1)) * 10 + ASCtoNUM((c2)))
@@ -751,7 +751,7 @@
/*
* Get the stored postrecord for that IP
*/
-STATIC int
+static int
GetPostRecord(path, lastpost, lastsleep, lastn)
char *path;
long *lastpost;
@@ -800,7 +800,7 @@
/*
* Store the postrecord for that IP
*/
-STATIC int
+static int
StorePostRecord(path, lastpost, lastsleep, lastn)
char *path;
time_t lastpost;
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/newnews.c inn2-2.3.1/nnrpd/newnews.c
--- inn2-2.3.1.orig/nnrpd/newnews.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/nnrpd/newnews.c Fri Jun 8 20:08:24 2001
@@ -19,7 +19,7 @@
/*
** see if its distribution is in the list.
*/
-STATIC BOOL DistMatches(ARTHANDLE *art, char **distribs) {
+static BOOL DistMatches(ARTHANDLE *art, char **distribs) {
char **dp;
char *p, *p1;
char *q;
@@ -51,7 +51,7 @@
/*
** get Xref header
*/
-STATIC char *GetXref(ARTHANDLE *art) {
+static char *GetXref(ARTHANDLE *art) {
char *p, *p1;
char *q;
static char buff[BIG_BUFFER];
@@ -84,7 +84,7 @@
/*
** get Message-ID header
*/
-STATIC char *GetMsgid(ARTHANDLE *art) {
+static char *GetMsgid(ARTHANDLE *art) {
char *p, *p1;
char *q;
static char buff[BIG_BUFFER];
@@ -118,7 +118,7 @@
** Split newsgroup list into array of newsgroups. Return static pointer,
** or NULL if there are no newsgroup.
*/
-STATIC char **GetGroups(char *p) {
+static char **GetGroups(char *p) {
static int size;
static char **list;
int i, len;
@@ -168,7 +168,7 @@
return i ? list : NULL;
}
-STATIC BOOL HaveSeen(BOOL AllGroups, char *group, char **groups, char **xrefs) {
+static BOOL HaveSeen(BOOL AllGroups, char *group, char **groups, char **xrefs) {
char *list[2];
list[1] = NULL;
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/nnrpd.c inn2-2.3.1/nnrpd/nnrpd.c
--- inn2-2.3.1.orig/nnrpd/nnrpd.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/nnrpd/nnrpd.c Fri Jun 8 20:08:24 2001
@@ -75,27 +75,27 @@
BOOL ForceReadOnly = FALSE;
char LocalLogFileName[256];
-STATIC double STATstart;
-STATIC double STATfinish;
-STATIC char *PushedBack;
+static double STATstart;
+static double STATfinish;
+static char *PushedBack;
#if !defined(_HPUX_SOURCE)
-STATIC char *TITLEstart;
-STATIC char *TITLEend;
+static char *TITLEstart;
+static char *TITLEend;
#endif /* !defined(_HPUX_SOURCE) */
-STATIC sig_atomic_t ChangeTrace;
+static sig_atomic_t ChangeTrace;
BOOL DaemonMode = FALSE;
#if HAVE_GETSPNAM
-STATIC char *ShadowGroup;
+static char *ShadowGroup;
#endif
#if defined(DO_NNRP_GETHOSTBYADDR)
-STATIC char *HostErrorStr;
+static char *HostErrorStr;
#endif /* defined(DO_NNRP_GETHOSTBYADDR) */
extern FUNCTYPE CMDauthinfo();
extern FUNCTYPE CMDdate();
extern FUNCTYPE CMDfetch();
extern FUNCTYPE CMDgroup();
-STATIC FUNCTYPE CMDhelp();
+static FUNCTYPE CMDhelp();
extern FUNCTYPE CMDlist();
extern FUNCTYPE CMDmode();
extern FUNCTYPE CMDnewgroups();
@@ -115,9 +115,9 @@
int LLOGenable;
extern int TrackClient();
-STATIC char CMDfetchhelp[] = "[MessageID|Number]";
+static char CMDfetchhelp[] = "[MessageID|Number]";
-STATIC CMDENT CMDtable[] = {
+static CMDENT CMDtable[] = {
{ "authinfo", CMDauthinfo, FALSE, 3, CMDany,
"user Name|pass Password|generic <prog> <args>" },
#ifdef HAVE_SSL
@@ -243,7 +243,7 @@
** The "help" command.
*/
/* ARGSUSED0 */
-STATIC FUNCTYPE
+static FUNCTYPE
CMDhelp(int ac, char *av[])
{
CMDENT *cp;
@@ -313,7 +313,7 @@
/*
** Overwrite the original argv so that ps will show what's going on.
*/
-STATIC void
+static void
TITLEset(what)
char *what;
{
@@ -358,7 +358,7 @@
** Convert an IP address to a hostname. Don't trust the reverse lookup,
** since anyone can fake .in-addr.arpa entries.
*/
-STATIC BOOL
+static BOOL
Address2Name(INADDR *ap, char *hostname, int i)
{
char *p;
@@ -416,7 +416,7 @@
/*
** Determine access rights of the client.
*/
-STATIC void StartConnection()
+static void StartConnection()
{
struct sockaddr_in sin;
ARGTYPE length;
@@ -637,7 +637,7 @@
/*
** Got a signal; toggle tracing.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
ToggleTrace(s)
int s;
{
@@ -650,7 +650,7 @@
/*
** Got a SIGPIPE; exit cleanly
*/
-STATIC SIGHANDLER
+static SIGHANDLER
CatchPipe(s)
int s;
{
@@ -660,7 +660,7 @@
/*
** Got a signal; wait for children.
*/
-STATIC SIGHANDLER
+static SIGHANDLER
WaitChild(s)
int s;
{
@@ -677,7 +677,7 @@
#endif
}
-STATIC void SetupDaemon(void) {
+static void SetupDaemon(void) {
BOOL val;
#if defined(DO_PERL)
@@ -720,7 +720,7 @@
/*
** Print a usage message and exit.
*/
-STATIC void
+static void
Usage()
{
(void)fprintf(stderr, "Usage error.\n");
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/post.c inn2-2.3.1/nnrpd/post.c
--- inn2-2.3.1.orig/nnrpd/post.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/nnrpd/post.c Fri Jun 8 20:08:24 2001
@@ -15,15 +15,15 @@
extern int LLOGenable;
-STATIC char *tmpPtr ;
-STATIC char Error[SMBUF];
-STATIC char NGSEPS[] = NG_SEPARATOR;
+static char *tmpPtr ;
+static char Error[SMBUF];
+static char NGSEPS[] = NG_SEPARATOR;
char **OtherHeaders;
int OtherCount;
BOOL HeadersModified;
-STATIC int OtherSize;
-STATIC BOOL WasMailed;
-STATIC STRING BadDistribs[] = {
+static int OtherSize;
+static BOOL WasMailed;
+static STRING BadDistribs[] = {
BAD_DISTRIBS
};
@@ -102,7 +102,7 @@
** Turn any \r or \n in text into spaces. Used to splice back multi-line
** headers into a single line.
*/
-STATIC char *
+static char *
Join(text)
register char *text;
{
@@ -154,7 +154,7 @@
/*
** Trim trailing spaces, return pointer to first non-space char.
*/
-STATIC char *
+static char *
TrimSpaces(p)
register char *p;
{
@@ -172,7 +172,7 @@
** Mark the end of the header starting at p, and return a pointer
** to the start of the next one or NULL. Handles continuations.
*/
-STATIC char *
+static char *
NextHeader(p)
register char *p;
{
@@ -190,7 +190,7 @@
** Strip any headers off the article and dump them into the table.
** On error, return NULL and fill in Error.
*/
-STATIC char *
+static char *
StripOffHeaders(article)
char *article;
{
@@ -249,7 +249,7 @@
** Check the control message, and see if it's legit. Return pointer to
** error message if not.
*/
-STATIC STRING
+static STRING
CheckControl(ctrl)
char *ctrl;
{
@@ -292,7 +292,7 @@
/*
** Check the Distribution header, and exit on error.
*/
-STATIC STRING
+static STRING
CheckDistribution(p)
register char *p;
{
@@ -316,7 +316,7 @@
** Process all the headers. FYI, they're done in RFC-order.
** Return NULL if okay, or an error message.
*/
-STATIC STRING
+static STRING
ProcessHeaders(int linecount, char *idbuff)
{
static char MONTHS[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
@@ -553,7 +553,7 @@
** with > is included text. Decrement the count on lines starting with <
** so that we don't reject diff(1) output.
*/
-STATIC STRING
+static STRING
CheckIncludedText(p, lines)
register char *p;
register int lines;
@@ -588,7 +588,7 @@
/*
** Try to mail an article to the moderator of the group.
*/
-STATIC STRING
+static STRING
MailArticle(group, article)
char *group;
char *article;
@@ -662,7 +662,7 @@
** Check the newsgroups and make sure they're all valid, that none are
** moderated, etc.
*/
-STATIC STRING ValidNewsgroups(char *hdr, char **modgroup)
+static STRING ValidNewsgroups(char *hdr, char **modgroup)
{
static char distbuff[SMBUF];
char *groups;
@@ -762,7 +762,7 @@
/*
** Send a quit message to the server, eat its reply.
*/
-STATIC void
+static void
SendQuit(FromServer, ToServer)
FILE *FromServer;
FILE *ToServer;
@@ -780,7 +780,7 @@
/*
** Offer the article to the server, return its reply.
*/
-STATIC int
+static int
OfferArticle(buff, buffsize, FromServer, ToServer)
char *buff;
int buffsize;
@@ -802,7 +802,7 @@
/*
** Spool article to temp file.
*/
-STATIC STRING
+static STRING
SpoolitTo(article, Error, SpoolDir)
char *article;
char *Error;
@@ -870,7 +870,7 @@
/*
** Spool article to temp file.
*/
-STATIC STRING
+static STRING
Spoolit(article, Error)
char *article;
char *Error;
@@ -878,7 +878,7 @@
return SpoolitTo(article, Error, innconf->pathincoming);
}
-STATIC char *Towire(char *p) {
+static char *Towire(char *p) {
char *q, *r, *s;
int curlen, len = BIG_BUFFER;
diff -Naur --recursive inn2-2.3.1.orig/storage/buffindexed/buffindexed.c inn2-2.3.1/storage/buffindexed/buffindexed.c
--- inn2-2.3.1.orig/storage/buffindexed/buffindexed.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/storage/buffindexed/buffindexed.c Fri Jun 8 20:08:24 2001
@@ -148,7 +148,7 @@
struct ov_name_table *next;
};
-STATIC struct ov_name_table *name_table = NULL;
+static struct ov_name_table *name_table = NULL;
#endif /* OV_DEBUG */
#define GROUPHEADERHASHSIZE (16 * 1024)
@@ -209,7 +209,7 @@
#define GROUPDATAHASHSIZE 25
-STATIC GROUPDATABLOCK *groupdatablock[GROUPDATAHASHSIZE];
+static GROUPDATABLOCK *groupdatablock[GROUPDATAHASHSIZE];
typedef enum {PREPEND_BLK, APPEND_BLK} ADDINDEX;
typedef enum {SRCH_FRWD, SRCH_BKWD} SRCH;
@@ -219,45 +219,45 @@
#define _PATH_OVBUFFCONFIG "buffindexed.conf"
-STATIC char LocalLogName[] = "buffindexed";
-STATIC long pagesize = 0;
-STATIC OVBUFF *ovbufftab;
-STATIC int GROUPfd;
-STATIC GROUPHEADER *GROUPheader = NULL;
-STATIC GROUPENTRY *GROUPentries = NULL;
-STATIC int GROUPcount = 0;
-STATIC GROUPLOC GROUPemptyloc = { -1 };
+static char LocalLogName[] = "buffindexed";
+static long pagesize = 0;
+static OVBUFF *ovbufftab;
+static int GROUPfd;
+static GROUPHEADER *GROUPheader = NULL;
+static GROUPENTRY *GROUPentries = NULL;
+static int GROUPcount = 0;
+static GROUPLOC GROUPemptyloc = { -1 };
#define NULLINDEX (-1)
-STATIC OV ovnull = { 0, NULLINDEX };
+static OV ovnull = { 0, NULLINDEX };
typedef unsigned long ULONG;
-STATIC ULONG onarray[64], offarray[64];
-STATIC int longsize = sizeof(long);
-STATIC BOOL Nospace;
-STATIC BOOL Needunlink;
-STATIC BOOL Cutofflow;
-
-STATIC int ovbuffmode;
-STATIC int ovpadamount = 128;
-
-STATIC GROUPLOC GROUPnewnode(void);
-STATIC BOOL GROUPremapifneeded(GROUPLOC loc);
-STATIC void GROUPLOCclear(GROUPLOC *loc);
-STATIC BOOL GROUPLOCempty(GROUPLOC loc);
-STATIC BOOL GROUPlockhash(LOCKTYPE type);
-STATIC BOOL GROUPlock(GROUPLOC gloc, LOCKTYPE type);
-STATIC BOOL GROUPfilesize(int count);
-STATIC BOOL GROUPexpand(int mode);
-STATIC void *ovopensearch(char *group, int low, int high, BOOL needov);
-STATIC void ovclosesearch(void *handle, BOOL freeblock);
-STATIC OVINDEX *Gib;
-STATIC GIBLIST *Giblist;
-STATIC int Gibcount;
-STATIC char *Gdb;
+static ULONG onarray[64], offarray[64];
+static int longsize = sizeof(long);
+static BOOL Nospace;
+static BOOL Needunlink;
+static BOOL Cutofflow;
+
+static int ovbuffmode;
+static int ovpadamount = 128;
+
+static GROUPLOC GROUPnewnode(void);
+static BOOL GROUPremapifneeded(GROUPLOC loc);
+static void GROUPLOCclear(GROUPLOC *loc);
+static BOOL GROUPLOCempty(GROUPLOC loc);
+static BOOL GROUPlockhash(LOCKTYPE type);
+static BOOL GROUPlock(GROUPLOC gloc, LOCKTYPE type);
+static BOOL GROUPfilesize(int count);
+static BOOL GROUPexpand(int mode);
+static void *ovopensearch(char *group, int low, int high, BOOL needov);
+static void ovclosesearch(void *handle, BOOL freeblock);
+static OVINDEX *Gib;
+static GIBLIST *Giblist;
+static int Gibcount;
+static char *Gdb;
#ifdef MMAP_MISSES_WRITES
/* With HP/UX, you definitely do not want to mix mmap-accesses of
a file with read()s and write()s of the same file */
-STATIC OFFSET_T mmapwrite(int fd, void *buf, OFFSET_T nbyte, OFFSET_T offset) {
+static OFFSET_T mmapwrite(int fd, void *buf, OFFSET_T nbyte, OFFSET_T offset) {
int pagefudge, len;
OFFSET_T mmapoffset;
caddr_t addr;
@@ -275,7 +275,7 @@
}
#endif /* MMAP_MISSES_WRITES */
-STATIC BOOL ovparse_part_line(char *l) {
+static BOOL ovparse_part_line(char *l) {
char *p;
struct stat sb;
OFFSET_T len, base;
@@ -356,7 +356,7 @@
** ovbuffread_config() -- Read the overview partition/file configuration file.
*/
-STATIC BOOL ovbuffread_config(void) {
+static BOOL ovbuffread_config(void) {
char *config, *from, *to, **ctab = (char **)NULL;
int ctab_free = 0; /* Index to next free slot in ctab */
int ctab_i;
@@ -419,10 +419,10 @@
return TRUE;
}
-STATIC char hextbl[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+static char hextbl[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'a', 'b', 'c', 'd', 'e', 'f'};
-STATIC char *offt2hex(OFFSET_T offset, BOOL leadingzeros) {
+static char *offt2hex(OFFSET_T offset, BOOL leadingzeros) {
static char buf[24];
char *p;
@@ -449,7 +449,7 @@
return buf;
}
-STATIC OFFSET_T hex2offt(char *hex) {
+static OFFSET_T hex2offt(char *hex) {
if (sizeof(OFFSET_T) <= 4) {
OFFSET_T rpofft;
sscanf(hex, "%lx", &rpofft);
@@ -480,7 +480,7 @@
}
}
-STATIC void ovreadhead(OVBUFF *ovbuff) {
+static void ovreadhead(OVBUFF *ovbuff) {
OVBUFFHEAD rpx;
char buff[OVBUFFLASIZ+1];
@@ -494,7 +494,7 @@
return;
}
-STATIC void ovflushhead(OVBUFF *ovbuff) {
+static void ovflushhead(OVBUFF *ovbuff) {
OVBUFFHEAD rpx;
if (!ovbuff->needflush)
@@ -522,11 +522,11 @@
return;
}
-STATIC BOOL ovlock(OVBUFF *ovbuff, LOCKTYPE type) {
+static BOOL ovlock(OVBUFF *ovbuff, LOCKTYPE type) {
return LockRange(ovbuff->fd, type, TRUE, 0, sizeof(OVBUFFHEAD));
}
-STATIC BOOL ovbuffinit_disks(void) {
+static BOOL ovbuffinit_disks(void) {
OVBUFF *ovbuff = ovbufftab;
char buf[64];
OVBUFFHEAD *rpx;
@@ -620,7 +620,7 @@
return TRUE;
}
-STATIC int ovusedblock(OVBUFF *ovbuff, int blocknum, BOOL set_operation, BOOL setbitvalue) {
+static int ovusedblock(OVBUFF *ovbuff, int blocknum, BOOL set_operation, BOOL setbitvalue) {
OFFSET_T longoffset;
int bitoffset; /* From the 'left' side of the long */
ULONG bitlong, mask;
@@ -647,7 +647,7 @@
if ( bitlong & mask ) return 1; else return 0;
}
-STATIC void ovnextblock(OVBUFF *ovbuff) {
+static void ovnextblock(OVBUFF *ovbuff) {
int i, j, last, lastbit, left;
ULONG mask = 0x80000000;
ULONG *table;
@@ -699,7 +699,7 @@
return;
}
-STATIC OVBUFF *getovbuff(OV ov) {
+static OVBUFF *getovbuff(OV ov) {
OVBUFF *ovbuff = ovbufftab;
for (; ovbuff != (OVBUFF *)NULL; ovbuff = ovbuff->next) {
if (ovbuff->index == ov.index)
@@ -709,9 +709,9 @@
}
#ifdef OV_DEBUG
-STATIC OV ovblocknew(GROUPENTRY *ge) {
+static OV ovblocknew(GROUPENTRY *ge) {
#else
-STATIC OV ovblocknew(void) {
+static OV ovblocknew(void) {
#endif /* OV_DEBUG */
static OVBUFF *ovbuffnext = NULL;
OVBUFF *ovbuff;
@@ -790,9 +790,9 @@
}
#ifdef OV_DEBUG
-STATIC void ovblockfree(OV ov, GROUPENTRY *ge) {
+static void ovblockfree(OV ov, GROUPENTRY *ge) {
#else
-STATIC void ovblockfree(OV ov) {
+static void ovblockfree(OV ov) {
#endif /* OV_DEBUG */
OVBUFF *ovbuff;
#ifdef OV_DEBUG
@@ -942,7 +942,7 @@
return TRUE;
}
-STATIC GROUPLOC GROUPfind(char *group, BOOL Ignoredeleted) {
+static GROUPLOC GROUPfind(char *group, BOOL Ignoredeleted) {
HASH grouphash;
unsigned int i;
GROUPLOC loc;
@@ -984,7 +984,7 @@
return TRUE;
}
-STATIC void setinitialge(GROUPENTRY *ge, HASH grouphash, char *flag, GROUPLOC next, ARTNUM lo, ARTNUM hi) {
+static void setinitialge(GROUPENTRY *ge, HASH grouphash, char *flag, GROUPLOC next, ARTNUM lo, ARTNUM hi) {
ge->hash = grouphash;
if (lo != 0)
ge->low = lo;
@@ -1041,14 +1041,14 @@
return TRUE;
}
-STATIC BOOL GROUPfilesize(int count) {
+static BOOL GROUPfilesize(int count) {
return (count * sizeof(GROUPENTRY)) + sizeof(GROUPHEADER);
}
/* Check if the given GROUPLOC refers to GROUPENTRY that we don't have mmap'ed,
** if so then see if the file has been grown by another writer and remmap
*/
-STATIC BOOL GROUPremapifneeded(GROUPLOC loc) {
+static BOOL GROUPremapifneeded(GROUPLOC loc) {
struct stat sb;
if (loc.recno < GROUPcount)
@@ -1079,7 +1079,7 @@
}
/* This function does not need to lock because it's callers are expected to do so */
-STATIC BOOL GROUPexpand(int mode) {
+static BOOL GROUPexpand(int mode) {
int i;
int flag = 0;
@@ -1124,7 +1124,7 @@
return TRUE;
}
-STATIC GROUPLOC GROUPnewnode(void) {
+static GROUPLOC GROUPnewnode(void) {
GROUPLOC loc;
/* If we didn't find any free space, then make some */
@@ -1156,19 +1156,19 @@
return TRUE;
}
-STATIC void GROUPLOCclear(GROUPLOC *loc) {
+static void GROUPLOCclear(GROUPLOC *loc) {
loc->recno = -1;
}
-STATIC BOOL GROUPLOCempty(GROUPLOC loc) {
+static BOOL GROUPLOCempty(GROUPLOC loc) {
return (loc.recno < 0);
}
-STATIC BOOL GROUPlockhash(LOCKTYPE type) {
+static BOOL GROUPlockhash(LOCKTYPE type) {
return LockRange(GROUPfd, type, TRUE, 0, sizeof(GROUPHEADER));
}
-STATIC BOOL GROUPlock(GROUPLOC gloc, LOCKTYPE type) {
+static BOOL GROUPlock(GROUPLOC gloc, LOCKTYPE type) {
return LockRange(GROUPfd,
type,
TRUE,
@@ -1177,9 +1177,9 @@
}
#ifdef OV_DEBUG
-STATIC BOOL ovsetcurindexblock(GROUPENTRY *ge, GROUPENTRY *georig) {
+static BOOL ovsetcurindexblock(GROUPENTRY *ge, GROUPENTRY *georig) {
#else
-STATIC BOOL ovsetcurindexblock(GROUPENTRY *ge) {
+static BOOL ovsetcurindexblock(GROUPENTRY *ge) {
#endif /* OV_DEBUG */
OVBUFF *ovbuff;
OV ov;
@@ -1231,9 +1231,9 @@
}
#ifdef OV_DEBUG
-STATIC BOOL ovaddrec(GROUPENTRY *ge, ARTNUM artnum, TOKEN token, char *data, int len, time_t arrived, time_t expires, GROUPENTRY *georig) {
+static BOOL ovaddrec(GROUPENTRY *ge, ARTNUM artnum, TOKEN token, char *data, int len, time_t arrived, time_t expires, GROUPENTRY *georig) {
#else
-STATIC BOOL ovaddrec(GROUPENTRY *ge, ARTNUM artnum, TOKEN token, char *data, int len, time_t arrived, time_t expires) {
+static BOOL ovaddrec(GROUPENTRY *ge, ARTNUM artnum, TOKEN token, char *data, int len, time_t arrived, time_t expires) {
#endif /* OV_DEBUG */
OV ov;
OVINDEX ie;
@@ -1411,9 +1411,9 @@
}
#ifdef OV_DEBUG
-STATIC void freegroupblock(GROUPENTRY *ge) {
+static void freegroupblock(GROUPENTRY *ge) {
#else
-STATIC void freegroupblock(void) {
+static void freegroupblock(void) {
#endif /* OV_DEBUG */
GROUPDATABLOCK *gdb;
int i;
@@ -1438,7 +1438,7 @@
}
}
-STATIC void ovgroupunmap(void) {
+static void ovgroupunmap(void) {
GROUPDATABLOCK *gdb, *gdbnext;
int i;
GIBLIST *giblist, *giblistnext;
@@ -1465,13 +1465,13 @@
}
}
-STATIC void insertgdb(OV *ov, GROUPDATABLOCK *gdb) {
+static void insertgdb(OV *ov, GROUPDATABLOCK *gdb) {
gdb->next = groupdatablock[(ov->index + ov->blocknum) % GROUPDATAHASHSIZE];
groupdatablock[(ov->index + ov->blocknum) % GROUPDATAHASHSIZE] = gdb;
return;
}
-STATIC GROUPDATABLOCK *searchgdb(OV *ov) {
+static GROUPDATABLOCK *searchgdb(OV *ov) {
GROUPDATABLOCK *gdb;
gdb = groupdatablock[(ov->index + ov->blocknum) % GROUPDATAHASHSIZE];
@@ -1482,7 +1482,7 @@
return gdb;
}
-STATIC int INDEXcompare(CPOINTER p1, CPOINTER p2) {
+static int INDEXcompare(CPOINTER p1, CPOINTER p2) {
OVINDEX *oi1;
OVINDEX *oi2;
@@ -1491,7 +1491,7 @@
return oi1->artnum - oi2->artnum;
}
-STATIC BOOL ovgroupmmap(GROUPENTRY *ge, int low, int high, BOOL needov) {
+static BOOL ovgroupmmap(GROUPENTRY *ge, int low, int high, BOOL needov) {
OV ov = ge->baseindex;
OVBUFF *ovbuff;
GROUPDATABLOCK *gdb;
@@ -1613,7 +1613,7 @@
return TRUE;
}
-STATIC void *ovopensearch(char *group, int low, int high, BOOL needov) {
+static void *ovopensearch(char *group, int low, int high, BOOL needov) {
GROUPLOC gloc;
GROUPENTRY *ge;
OVSEARCH *search;
@@ -1715,7 +1715,7 @@
return(ovsearch(handle, artnum, data, len, token, arrived, NULL));
}
-STATIC void ovclosesearch(void *handle, BOOL freeblock) {
+static void ovclosesearch(void *handle, BOOL freeblock) {
OVSEARCH *search = (OVSEARCH *)handle;
#ifdef OV_DEBUG
GROUPENTRY *ge;
@@ -1989,7 +1989,7 @@
}
#ifdef DEBUG
-STATIC int countgdb(void) {
+static int countgdb(void) {
int i, count = 0;
GROUPDATABLOCK *gdb;
diff -Naur --recursive inn2-2.3.1.orig/storage/cnfs/cnfs.c inn2-2.3.1/storage/cnfs/cnfs.c
--- inn2-2.3.1.orig/storage/cnfs/cnfs.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/storage/cnfs/cnfs.c Fri Jun 8 20:08:24 2001
@@ -48,15 +48,15 @@
BOOL rollover; /* true if the search is rollovered */
} PRIV_CNFS;
-STATIC char LocalLogName[] = "CNFS-sm";
-STATIC CYCBUFF *cycbufftab = (CYCBUFF *)NULL;
-STATIC METACYCBUFF *metacycbufftab = (METACYCBUFF *)NULL;
-STATIC CNFSEXPIRERULES *metaexprulestab = (CNFSEXPIRERULES *)NULL;
-STATIC long pagesize = 0;
-STATIC int metabuff_update = METACYCBUFF_UPDATE;
-STATIC int refresh_interval = REFRESH_INTERVAL;
+static char LocalLogName[] = "CNFS-sm";
+static CYCBUFF *cycbufftab = (CYCBUFF *)NULL;
+static METACYCBUFF *metacycbufftab = (METACYCBUFF *)NULL;
+static CNFSEXPIRERULES *metaexprulestab = (CNFSEXPIRERULES *)NULL;
+static long pagesize = 0;
+static int metabuff_update = METACYCBUFF_UPDATE;
+static int refresh_interval = REFRESH_INTERVAL;
-STATIC TOKEN CNFSMakeToken(char *cycbuffname, CYCBUFF_OFF_T offset,
+static TOKEN CNFSMakeToken(char *cycbuffname, CYCBUFF_OFF_T offset,
uint32_t cycnum, STORAGECLASS class, TOKEN *oldtoken) {
TOKEN token;
int32_t int32;
@@ -84,7 +84,7 @@
** NOTE: We assume that cycbuffname is 9 bytes long.
*/
-STATIC BOOL CNFSBreakToken(TOKEN token, char *cycbuffname,
+static BOOL CNFSBreakToken(TOKEN token, char *cycbuffname,
CYCBUFF_OFF_T *offset, uint32_t *cycnum) {
int32_t int32;
@@ -103,7 +103,7 @@
return TRUE;
}
-STATIC char hextbl[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+static char hextbl[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'a', 'b', 'c', 'd', 'e', 'f'};
/*
@@ -113,7 +113,7 @@
** If "leadingzeros" is true, the number returned will have leading 0's.
*/
-STATIC char * CNFSofft2hex(CYCBUFF_OFF_T offset, BOOL leadingzeros) {
+static char * CNFSofft2hex(CYCBUFF_OFF_T offset, BOOL leadingzeros) {
static char buf[24];
char *p;
@@ -146,7 +146,7 @@
** of a CYCBUFF_OFF_T, return a CYCBUFF_OFF_T.
*/
-STATIC CYCBUFF_OFF_T CNFShex2offt(char *hex) {
+static CYCBUFF_OFF_T CNFShex2offt(char *hex) {
if (sizeof(CYCBUFF_OFF_T) <= 4) {
CYCBUFF_OFF_T rpofft;
/* I'm lazy */
@@ -178,7 +178,7 @@
}
}
-STATIC void CNFScleancycbuff(void) {
+static void CNFScleancycbuff(void) {
CYCBUFF *cycbuff, *nextcycbuff;
for (cycbuff = cycbufftab; cycbuff != (CYCBUFF *)NULL;) {
@@ -192,7 +192,7 @@
cycbufftab = (CYCBUFF *)NULL;
}
-STATIC void CNFScleanmetacycbuff(void) {
+static void CNFScleanmetacycbuff(void) {
METACYCBUFF *metacycbuff, *nextmetacycbuff;
for (metacycbuff = metacycbufftab; metacycbuff != (METACYCBUFF *)NULL;) {
@@ -205,7 +205,7 @@
metacycbufftab = (METACYCBUFF *)NULL;
}
-STATIC void CNFScleanexpirerule(void) {
+static void CNFScleanexpirerule(void) {
CNFSEXPIRERULES *metaexprule, *nextmetaexprule;
for (metaexprule = metaexprulestab; metaexprule != (CNFSEXPIRERULES *)NULL;) {
@@ -216,7 +216,7 @@
metaexprulestab = (CNFSEXPIRERULES *)NULL;
}
-STATIC CYCBUFF *CNFSgetcycbuffbyname(char *name) {
+static CYCBUFF *CNFSgetcycbuffbyname(char *name) {
CYCBUFF *cycbuff;
if (name == NULL)
@@ -227,7 +227,7 @@
return NULL;
}
-STATIC METACYCBUFF *CNFSgetmetacycbuffbyname(char *name) {
+static METACYCBUFF *CNFSgetmetacycbuffbyname(char *name) {
METACYCBUFF *metacycbuff;
if (name == NULL)
@@ -238,7 +238,7 @@
return NULL;
}
-STATIC BOOL CNFSflushhead(CYCBUFF *cycbuff) {
+static BOOL CNFSflushhead(CYCBUFF *cycbuff) {
int b;
CYCBUFFEXTERN rpx;
@@ -292,7 +292,7 @@
return TRUE;
}
-STATIC void CNFSflushallheads(void) {
+static void CNFSflushallheads(void) {
CYCBUFF *cycbuff;
for (cycbuff = cycbufftab; cycbuff != (CYCBUFF *)NULL; cycbuff = cycbuff->next) {
@@ -307,7 +307,7 @@
** free pointer and cycle number. Return 1 on success, 0 otherwise.
*/
-STATIC void CNFSReadFreeAndCycle(CYCBUFF *cycbuff) {
+static void CNFSReadFreeAndCycle(CYCBUFF *cycbuff) {
CYCBUFFEXTERN rpx;
char buf[64];
@@ -338,7 +338,7 @@
return;
}
-STATIC BOOL CNFSparse_part_line(char *l) {
+static BOOL CNFSparse_part_line(char *l) {
char *p;
struct stat sb;
CYCBUFF_OFF_T len, minartoffset;
@@ -408,7 +408,7 @@
return TRUE;
}
-STATIC BOOL CNFSparse_metapart_line(char *l) {
+static BOOL CNFSparse_metapart_line(char *l) {
char *p, *cycbuff, *q = l;
CYCBUFF *rp;
METACYCBUFF *metacycbuff, *tmp;
@@ -495,7 +495,7 @@
return TRUE;
}
-STATIC BOOL CNFSparse_groups_line() {
+static BOOL CNFSparse_groups_line() {
METACYCBUFF *mrp;
STORAGE_SUB *sub = (STORAGE_SUB *)NULL;
CNFSEXPIRERULES *metaexprule, *tmp;
@@ -540,7 +540,7 @@
** bad things will happen.
*/
-STATIC BOOL CNFSinit_disks(CYCBUFF *cycbuff) {
+static BOOL CNFSinit_disks(CYCBUFF *cycbuff) {
char buf[64];
CYCBUFFEXTERN rpx;
int fd, bytes;
@@ -658,7 +658,7 @@
return TRUE;
}
-STATIC BOOL CNFS_setcurrent(METACYCBUFF *metacycbuff) {
+static BOOL CNFS_setcurrent(METACYCBUFF *metacycbuff) {
CYCBUFF *cycbuff;
int i, currentcycbuff, order = -1;
BOOL foundcurrent = FALSE;
@@ -715,7 +715,7 @@
** C all that often anymore....
*/
-STATIC BOOL CNFSread_config(void) {
+static BOOL CNFSread_config(void) {
char *config, *from, *to, **ctab = (char **)NULL;
int ctab_free = 0; /* Index to next free slot in ctab */
int ctab_i;
@@ -854,7 +854,7 @@
typedef unsigned long ULONG;
-STATIC int CNFSUsedBlock(CYCBUFF *cycbuff, CYCBUFF_OFF_T offset,
+static int CNFSUsedBlock(CYCBUFF *cycbuff, CYCBUFF_OFF_T offset,
BOOL set_operation, BOOL setbitvalue) {
CYCBUFF_OFF_T blocknum;
CYCBUFF_OFF_T longoffset;
@@ -931,7 +931,7 @@
** previously mmap()'ed.
*/
-STATIC void CNFSmunmapbitfields(void) {
+static void CNFSmunmapbitfields(void) {
CYCBUFF *cycbuff;
for (cycbuff = cycbufftab; cycbuff != (CYCBUFF *)NULL; cycbuff = cycbuff->next) {
@@ -942,8 +942,8 @@
}
}
-STATIC int CNFSArtMayBeHere(CYCBUFF *cycbuff, CYCBUFF_OFF_T offset, uint32_t cycnum) {
- STATIC time_t lastupdate = 0;
+static int CNFSArtMayBeHere(CYCBUFF *cycbuff, CYCBUFF_OFF_T offset, uint32_t cycnum) {
+ static time_t lastupdate = 0;
CYCBUFF *tmp;
if (SMpreopen && !SMopenmode) {
@@ -970,7 +970,7 @@
return CNFSUsedBlock(cycbuff, offset, FALSE, FALSE);
}
-STATIC void CNFSshutdowncycbuff(CYCBUFF *cycbuff) {
+static void CNFSshutdowncycbuff(CYCBUFF *cycbuff) {
if (cycbuff == (CYCBUFF *)NULL)
return;
if (cycbuff->needflush)
diff -Naur --recursive inn2-2.3.1.orig/storage/interface.c inn2-2.3.1/storage/interface.c
--- inn2-2.3.1.orig/storage/interface.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/storage/interface.c Fri Jun 8 20:08:24 2001
@@ -26,12 +26,12 @@
METHOD_DATA method_data[NUM_STORAGE_METHODS];
-STATIC STORAGE_SUB *subscriptions = NULL;
-STATIC unsigned int typetoindex[256];
+static STORAGE_SUB *subscriptions = NULL;
+static unsigned int typetoindex[256];
int SMerrno;
char *SMerrorstr = NULL;
-STATIC BOOL ErrorAlloc = FALSE;
-STATIC BOOL Initialized = FALSE;
+static BOOL ErrorAlloc = FALSE;
+static BOOL Initialized = FALSE;
BOOL SMopenmode = FALSE;
BOOL SMpreopen = FALSE;
@@ -86,7 +86,7 @@
/*
** Converts a hex digit and converts it to a int
*/
-STATIC int hextodec(const int c) {
+static int hextodec(const int c) {
return isdigit(c) ? (c - '0') : ((c - 'A') + 10);
}
@@ -212,7 +212,7 @@
/*
** get Xref header without pathhost
*/
-STATIC char *GetXref(ARTHANDLE *art) {
+static char *GetXref(ARTHANDLE *art) {
char *p, *p1;
char *q;
char *buff;
@@ -250,7 +250,7 @@
** Split newsgroup and returns artnum
** or 0 if there are no newsgroup.
*/
-STATIC ARTNUM GetGroups(char *Xref) {
+static ARTNUM GetGroups(char *Xref) {
char *p;
if ((p = strchr(Xref, ':')) == NULL)
diff -Naur --recursive inn2-2.3.1.orig/storage/ov.c inn2-2.3.1/storage/ov.c
--- inn2-2.3.1.orig/storage/ov.c Fri Jun 8 20:09:45 2001
+++ inn2-2.3.1/storage/ov.c Fri Jun 8 20:08:24 2001
@@ -21,31 +21,31 @@
#include "ovmethods.h"
#include "ovinterface.h"
-STATIC int OVnumpatterns;
-STATIC char **OVpatterns;
+static int OVnumpatterns;
+static char **OVpatterns;
time_t OVrealnow;
BOOL OVstatall;
-STATIC BOOL OVdelayrm;
-STATIC BOOL OVusepost;
-STATIC BOOL OVquiet;
-STATIC BOOL OVkeep;
-STATIC BOOL OVearliest;
-STATIC BOOL OVignoreselfexpire;
-STATIC time_t OVnow;
-STATIC OV_METHOD ov;
-STATIC FILE *EXPunlinkfile;
-STATIC char *ACTIVE;
-STATIC ARTOVERFIELD *ARTfields;
-STATIC int ARTfieldsize;
-STATIC BOOL ReadOverviewfmt = FALSE;
-STATIC char **arts;
-STATIC enum KRP *krps;
+static BOOL OVdelayrm;
+static BOOL OVusepost;
+static BOOL OVquiet;
+static BOOL OVkeep;
+static BOOL OVearliest;
+static BOOL OVignoreselfexpire;
+static time_t OVnow;
+static OV_METHOD ov;
+static FILE *EXPunlinkfile;
+static char *ACTIVE;
+static ARTOVERFIELD *ARTfields;
+static int ARTfieldsize;
+static BOOL ReadOverviewfmt = FALSE;
+static char **arts;
+static enum KRP *krps;
/* Statistics */
-STATIC long EXPprocessed;
-STATIC long EXPunlinked;
-STATIC long EXPoverindexdrop;
+static long EXPprocessed;
+static long EXPunlinked;
+static long EXPoverindexdrop;
/*
** Stuff that is used for group based expire
@@ -59,9 +59,9 @@
#define OVFMT_NODATE -1
#define OVFMT_NOXREF -1
-STATIC int Dateindex = OVFMT_UNINIT;
-STATIC int Xrefindex = OVFMT_UNINIT;
-STATIC int Messageidindex = OVFMT_UNINIT;
+static int Dateindex = OVFMT_UNINIT;
+static int Xrefindex = OVFMT_UNINIT;
+static int Messageidindex = OVFMT_UNINIT;
typedef struct _BUFFER {
int Size;
@@ -99,11 +99,11 @@
char *Name;
} BADGROUP;
-STATIC BADGROUP *EXPbadgroups;
-STATIC int nGroups;
-STATIC NEWSGROUP *Groups;
-STATIC NEWSGROUP EXPdefault;
-STATIC NGHASH NGHtable[NGH_SIZE];
+static BADGROUP *EXPbadgroups;
+static int nGroups;
+static NEWSGROUP *Groups;
+static NEWSGROUP EXPdefault;
+static NGHASH NGHtable[NGH_SIZE];
#if ! defined (atof) /* NEXT defines aotf as a macro */
extern double atof();
@@ -472,7 +472,7 @@
/*
** Hash a newsgroup and see if we get it.
*/
-STATIC NEWSGROUP *NGfind(char *Name)
+static NEWSGROUP *NGfind(char *Name)
{
char *p;
int i;
@@ -493,7 +493,7 @@
/*
** Sorting predicate to put newsgroups in rough order of their activity.
*/
-STATIC int NGcompare(CPOINTER p1, CPOINTER p2)
+static int NGcompare(CPOINTER p1, CPOINTER p2)
{
NEWSGROUP **ng1;
NEWSGROUP **ng2;
@@ -507,7 +507,7 @@
** Split a line at a specified field separator into a vector and return
** the number of fields found, or -1 on error.
*/
-STATIC int EXPsplit(char *p, char sep, char **argv, int count)
+static int EXPsplit(char *p, char sep, char **argv, int count)
{
int i;
@@ -546,7 +546,7 @@
/*
** Build the newsgroup structures from the active file.
*/
-STATIC void BuildGroups(char *active)
+static void BuildGroups(char *active)
{
NGHASH *htp;
NEWSGROUP *ngp;
@@ -626,7 +626,7 @@
** just about everything you expect. Print a message and return FALSE
** on error.
*/
-STATIC BOOL EXPgetnum(int line, char *word, time_t *v, char *name)
+static BOOL EXPgetnum(int line, char *word, time_t *v, char *name)
{
char *p;
BOOL SawDot;
@@ -666,7 +666,7 @@
/*
** Set the expiration fields for all groups that match this pattern.
*/
-STATIC void EXPmatch(char *p, NEWSGROUP *v, char mod)
+static void EXPmatch(char *p, NEWSGROUP *v, char mod)
{
NEWSGROUP *ngp;
int i;
@@ -690,7 +690,7 @@
/*
** Parse the expiration control file. Return TRUE if okay.
*/
-STATIC BOOL EXPreadfile(FILE *F)
+static BOOL EXPreadfile(FILE *F)
{
char *p;
int i;
@@ -812,7 +812,7 @@
/*
** Handle a newsgroup that isn't in the active file.
*/
-STATIC NEWSGROUP *EXPnotfound(char *Entry)
+static NEWSGROUP *EXPnotfound(char *Entry)
{
static NEWSGROUP Removeit;
BADGROUP *bg;
@@ -844,7 +844,7 @@
/*
** Should we keep the specified article?
*/
-STATIC enum KRP EXPkeepit(char *Entry, time_t when, time_t expires)
+static enum KRP EXPkeepit(char *Entry, time_t when, time_t expires)
{
char *p;
NEWSGROUP *ngp;
@@ -912,7 +912,7 @@
/*
** Read the overview schema.
*/
-STATIC void ARTreadschema(void)
+static void ARTreadschema(void)
{
FILE *F;
char *p;
@@ -966,7 +966,7 @@
** Return a field from the overview line or NULL on error. Return a copy
** since we might be re-using the line later.
*/
-STATIC char *OVERGetHeader(char *p, int field)
+static char *OVERGetHeader(char *p, int field)
{
static char *buff;
static int buffsize;
@@ -1018,7 +1018,7 @@
/*
** Read overview.fmt and find index for headers
*/
-STATIC OVfindheaderindex() {
+static OVfindheaderindex() {
FILE *F;
char *active;
int i;
diff -Naur --recursive inn2-2.3.1.orig/storage/ov3/ov3.c inn2-2.3.1/storage/ov3/ov3.c
--- inn2-2.3.1.orig/storage/ov3/ov3.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/storage/ov3/ov3.c Fri Jun 8 20:08:24 2001
@@ -117,37 +117,37 @@
#define CACHETABLESIZE 128
#define MAXCACHETIME (60*5)
-STATIC int GROUPfd;
-STATIC GROUPHEADER *GROUPheader = NULL;
-STATIC GROUPENTRY *GROUPentries = NULL;
-STATIC int GROUPcount = 0;
-STATIC GROUPLOC GROUPemptyloc = { -1 };
-
-STATIC CACHEENTRY *CACHEdata[CACHETABLESIZE];
-STATIC int OV3mode;
-STATIC int OV3padamount = 128;
-STATIC int CACHEentries = 0;
-STATIC int CACHEhit = 0;
-STATIC int CACHEmiss = 0;
-STATIC int CACHEmaxentries = 128;
-STATIC BOOL Cutofflow;
-
-STATIC GROUPLOC GROUPnewnode(void);
-STATIC BOOL GROUPremapifneeded(GROUPLOC loc);
-STATIC void GROUPLOCclear(GROUPLOC *loc);
-STATIC BOOL GROUPLOCempty(GROUPLOC loc);
-STATIC BOOL GROUPlockhash(LOCKTYPE type);
-STATIC BOOL GROUPlock(GROUPLOC gloc, LOCKTYPE type);
-STATIC BOOL GROUPfilesize(int count);
-STATIC BOOL GROUPexpand(int mode);
-STATIC BOOL OV3packgroup(char *group, int delta);
-STATIC GROUPHANDLE *OV3opengroup(char *group, BOOL needcache);
-STATIC void OV3cleancache(void);
-STATIC BOOL OV3addrec(GROUPENTRY *ge, GROUPHANDLE *gh, int artnum, TOKEN token, char *data, int len, time_t arrived, time_t expires);
-STATIC BOOL OV3closegroup(GROUPHANDLE *gh, BOOL needcache);
-STATIC void OV3getdirpath(char *group, char *path);
-STATIC void OV3getIDXfilename(char *group, char *path);
-STATIC void OV3getDATfilename(char *group, char *path);
+static int GROUPfd;
+static GROUPHEADER *GROUPheader = NULL;
+static GROUPENTRY *GROUPentries = NULL;
+static int GROUPcount = 0;
+static GROUPLOC GROUPemptyloc = { -1 };
+
+static CACHEENTRY *CACHEdata[CACHETABLESIZE];
+static int OV3mode;
+static int OV3padamount = 128;
+static int CACHEentries = 0;
+static int CACHEhit = 0;
+static int CACHEmiss = 0;
+static int CACHEmaxentries = 128;
+static BOOL Cutofflow;
+
+static GROUPLOC GROUPnewnode(void);
+static BOOL GROUPremapifneeded(GROUPLOC loc);
+static void GROUPLOCclear(GROUPLOC *loc);
+static BOOL GROUPLOCempty(GROUPLOC loc);
+static BOOL GROUPlockhash(LOCKTYPE type);
+static BOOL GROUPlock(GROUPLOC gloc, LOCKTYPE type);
+static BOOL GROUPfilesize(int count);
+static BOOL GROUPexpand(int mode);
+static BOOL OV3packgroup(char *group, int delta);
+static GROUPHANDLE *OV3opengroup(char *group, BOOL needcache);
+static void OV3cleancache(void);
+static BOOL OV3addrec(GROUPENTRY *ge, GROUPHANDLE *gh, int artnum, TOKEN token, char *data, int len, time_t arrived, time_t expires);
+static BOOL OV3closegroup(GROUPHANDLE *gh, BOOL needcache);
+static void OV3getdirpath(char *group, char *path);
+static void OV3getIDXfilename(char *group, char *path);
+static void OV3getDATfilename(char *group, char *path);
BOOL tradindexed_open(int mode) {
char dirname[1024];
@@ -227,7 +227,7 @@
return TRUE;
}
-STATIC GROUPLOC GROUPfind(char *group) {
+static GROUPLOC GROUPfind(char *group) {
HASH grouphash;
unsigned int i;
GROUPLOC loc;
@@ -296,14 +296,14 @@
return TRUE;
}
-STATIC BOOL GROUPfilesize(int count) {
+static BOOL GROUPfilesize(int count) {
return (count * sizeof(GROUPENTRY)) + sizeof(GROUPHEADER);
}
/* Check if the given GROUPLOC refers to GROUPENTRY that we don't have mmap'ed,
** if so then see if the file has been grown by another writer and remmap
*/
-STATIC BOOL GROUPremapifneeded(GROUPLOC loc) {
+static BOOL GROUPremapifneeded(GROUPLOC loc) {
struct stat sb;
if (loc.recno < GROUPcount)
@@ -334,7 +334,7 @@
}
/* This function does not need to lock because it's callers are expected to do so */
-STATIC BOOL GROUPexpand(int mode) {
+static BOOL GROUPexpand(int mode) {
int i;
int flag = 0;
@@ -379,7 +379,7 @@
return TRUE;
}
-STATIC GROUPLOC GROUPnewnode(void) {
+static GROUPLOC GROUPnewnode(void) {
GROUPLOC loc;
/* If we didn't find any free space, then make some */
@@ -435,19 +435,19 @@
return TRUE;
}
-STATIC void GROUPLOCclear(GROUPLOC *loc) {
+static void GROUPLOCclear(GROUPLOC *loc) {
loc->recno = -1;
}
-STATIC BOOL GROUPLOCempty(GROUPLOC loc) {
+static BOOL GROUPLOCempty(GROUPLOC loc) {
return (loc.recno < 0);
}
-STATIC BOOL GROUPlockhash(LOCKTYPE type) {
+static BOOL GROUPlockhash(LOCKTYPE type) {
return LockRange(GROUPfd, type, TRUE, 0, sizeof(GROUPHEADER));
}
-STATIC BOOL GROUPlock(GROUPLOC gloc, LOCKTYPE type) {
+static BOOL GROUPlock(GROUPLOC gloc, LOCKTYPE type) {
return LockRange(GROUPfd,
type,
TRUE,
@@ -455,7 +455,7 @@
sizeof(GROUPENTRY));
}
-STATIC BOOL OV3mmapgroup(GROUPHANDLE *gh) {
+static BOOL OV3mmapgroup(GROUPHANDLE *gh) {
struct stat sb;
if (fstat(gh->datafd, &sb) < 0) {
@@ -491,7 +491,7 @@
return TRUE;
}
-STATIC GROUPHANDLE *OV3opengroupfiles(char *group) {
+static GROUPHANDLE *OV3opengroupfiles(char *group) {
char *sepgroup;
char *p;
char IDXpath[BIG_BUFFER];
@@ -562,7 +562,7 @@
return gh;
}
-STATIC void OV3closegroupfiles(GROUPHANDLE *gh) {
+static void OV3closegroupfiles(GROUPHANDLE *gh) {
close(gh->indexfd);
close(gh->datafd);
if (gh->indexmem)
@@ -575,7 +575,7 @@
}
-STATIC void OV3cleancache(void) {
+static void OV3cleancache(void) {
int i;
CACHEENTRY *ce, *prev;
CACHEENTRY *saved = NULL;
@@ -612,7 +612,7 @@
}
-STATIC GROUPHANDLE *OV3opengroup(char *group, BOOL needcache) {
+static GROUPHANDLE *OV3opengroup(char *group, BOOL needcache) {
unsigned int hashbucket;
GROUPHANDLE *gh;
HASH hash;
@@ -679,7 +679,7 @@
return gh;
}
-STATIC BOOL OV3closegroup(GROUPHANDLE *gh, BOOL needcache) {
+static BOOL OV3closegroup(GROUPHANDLE *gh, BOOL needcache) {
unsigned int i;
CACHEENTRY *ce;
@@ -697,7 +697,7 @@
return TRUE;
}
-STATIC BOOL OV3addrec(GROUPENTRY *ge, GROUPHANDLE *gh, int artnum, TOKEN token, char *data, int len, time_t arrived, time_t expires) {
+static BOOL OV3addrec(GROUPENTRY *ge, GROUPHANDLE *gh, int artnum, TOKEN token, char *data, int len, time_t arrived, time_t expires) {
INDEXENTRY ie;
int base;
@@ -894,7 +894,7 @@
return retval;
}
-STATIC void OV3getdirpath(char *group, char *path) {
+static void OV3getdirpath(char *group, char *path) {
char *sepgroup;
char *p;
char **groupparts = NULL;
@@ -917,7 +917,7 @@
freeargify(&groupparts);
}
-STATIC void OV3getIDXfilename(char *group, char *path) {
+static void OV3getIDXfilename(char *group, char *path) {
char *p;
OV3getdirpath(group, path);
@@ -925,7 +925,7 @@
sprintf(p, "%s.IDX", group);
}
-STATIC void OV3getDATfilename(char *group, char *path) {
+static void OV3getDATfilename(char *group, char *path) {
char *p;
OV3getdirpath(group, path);
@@ -937,7 +937,7 @@
* Shift group index file so it has lower value of base.
*/
-STATIC BOOL OV3packgroup(char *group, int delta) {
+static BOOL OV3packgroup(char *group, int delta) {
char newgroup[BIG_BUFFER];
char bakgroup[BIG_BUFFER];
GROUPENTRY *ge;
More information about the inn-patches
mailing list