patch 4
Bear Giles
bear at coyotesong.com
Sat Jun 9 19:06:21 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 22:17:22 2001
+++ inn2-2.3.1/backends/archive.c Fri Jun 8 22:44:26 2001
@@ -142,8 +142,8 @@
}
/* Write the data. */
- while ((i = fread((POINTER)buff, (size_t)1, (size_t)sizeof buff, in)) != 0)
- if (fwrite((POINTER)buff, (size_t)1, i, out) != i) {
+ while ((i = fread(buff, (size_t)1, (size_t)sizeof buff, in)) != 0)
+ if (fwrite(buff, (size_t)1, i, out) != i) {
(void)fprintf(stderr, "Can't write \"%s\", %s\n",
dest, strerror(errno));
(void)fclose(in);
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 22:17:22 2001
+++ inn2-2.3.1/backends/batcher.c Fri Jun 8 22:44:26 2001
@@ -41,7 +41,7 @@
static long MaxArts;
static long MaxBytes;
static sig_atomic_t GotInterrupt;
-static STRING Separator = "#! rnews %ld";
+static char *Separator = "#! rnews %ld";
static char *ERRLOG;
/*
@@ -214,7 +214,7 @@
static char SKIPPING[] = "batcher %s skipping \"%.40s...\" %s\n";
BOOL Redirect;
FILE *F;
- STRING AltSpool;
+ char *AltSpool;
TIMEINFO Now;
char *p;
char *data;
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 22:17:22 2001
+++ inn2-2.3.1/backends/buffchan.c Fri Jun 8 22:44:26 2001
@@ -33,7 +33,7 @@
*/
typedef struct _SITE {
BOOL Dropped;
- STRING Name;
+ char *Name;
int CloseLines;
int FlushLines;
time_t LastFlushed;
@@ -41,7 +41,7 @@
int CloseSeconds;
int FlushSeconds;
FILE *F;
- STRING Filename;
+ char *Filename;
char *Buffer;
} SITE;
@@ -58,7 +58,7 @@
/* Global variables. */
static char *Format;
-static STRING Map;
+static char *Map;
static int BufferMode;
static int CloseEvery;
static int FlushEvery;
@@ -203,7 +203,7 @@
/* Fill in the structure for the new site. */
sp->Name = COPY(Name);
- (void)sprintf(buff, (STRING)Format, Map ? MAPname(Name) : sp->Name);
+ (void)sprintf(buff, Format, Map ? MAPname(Name) : sp->Name);
sp->Filename = COPY(buff);
if (BufferMode == 'u')
sp->Buffer = NULL;
@@ -268,7 +268,7 @@
if (sp->F == NULL)
SITEopen(sp);
- if (fwrite((POINTER)text, (size_t)1, (size_t)len, sp->F) != len)
+ if (fwrite(text, (size_t)1, (size_t)len, sp->F) != len)
(void)fprintf(stderr, "buffchan %s cant write %s\n",
sp->Name, strerror(errno));
diff -Naur --recursive inn2-2.3.1.orig/backends/filechan.c inn2-2.3.1/backends/filechan.c
--- inn2-2.3.1.orig/backends/filechan.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/backends/filechan.c Fri Jun 8 22:44:26 2001
@@ -30,7 +30,7 @@
register int i;
register int fd;
int Fields;
- STRING Directory;
+ char *Directory;
BOOL Map;
FILE *F;
struct stat Sb;
@@ -134,7 +134,7 @@
(void)lseek(fd, (OFFSET_T) 0, SEEK_END);
errno = 0;
- if (write(fd, (POINTER)buff, (size_t)i) != i) {
+ if (write(fd, buff, (size_t)i) != i) {
perror("write");
exit(1);
}
diff -Naur --recursive inn2-2.3.1.orig/backends/inndf.c inn2-2.3.1/backends/inndf.c
--- inn2-2.3.1.orig/backends/inndf.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/backends/inndf.c Fri Jun 8 22:44:26 2001
@@ -239,7 +239,7 @@
}
printf("%d overview data stored\n", total);
} else {
- if (OVctl(OVSPACE, (void *)&i)) {
+ if (OVctl(OVSPACE, &i)) {
if (i == -1)
printf("%s does not support -o\n", innconf->ovmethod);
else
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 22:17:22 2001
+++ inn2-2.3.1/backends/innxmit.c Fri Jun 8 22:44:26 2001
@@ -318,7 +318,7 @@
/* Dot escape, text of the line, line terminator. */
if (escdot && (*p == '.'))
*REMbuffptr++ = '.';
- (void)memcpy((POINTER)REMbuffptr, (POINTER)p, (size_t)i);
+ (void)memcpy(REMbuffptr, p, (size_t)i);
REMbuffptr += i;
*REMbuffptr++ = '\r';
*REMbuffptr++ = '\n';
@@ -994,7 +994,7 @@
}
val = TRUE;
- if (!SMsetup(SM_PREOPEN,(void *)&val)) {
+ if (!SMsetup(SM_PREOPEN,&val)) {
fprintf(stderr, "Can't setup the storage manager\n");
exit(1);
}
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/backends/nntpget.c Fri Jun 8 22:44:26 2001
@@ -219,7 +219,7 @@
char mesgid[NNTP_STRLEN];
char tbuff[SMBUF];
char temp[BUFSIZ];
- STRING Groups;
+ char *Groups;
char *distributions;
char *Since;
int i;
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 22:17:22 2001
+++ inn2-2.3.1/backends/shlock.c Fri Jun 8 22:44:26 2001
@@ -168,11 +168,11 @@
/* Write the process ID. */
if (BinaryLock)
- ok = write(fd, (POINTER)&pid, (size_t)sizeof pid) == sizeof pid;
+ ok = write(fd, &pid, (size_t)sizeof pid) == sizeof pid;
else {
(void)sprintf(buff, "%ld\n", (long) pid);
i = strlen(buff);
- ok = write(fd, (POINTER)buff, (size_t)i) == i;
+ ok = write(fd, buff, (size_t)i) == i;
}
if (!ok) {
(void)fprintf(stderr, "Can't write PID to \"%s\", %s\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 22:17:22 2001
+++ inn2-2.3.1/backends/shrinkfile.c Fri Jun 8 22:44:26 2001
@@ -224,8 +224,8 @@
/* Copy rest of file to temp. */
tmp = OpenTemp();
- while ((i = fread((POINTER)buff, (size_t)1, (size_t)sizeof buff, F)) > 0)
- if (fwrite((POINTER)buff, (size_t)1, (size_t)i, tmp) != i) {
+ while ((i = fread(buff, (size_t)1, (size_t)sizeof buff, F)) > 0)
+ if (fwrite(buff, (size_t)1, (size_t)i, tmp) != i) {
i = -1;
break;
}
@@ -247,8 +247,8 @@
}
(void)fseek(tmp, (OFFSET_T)0, SEEK_SET);
- while ((i = fread((POINTER)buff, (size_t)1, (size_t)sizeof buff, tmp)) > 0)
- if (fwrite((POINTER)buff, (size_t)1, (size_t)i, F) != i) {
+ while ((i = fread(buff, (size_t)1, (size_t)sizeof buff, tmp)) > 0)
+ if (fwrite(buff, (size_t)1, (size_t)i, F) != i) {
i = -1;
break;
}
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/expire/convdate.c Fri Jun 8 22:44:26 2001
@@ -12,7 +12,7 @@
/* This is sloppy, but good enough. */
-static STRING Program = "convdate";
+static const char Program[] = "convdate";
static BOOL
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/expire/expire.c Fri Jun 8 22:44:26 2001
@@ -80,7 +80,7 @@
static NEWSGROUP *Groups;
static NEWSGROUP EXPdefault;
static EXPIRECLASS EXPclasses[NUM_STORAGE_CLASSES+1];
-static STRING EXPreason;
+static char *EXPreason;
static time_t EXPremember;
static time_t Now;
static time_t RealNow;
@@ -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, char *Name, char *Mode, BOOL Needclean, BOOL Server, BOOL Paused)
{
FILE *F;
@@ -724,10 +724,10 @@
QIOSTATE *qp;
FILE *F;
char *active;
- STRING History;
- STRING HistoryText;
- STRING HistoryPath;
- STRING HistoryDB;
+ char *History;
+ char *HistoryText;
+ char *HistoryPath;
+ char *HistoryDB;
char *Historydir;
char *NHistory;
char *NHistorydir;
@@ -951,7 +951,7 @@
}
val = TRUE;
- if (!SMsetup(SM_RDWR, (void *)&val) || !SMsetup(SM_PREOPEN, (void *)&val)) {
+ if (!SMsetup(SM_RDWR, &val) || !SMsetup(SM_PREOPEN, &val)) {
fprintf(stderr, "Can't setup storage manager\n");
CleanupAndExit(Server, FALSE, 1);
}
diff -Naur --recursive inn2-2.3.1.orig/expire/expireover.c inn2-2.3.1/expire/expireover.c
--- inn2-2.3.1.orig/expire/expireover.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/expire/expireover.c Fri Jun 8 22:44:26 2001
@@ -111,12 +111,12 @@
}
}
- if (!ovge.delayrm && !SMsetup(SM_RDWR, (void *)&val)) {
+ if (!ovge.delayrm && !SMsetup(SM_RDWR, &val)) {
fprintf(stderr, "expireover: cant setup storage method");
exit(1);
}
i = 1;
- if (SMsetup(SM_PREOPEN, (void *)&i) && !SMinit()) {
+ if (SMsetup(SM_PREOPEN, &i) && !SMinit()) {
fprintf(stderr, "expireover: cant initialize storage method, %s",SMerrorstr);
exit(1);
}
@@ -131,12 +131,12 @@
}
if (innconf->groupbaseexpiry) {
(void)time(&ovge.now);
- if (!OVctl(OVGROUPBASEDEXPIRE, (void *)&ovge)) {
+ if (!OVctl(OVGROUPBASEDEXPIRE, &ovge)) {
fprintf(stderr, "expireover: OVctl(OVGROUPBASEDEXPIRE) failed\n");
exit(1);
}
}
- if (!OVctl(OVSTATALL, (void *)&statart)) {
+ if (!OVctl(OVSTATALL, &statart)) {
fprintf(stderr, "expireover: OVctl(OVSTATALL) failed\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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/expire/fastrm.c Fri Jun 8 22:44:26 2001
@@ -74,7 +74,7 @@
}
val = TRUE;
- if (!SMsetup(SM_RDWR, (void *)&val) || !SMsetup(SM_PREOPEN, (void *)&val)) {
+ if (!SMsetup(SM_RDWR, &val) || !SMsetup(SM_PREOPEN, &val)) {
fprintf(stderr, "Can't setup storage manager\n");
exit(1);
}
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/expire/grephistory.c Fri Jun 8 22:44:26 2001
@@ -93,7 +93,7 @@
** don't have. Or, output list of files for ones we DO have.
*/
static void
-IhaveSendme(STRING History, char What)
+IhaveSendme(char *History, char What)
{
FILE *F;
char *p;
@@ -175,7 +175,7 @@
{
int i;
FILE *F;
- STRING History;
+ char *History;
char *keystr;
HASH key;
OFFSET_T offset;
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 22:17:22 2001
+++ inn2-2.3.1/expire/makehistory.c Fri Jun 8 22:44:26 2001
@@ -102,7 +102,7 @@
}
/* Try to test for non-overlapping copies. */
- memmove((POINTER)bp->Data, (POINTER)p, (size_t)length);
+ memmove(bp->Data, p, (size_t)length);
}
bp->Used = 0;
}
@@ -120,7 +120,7 @@
RENEW(bp->Data, char, bp->Size);
}
bp->Left += len;
- memcpy((POINTER)&bp->Data[i], (POINTER)p, len);
+ memcpy(&bp->Data[i], p, len);
}
/*
@@ -164,7 +164,7 @@
B.Size = length;
RENEW(B.Data, char, B.Size + 1);
}
- (void)memcpy((POINTER)B.Data, (POINTER)p, (size_t)length + 1);
+ (void)memcpy(B.Data, p, (size_t)length + 1);
for (p = B.Data; *p; p++)
if (*p == HIS_FIELDSEP)
@@ -233,12 +233,12 @@
fprintf(stderr, "makehistory: OVopen failed\n");
_exit(1);
}
- if (!OVctl(OVSORT, (void *)&sorttype)) {
+ if (!OVctl(OVSORT, &sorttype)) {
fprintf(stderr, "makehistory: OVctl(OVSORT) failed\n");
OVclose();
_exit(1);
}
- if (!OVctl(OVCUTOFFLOW, (void *)&Cutofflow)) {
+ if (!OVctl(OVCUTOFFLOW, &Cutofflow)) {
fprintf(stderr, "makehistory: OVctl(OVCUTOFFLOW) failed\n");
OVclose();
_exit(1);
@@ -307,7 +307,7 @@
}
token = TextToToken(q);
if (!OVadd(token, r, strlen(r), arrived, expires)) {
- if (OVctl(OVSPACE, (void *)&i) && i == OV_NOSPACE) {
+ if (OVctl(OVSPACE, &i) && i == OV_NOSPACE) {
fprintf(stderr, "makehistory: no space left for overview\n");
OVclose();
Fork ? _exit(1) : exit(1);
@@ -352,13 +352,13 @@
if (sorttype == OVNOSORT) {
if (Fork) {
(void)fprintf(Overchan, "%s %d %d ", TokenToText(*token), arrived, expires);
- if (fwrite((POINTER)overdata, (size_t)1, (size_t)overlen, Overchan) != overlen) {
+ if (fwrite(overdata, (size_t)1, (size_t)overlen, Overchan) != overlen) {
fprintf(stderr, "makehistory: writing overview failed\n");
exit(1);
}
fputc('\n', Overchan);
} else if (!OVadd(*token, overdata, overlen, arrived, expires)) {
- if (OVctl(OVSPACE, (void *)&i) && i == OV_NOSPACE) {
+ if (OVctl(OVSPACE, &i) && i == OV_NOSPACE) {
fprintf(stderr, "makehistory: no space left for overview\n");
OVclose();
exit(1);
@@ -620,7 +620,7 @@
}
}
if (DoOverview && Xrefp->HeaderLength == 0) {
- if (!SMprobe(SMARTNGNUM, art->token, (void *)&ann)) {
+ if (!SMprobe(SMARTNGNUM, art->token, &ann)) {
Xrefp->Header = NULL;
Xrefp->HeaderLength = 0;
}
@@ -903,12 +903,12 @@
fprintf(stderr, "makehistory: OVopen failed\n");
exit(1);
}
- if (!OVctl(OVSORT, (void *)&sorttype)) {
+ if (!OVctl(OVSORT, &sorttype)) {
fprintf(stderr, "makehistory: OVctl(OVSORT) failed\n");
exit(1);
}
if (!Fork) {
- if (!OVctl(OVCUTOFFLOW, (void *)&Cutofflow)) {
+ if (!OVctl(OVCUTOFFLOW, &Cutofflow)) {
fprintf(stderr, "makehistory: OVctl(OVCUTOFFLOW) failed\n");
exit(1);
}
@@ -929,7 +929,7 @@
/* Init the Storage Manager */
val = TRUE;
- if (!SMsetup(SM_RDWR, (void *)&val) || !SMsetup(SM_PREOPEN, (void *)&val)) {
+ if (!SMsetup(SM_RDWR, &val) || !SMsetup(SM_PREOPEN, &val)) {
fprintf(stderr, "Can't setup storage manager\n");
exit(1);
}
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 22:17:22 2001
+++ inn2-2.3.1/expire/newsrequeue.c Fri Jun 8 22:44:26 2001
@@ -79,7 +79,7 @@
*/
static void
ParseActive(name)
- STRING name;
+ char *name;
{
char *active;
register char *p;
@@ -183,7 +183,7 @@
*/
static void
ParseNewsfeeds(name)
- STRING name;
+ char *name;
{
register char *p;
register char *to;
@@ -299,7 +299,7 @@
return;
/* Fill in the subbed array with the mask of groups. */
- (void)memset((POINTER)subbed, SUB_DEFAULT, (size_t)nGroups);
+ (void)memset(subbed, SUB_DEFAULT, (size_t)nGroups);
if ((pat = strtok(sp->Patterns, SEPS)) != NULL)
do {
subvalue = *pat != SUB_NEGATE;
@@ -382,9 +382,9 @@
char *s;
char *line;
FILE *F;
- STRING Active;
- STRING History;
- STRING Newsfeeds;
+ char *Active;
+ char *History;
+ char *Newsfeeds;
char save;
int nntplinklog;
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 22:17:22 2001
+++ inn2-2.3.1/expire/prunehistory.c Fri Jun 8 22:44:26 2001
@@ -95,7 +95,7 @@
char buff[BUFSIZ];
char *files;
HASH key;
- STRING History;
+ char *History;
BUFFER Line;
BOOL Passing;
@@ -203,7 +203,7 @@
where = ftell(rfp);
/* Read the the first chunk. */
- i = fread((POINTER)Line.Data, (size_t)1, BUFSIZ, rfp);
+ i = fread(Line.Data, (size_t)1, BUFSIZ, rfp);
if (i <= 0) {
(void)fprintf(stderr, "Bad read for \"%s\", %s\n",
buff, strerror(errno));
@@ -212,12 +212,12 @@
Line.Used = i;
/* No newline; get another chunk and try again. */
- while ((p = memchr((POINTER)Line.Data, '\n', (size_t)Line.Used)) == NULL) {
+ while ((p = memchr(Line.Data, '\n', (size_t)Line.Used)) == NULL) {
if (Line.Used + BUFSIZ >= Line.Size) {
Line.Size += BUFSIZ;
RENEW(Line.Data, char, Line.Size);
}
- i = fread((POINTER)&Line.Data[Line.Used], (size_t)1, BUFSIZ, rfp);
+ i = fread(&Line.Data[Line.Used], (size_t)1, BUFSIZ, rfp);
if (i <= 0)
break;
Line.Used += i;
@@ -242,7 +242,7 @@
/* If Message-ID was only thing on line, zap the text line. */
if (*files == '\0') {
- (void)memset((POINTER)Line.Data, ' ', (size_t)Line.Used);
+ (void)memset(Line.Data, ' ', (size_t)Line.Used);
if (xwrite(wfd, Line.Data, Line.Used) < 0)
(void)fprintf(stderr, "Can't blank \"%s\", %s\n",
buff, strerror(errno));
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/frontends/ctlinnd.c Fri Jun 8 22:44:26 2001
@@ -19,8 +19,8 @@
** Datatype for an entry in the command table.
*/
typedef struct _COMMAND {
- STRING Command;
- STRING Text;
+ char *Command;
+ char *Text;
int argc;
char Letter;
BOOL Glue;
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 22:17:22 2001
+++ inn2-2.3.1/frontends/inews.c Fri Jun 8 22:44:26 2001
@@ -44,7 +44,7 @@
} HEADERTYPE;
typedef struct _HEADER {
- STRING Name;
+ char *Name;
BOOL CanSet;
HEADERTYPE Type;
int Size;
@@ -63,7 +63,7 @@
static int OtherCount;
static int OtherSize;
static char *Exclusions = "";
-static STRING BadDistribs[] = {
+static char *BadDistribs[] = {
BAD_DISTRIBS
};
@@ -568,7 +568,7 @@
static void CheckDistribution(char *p)
{
static char SEPS[] = " \t,";
- register STRING **dp;
+ register char **dp;
if ((p = strtok(p, SEPS)) == NULL) {
(void)fprintf(stderr, "Can't parse Distribution line.\n");
@@ -800,7 +800,7 @@
}
/* Read it in. */
- length = fread((POINTER)buff, (size_t)1, (size_t)sizeof buff - 2, F);
+ length = fread(buff, (size_t)1, (size_t)sizeof buff - 2, F);
i = feof(F);
(void)fclose(F);
if (length == 0) {
@@ -966,7 +966,7 @@
PerrorExit(FALSE, "Can't write headers");
/* Write the article and exit. */
- if (fwrite((POINTER)article, (size_t)1, Length, F) != Length)
+ if (fwrite(article, (size_t)1, Length, F) != Length)
PerrorExit(FALSE, "Can't write article");
if (FLUSH_ERROR(F))
PerrorExit(FALSE, "Can't write article");
@@ -1187,7 +1187,7 @@
PerrorExit(TRUE, "Can't write headers");
/* Write the article and exit. */
- if (fwrite((POINTER)article, (size_t)1, Length, stdout) != Length)
+ if (fwrite(article, (size_t)1, Length, stdout) != Length)
PerrorExit(TRUE, "Can't write article");
SafeFlush(stdout);
QuitServer(0);
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 22:17:22 2001
+++ inn2-2.3.1/frontends/rnews.c Fri Jun 8 22:44:26 2001
@@ -26,7 +26,7 @@
typedef struct _HEADER {
- STRING Name;
+ char *Name;
int size;
} HEADER;
@@ -202,7 +202,7 @@
return;
}
i = strlen(article);
- if (fwrite((POINTER)article, (size_t)1, (size_t)i, F) != i)
+ if (fwrite(article, (size_t)1, (size_t)i, F) != i)
syslog(L_ERROR, "cant fwrite %s %m", buff);
if (fclose(F) == EOF)
syslog(L_ERROR, "cant close %s %m", buff);
@@ -487,7 +487,7 @@
char *p;
#endif /* defined(DO_RNEWSPROGS) */
char buff[SMBUF];
- STRING cargv[4];
+ char *cargv[4];
int artsize;
int i;
int gzip = 0;
@@ -737,7 +737,7 @@
}
/* Write out what we read. */
for (count += i, p = buff; i; p += j, i -= j)
- if ((j = write(spfd, (POINTER)p, (size_t)i)) <= 0) {
+ if ((j = write(spfd, p, (size_t)i)) <= 0) {
syslog(L_FATAL, "cant write around %d %m", count);
status++;
break;
diff -Naur --recursive inn2-2.3.1.orig/frontends/sm.c inn2-2.3.1/frontends/sm.c
--- inn2-2.3.1.orig/frontends/sm.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/frontends/sm.c Fri Jun 8 22:44:26 2001
@@ -57,7 +57,7 @@
if (Delete) {
val = TRUE;
- if (!SMsetup(SM_RDWR, (void *)&val)) {
+ if (!SMsetup(SM_RDWR, &val)) {
fprintf(stderr, "Can't setup storage manager\n");
exit(1);
}
@@ -76,7 +76,7 @@
}
token = TextToToken(argv[i]);
if (Artinfo) {
- if (!SMprobe(SMARTNGNUM, &token, (void *)&ann)) {
+ if (!SMprobe(SMARTNGNUM, &token, &ann)) {
if (!Quiet)
fprintf(stderr, "Could not get art info %s\n", argv[i]);
} else {
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/include/acconfig.h Fri Jun 8 22:44:26 2001
@@ -275,12 +275,6 @@
** following the comments before each item and fixing it.
*/
-/* All occurrances of these typedefs anywhere should be replaced by their
- ANSI/ISO/standard C definitions given in these typedefs and #defines. */
-
-typedef char const * STRING;
-typedef char * const CSTRING;
-
/* Programming convenience. Since we need bool anyway for Perl, we should
use the lowercase version everywhere. */
typedef int BOOL;
diff -Naur --recursive inn2-2.3.1.orig/include/clibrary.h inn2-2.3.1/include/clibrary.h
--- inn2-2.3.1.orig/include/clibrary.h Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/include/clibrary.h Fri Jun 8 22:44:26 2001
@@ -203,13 +203,6 @@
#define DO_NEED_BOOL 1
#endif
-/* All occurrances of these typedefs anywhere should be replaced by their
- ANSI/ISO/standard C definitions given in these typedefs. autoconf magic
- will make sure that everything except void works fine, and void we're
- just assuming works. */
-typedef void * POINTER;
-typedef const void * CPOINTER;
-
/* Some functions like accept() and getsockopt() take a pointer to a size_t
on some platforms and a pointer to an int on others. Just always using
size_t should work most everywhere. */
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/include/config.h.in Fri Jun 8 22:44:26 2001
@@ -566,11 +566,6 @@
** following the comments before each item and fixing it.
*/
-/* All occurrances of these typedefs anywhere should be replaced by their
- ANSI/ISO/standard C definitions given in these typedefs and #defines. */
-typedef char const * STRING;
-typedef char * const CSTRING;
-
/* Programming convenience. Since we need bool anyway for Perl, we should
use the lowercase version everywhere. */
typedef int BOOL;
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 22:17:22 2001
+++ inn2-2.3.1/innd/art.c Fri Jun 8 22:44:26 2001
@@ -31,7 +31,7 @@
** doing an extra indirection.
*/
typedef struct _TREE {
- STRING Name;
+ char *Name;
ARTHEADER *Header;
struct _TREE *Before;
struct _TREE *After;
@@ -276,8 +276,8 @@
*/
static int
ARTcompare(p1, p2)
- CPOINTER p1;
- CPOINTER p2;
+ const void * p1;
+ const void * p2;
{
ARTHEADER **h1;
ARTHEADER **h2;
@@ -293,14 +293,14 @@
*/
void ARTsetup(void)
{
- STRING p;
+ char *p;
ARTHEADER *hp;
ARTHEADER **table;
int i;
/* Set up the character class tables. These are written a
* little strangely to work around a GCC2.0 bug. */
- (void)memset((POINTER)ARTcclass, 0, sizeof ARTcclass);
+ (void)memset(ARTcclass, 0, sizeof ARTcclass);
p = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
while ((i = *p++) != 0) {
ARTcclass[i] = CC_HOSTNAME | CC_MSGID_ATOM | CC_MSGID_NORM;
@@ -333,7 +333,7 @@
table = NEW(ARTHEADER*, SIZEOF(ARTheaders));
for (i = 0; i < SIZEOF(ARTheaders); i++)
table[i] = &ARTheaders[i];
- qsort((POINTER)table, SIZEOF(ARTheaders), sizeof *table, ARTcompare);
+ qsort(table, SIZEOF(ARTheaders), sizeof *table, ARTcompare);
ARTheadertree = ARTbuildtree(table, 0, SIZEOF(ARTheaders));
DISPOSE(table);
@@ -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, char **errorp)
{
static char buff[SMBUF];
static char COLONSPACE[] = "No colon-space in \"%s\" header";
@@ -674,7 +674,7 @@
return NULL;
}
hp->Length = i;
- (void)memcpy((POINTER)hp->Value, (POINTER)p, (size_t)i);
+ (void)memcpy(hp->Value, p, (size_t)i);
hp->Value[i] = '\0';
return in;
@@ -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 char *ARTclean(BUFFER *Article, ARTDATA *Data)
{
static char buff[SMBUF];
ARTHEADER *hp;
@@ -775,7 +775,7 @@
char *out;
int i;
char *p;
- STRING error;
+ char *error;
int delta;
/* Read through the headers one at a time. */
@@ -1608,8 +1608,8 @@
int
wvec_freq_cmp(p1, p2)
- CPOINTER p1;
- CPOINTER p2;
+ const void *p1;
+ const void *p2;
{
struct word_entry *w1, *w2;
@@ -1624,8 +1624,8 @@
int
wvec_length_cmp(p1, p2)
- CPOINTER p1;
- CPOINTER p2;
+ const void *p1;
+ const void *p2;
{
struct word_entry *w1, *w2;
@@ -1640,8 +1640,8 @@
int
ptr_strcmp(p1, p2)
- CPOINTER p1;
- CPOINTER p2;
+ const void *p1;
+ const void *p2;
{
int cdiff;
char **s1, **s2;
@@ -1932,7 +1932,7 @@
** file or reject it, feed it to the other sites. Return the NNTP
** message to send back.
*/
-STRING ARTpost(CHANNEL *cp)
+char *ARTpost(CHANNEL *cp)
{
static BUFFER Files;
static BUFFER Header;
@@ -1961,7 +1961,7 @@
char **hops;
int hopcount;
char **distributions;
- STRING error;
+ char *error;
char ControlWord[SMBUF];
int oerrno;
TOKEN token;
@@ -2505,7 +2505,7 @@
if (innconf->enableoverview && !innconf->useoverchan) {
TMRstart(TMR_OVERV);
if (!OVadd(token, Data.Overview->Data, Data.Overview->Left, Data.Arrived, Data.Expires)) {
- if (OVctl(OVSPACE, (void *)&i) && i == OV_NOSPACE)
+ if (OVctl(OVSPACE, &i) && i == OV_NOSPACE)
IOError("creating overview", ENOSPC);
else
IOError("creating overview", 0);
diff -Naur --recursive inn2-2.3.1.orig/innd/art.h inn2-2.3.1/innd/art.h
--- inn2-2.3.1.orig/innd/art.h Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/innd/art.h Fri Jun 8 22:44:26 2001
@@ -17,7 +17,7 @@
** Entry in the header table.
*/
typedef struct _ARTHEADER {
- STRING Name;
+ char *Name;
ARTHEADERTYPE Type;
int Size; /* Length of Name */
char *Value;
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 22:17:22 2001
+++ inn2-2.3.1/innd/cc.c Fri Jun 8 22:47:58 2001
@@ -33,51 +33,51 @@
typedef struct _CCDISPATCH {
char Name;
int argc;
- STRING (*Function)();
+ char *(*Function)();
} 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 char *CCaddhist();*/
+static char *CCallow();
+static char *CCbegin();
+static char *CCchgroup();
+static char *CCdrop();
+static char *CCfeedinfo();
+static char *CCflush();
+static char *CCflushlogs();
+static char *CCgo();
+static char *CChangup();
+static char *CCreserve();
+static char *CClogmode();
+static char *CCmode();
+static char *CCname();
+static char *CCnewgroup();
+static char *CCparam();
+static char *CCpause();
+static char *CCreaders();
+static char *CCreject();
+static char *CCreload();
+static char *CCrenumber();
+static char *CCrmgroup();
+static char *CCsend();
+static char *CCshutdown();
+static char *CCsignal();
+static char *CCstatus();
+static char *CCthrottle();
+static char *CCtimer();
+static char *CCtrace();
+static char *CCxabort();
+static char *CCxexec();
#if defined(DO_TCL)
-static STRING CCfilter();
+static char *CCfilter();
#endif /* defined(DO_TCL) */
#if defined(DO_PERL)
-static STRING CCperl();
+static char *CCperl();
#endif /* defined(DO_PERL) */
#if defined(DO_PYTHON)
-static STRING CCpython();
+static char *CCpython();
#endif /* defined(DO_PYTHON) */
-static STRING CClowmark();
+static char *CClowmark();
static char *CCpath = NULL;
@@ -166,7 +166,7 @@
/*
** Return a string representing our operating mode.
*/
-static STRING
+static char *
CCcurrmode()
{
static char buff[32];
@@ -189,7 +189,7 @@
/*
** Add <> around Message-ID if needed.
*/
-static STRING
+static char *
CCgetid(p, store)
char *p;
char **store;
@@ -226,7 +226,7 @@
/*
** Abort and dump core.
*/
-static STRING
+static char *
CCxabort(av)
char *av[];
{
@@ -241,13 +241,13 @@
/*
** Do the work needed to add a history entry.
*/
-STRING
+char *
CCaddhist(av)
char *av[];
{
static char DIGITS[] = "0123456789";
ARTDATA Data;
- STRING p;
+ char *p;
BOOL ok;
HASH hash;
int i;
@@ -320,7 +320,7 @@
/*
** Do the work to allow foreign connectiosn.
*/
-static STRING
+static char *
CCallow(av)
char *av[];
{
@@ -340,16 +340,16 @@
/*
** Do the work needed to start feeding a (new) site.
*/
-static STRING
+static char *
CCbegin(char *av[])
{
SITE *sp;
int i;
int length;
- STRING p;
+ char *p;
char **strings;
NEWSGROUP *ngp;
- STRING error;
+ char *error;
char *subbed;
char *poison;
@@ -395,7 +395,7 @@
DISPOSE(subbed);
DISPOSE(poison);
if (error != NULL) {
- DISPOSE((void *)p);
+ DISPOSE(p);
syslog(L_ERROR, "%s bad_newsfeeds %s", av[0], error);
return "1 Parse error";
}
@@ -410,7 +410,7 @@
/*
** Common code to change a group's flags.
*/
-static STRING
+static char *
CCdochange(ngp, Rest)
register NEWSGROUP *ngp;
char *Rest;
@@ -441,7 +441,7 @@
/*
** Change the mode of a newsgroup.
*/
-static STRING
+static char *
CCchgroup(av)
char *av[];
{
@@ -463,12 +463,12 @@
/*
** Cancel a message.
*/
-STRING
+char *
CCcancel(av)
char *av[];
{
ARTDATA Data;
- STRING p;
+ char *p;
Data.Posted = Data.Arrived = Now.time;
Data.Expires = 0;
@@ -500,7 +500,7 @@
** Syntax-check the newsfeeds file.
*/
/* ARGSUSED */
-STRING
+char *
CCcheckfile(av)
char *av[];
{
@@ -508,7 +508,7 @@
register char *p;
register int i;
register int errors;
- STRING error;
+ char *error;
SITE fake;
/* Parse all site entries. */
@@ -544,7 +544,7 @@
/*
** Drop a site.
*/
-static STRING
+static char *
CCdrop(av)
char *av[];
{
@@ -576,7 +576,7 @@
/*
** Return info on the feeds for one, or all, sites
*/
-static STRING
+static char *
CCfeedinfo(av)
char *av[];
{
@@ -605,7 +605,7 @@
#if defined(DO_TCL)
-static STRING
+static char *
CCfilter(av)
char *av[];
{
@@ -637,7 +637,7 @@
extern CV *perl_filter_cv ;
-static STRING
+static char *
CCperl(av)
char *av[];
{
@@ -665,7 +665,7 @@
#if defined(DO_PYTHON)
-static STRING
+static char *
CCpython(av)
char *av[];
{
@@ -677,7 +677,7 @@
/*
** Flush all sites or one site.
*/
-static STRING
+static char *
CCflush(av)
char *av[];
{
@@ -706,7 +706,7 @@
** Flush the log files.
*/
/* ARGSUSED0 */
-static STRING
+static char *
CCflushlogs(av)
char *av[];
{
@@ -724,7 +724,7 @@
/*
** Leave paused or throttled mode.
*/
-static STRING
+static char *
CCgo(av)
char *av[];
{
@@ -769,7 +769,7 @@
syslog(L_NOTICE, "%s running", LogName);
if (ICDneedsetup)
ICDsetup(TRUE);
- SCHANwakeup((POINTER)&Mode);
+ SCHANwakeup(&Mode);
return NULL;
}
@@ -777,7 +777,7 @@
/*
** Hangup a channel.
*/
-static STRING
+static char *
CChangup(av)
char *av[];
{
@@ -819,7 +819,7 @@
** Return our operating mode.
*/
/* ARGSUSED */
-static STRING
+static char *
CCmode(av)
char *av[];
{
@@ -959,7 +959,7 @@
** Log our operating mode (via syslog).
*/
/* ARGSUSED */
-static STRING
+static char *
CClogmode(av)
char *av[];
{
@@ -971,7 +971,7 @@
/*
** Name the channels. ("Name the bats -- simple names.")
*/
-static STRING
+static char *
CCname(char *av[])
{
static char NL[] = "\n";
@@ -1037,7 +1037,7 @@
/*
** Create a newsgroup.
*/
-static STRING
+static char *
CCnewgroup(av)
char *av[];
{
@@ -1048,7 +1048,7 @@
NEWSGROUP *ngp;
char *Name;
char *Rest;
- STRING who;
+ char *who;
char *buff;
int oerrno;
@@ -1150,7 +1150,7 @@
/*
** Change a running parameter.
*/
-static STRING
+static char *
CCparam(av)
char *av[];
{
@@ -1217,13 +1217,13 @@
/*
** Common code to implement a pause or throttle.
*/
-STRING
+char *
CCblock(NewMode, reason)
OPERATINGMODE NewMode;
char *reason;
{
static char NO[] = "n";
- STRING av[2];
+ char *av[2];
if (*reason == '\0')
return CCnoreason;
@@ -1267,7 +1267,7 @@
/*
** Enter paused mode.
*/
-static STRING
+static char *
CCpause(av)
char *av[];
{
@@ -1286,7 +1286,7 @@
/*
** Allow or disallow newsreaders.
*/
-static STRING
+static char *
CCreaders(av)
char *av[];
{
@@ -1322,7 +1322,7 @@
/*
** Re-exec ourselves.
*/
-static STRING
+static char *
CCxexec(av)
char *av[];
{
@@ -1358,7 +1358,7 @@
/*
** Reject remote readers.
*/
-static STRING
+static char *
CCreject(av)
char *av[];
{
@@ -1374,7 +1374,7 @@
/*
** Re-read all in-core data.
*/
-static STRING
+static char *
CCreload(av)
char *av[];
{
@@ -1385,7 +1385,7 @@
#if defined(DO_PYTHON)
static char BADPYRELOAD[] = "1 Failed to reload filter_innd.py" ;
#endif /* defined(DO_PYTHON) */
- STRING p;
+ char *p;
p = av[0];
if (*p == '\0' || EQ(p, "all")) {
@@ -1477,7 +1477,7 @@
/*
** Renumber the active file.
*/
-static STRING
+static char *
CCrenumber(av)
char *av[];
{
@@ -1505,7 +1505,7 @@
/*
** Reserve a lock.
*/
-static STRING
+static char *
CCreserve(av)
char *av[];
{
@@ -1536,7 +1536,7 @@
/*
** Remove a newsgroup.
*/
-static STRING
+static char *
CCrmgroup(av)
char *av[];
{
@@ -1559,7 +1559,7 @@
/*
** Send a command line to an exploder.
*/
-static STRING
+static char *
CCsend(av)
char *av[];
{
@@ -1577,7 +1577,7 @@
/*
** Shut down the system.
*/
-static STRING
+static char *
CCshutdown(av)
char *av[];
{
@@ -1591,7 +1591,7 @@
/*
** Send a signal to a site's feed.
*/
-static STRING
+static char *
CCsignal(av)
char *av[];
{
@@ -1639,7 +1639,7 @@
/*
** Enter throttled mode.
*/
-static STRING
+static char *
CCthrottle(av)
char *av[];
{
@@ -1662,7 +1662,7 @@
/*
** Turn on or off performance monitoring
*/
-static STRING CCtimer(char *av[]) {
+static char *CCtimer(char *av[]) {
int value;
char *p;
@@ -1682,7 +1682,7 @@
/*
** Turn innd status creation on or off
*/
-static STRING CCstatus(char *av[]) {
+static char *CCstatus(char *av[]) {
int value;
char *p;
@@ -1702,13 +1702,13 @@
/*
** Add or remove tracing.
*/
-static STRING
+static char *
CCtrace(av)
char *av[];
{
char *p;
BOOL Flag;
- STRING word;
+ char *word;
CHANNEL *cp;
/* Parse the flag. */
@@ -1778,7 +1778,7 @@
{
static char TOOLONG[] = "0 Reply too long for server to send";
register CCDISPATCH *dp;
- register STRING p;
+ register char *p;
register char *q;
ICC_MSGLENTYPE bufflen;
ICC_PROTOCOLTYPE protocol ;
@@ -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 char *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 22:17:22 2001
+++ inn2-2.3.1/innd/chan.c Fri Jun 8 22:46:45 2001
@@ -56,7 +56,7 @@
RENEW(bp->Data, char, bp->Size);
}
bp->Left += len;
- memcpy((POINTER)&bp->Data[i], (POINTER)p, len);
+ memcpy(&bp->Data[i], p, len);
}
/*
@@ -73,7 +73,7 @@
}
/* Try to test for non-overlapping copies. */
- memmove((POINTER)bp->Data, (POINTER)p, (size_t)length);
+ memmove(bp->Data, p, (size_t)length);
}
bp->Used = 0;
}
@@ -144,7 +144,7 @@
CHANshutdown();
CHANtablesize = i;
CHANtable = NEW(CHANNEL, CHANtablesize);
- (void)memset((POINTER)CHANtable, 0,
+ (void)memset(CHANtable, 0,
(size_t)(CHANtablesize * sizeof *CHANtable));
CHANnull.NextLog = innconf->chaninacttime;
CHANnull.Address.s_addr = MyAddress.s_addr;
@@ -157,7 +157,7 @@
** Create a channel from a descriptor.
*/
CHANNEL *CHANcreate(int fd, CHANNELTYPE Type, CHANNELSTATE State,
- void (*Reader)(), void (*WriteDone())
+ void (*Reader)(), void (*WriteDone)())
{
CHANNEL *cp;
BUFFER in;
@@ -362,7 +362,7 @@
static char buff[SMBUF];
int i;
SITE *sp;
- STRING p;
+ char *p;
pid_t pid;
switch (cp->Type) {
@@ -487,7 +487,7 @@
** Put a channel to sleep, call a function when it wakes.
** Note that the Argument must be NULL or allocated memory!
*/
-void SCHANadd(CHANNEL *cp, time_t Waketime, POINTER Event, void (*Waker)(), POINTER Argument)
+void SCHANadd(CHANNEL *cp, time_t Waketime, void *Event, void (*Waker)(), void *Argument)
{
if (!FD_ISSET(cp->fd, &SCHANmask)) {
SCHANcount++;
@@ -536,7 +536,7 @@
/*
** Wake up channels waiting for a specific event.
*/
-void SCHANwakeup(POINTER *Event)
+void SCHANwakeup(void *Event)
{
CHANNEL *cp;
int i;
@@ -678,14 +678,14 @@
do {
/* Try the standard case -- write it all. */
- i = write(fd, (POINTER)p, (size_t)length);
+ i = write(fd, p, (size_t)length);
if (i > 0 || (i < 0 && errno != EMSGSIZE && errno != EINTR))
return i;
} while (i < 0 && errno == EINTR);
/* Write it in pieces. */
for (save = p, i = 0; length; p += i, length -= i) {
- i = write(fd, (POINTER)p, (size_t)(length > BUFSIZ ? BUFSIZ : length));
+ i = write(fd, p, (size_t)(length > BUFSIZ ? BUFSIZ : length));
if (i <= 0)
break;
}
@@ -758,8 +758,7 @@
}
i *= innconf->blockbackoff;
syslog(L_ERROR, "%s blocked sleeping %d", p, i);
- SCHANadd(cp, (time_t)(Now.time + i), (POINTER)NULL,
- CHANwakeup, (POINTER)NULL);
+ SCHANadd(cp, (time_t)(Now.time + i), NULL, CHANwakeup, NULL);
}
@@ -1036,7 +1035,7 @@
WCHANremove(cp);
SCHANadd(cp,
(time_t)(Now.time + innconf->pauseretrytime),
- (POINTER)NULL, CHANwakeup, (POINTER)NULL);
+ NULL, CHANwakeup, NULL);
}
}
else {
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/innd/his.c Fri Jun 8 22:44:26 2001
@@ -123,7 +123,7 @@
DISPOSE(HIScache);
HIScachesize = (HIScachesize / sizeof(_HIScache));
HIScache = NEW(_HIScache, HIScachesize);
- memset((void *)HIScache, '\0', HIScachesize * sizeof(_HIScache));
+ memset(HIScache, '\0', HIScachesize * sizeof(_HIScache));
}
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 22:17:22 2001
+++ inn2-2.3.1/innd/icd.c Fri Jun 8 22:44:26 2001
@@ -31,7 +31,7 @@
void ICDiovset(IOVEC *iovp, char *base, int len) {
(iovp)->iov_len = len;
(iovp)->iov_base = NEW(char, (iovp)->iov_len);
- (void)memcpy((POINTER)(iovp)->iov_base, (POINTER)base,
+ (void)memcpy((iovp)->iov_base, base,
(size_t)(iovp)->iov_len);
}
#define ICDiovrelease(iovp) DISPOSE((iovp)->iov_base)
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 22:17:22 2001
+++ inn2-2.3.1/innd/innd.c Fri Jun 8 22:44:26 2001
@@ -401,7 +401,7 @@
ThrottleIOError(char *when)
{
char buff[SMBUF];
- STRING p;
+ char *p;
int oerrno;
if (Mode == OMrunning) {
@@ -427,7 +427,7 @@
ThrottleNoMatchError(void)
{
char buff[SMBUF];
- STRING p;
+ char *p;
int oerrno;
if (Mode == OMrunning) {
@@ -891,7 +891,7 @@
ICDsetup(TRUE);
val = TRUE;
- if (!SMsetup(SM_RDWR, (void *)&val) || !SMsetup(SM_PREOPEN, (void *)&val)) {
+ if (!SMsetup(SM_RDWR, &val) || !SMsetup(SM_PREOPEN, &val)) {
syslog(L_FATAL, "%s cant setup the storage subsystem", LogName);
exit(1);
}
diff -Naur --recursive inn2-2.3.1.orig/innd/innd.h inn2-2.3.1/innd/innd.h
--- inn2-2.3.1.orig/innd/innd.h Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/innd/innd.h Fri Jun 8 22:46:04 2001
@@ -189,8 +189,8 @@
time_t Waketime;
time_t Started;
void (*Waker)();
- POINTER Argument;
- POINTER Event;
+ void *Argument;
+ void *Event;
BUFFER In;
BUFFER Out;
BOOL Tracing;
@@ -335,8 +335,8 @@
** are not always valid.
*/
typedef struct _ARTDATA {
- STRING Poster;
- STRING Replyto;
+ char *Poster;
+ char *Replyto;
char *Body;
time_t Posted;
time_t Arrived;
@@ -352,19 +352,19 @@
int NameLength;
char TimeReceived[33];
int TimeReceivedLength;
- STRING MessageID;
+ char *MessageID;
int MessageIDLength;
- STRING Newsgroups;
+ char *Newsgroups;
int NewsgroupsLength;
- STRING Distribution;
+ char *Distribution;
int DistributionLength;
- STRING Feedsite;
+ char *Feedsite;
int FeedsiteLength;
- STRING Path;
+ char *Path;
int PathLength;
- STRING Replic;
+ char *Replic;
int ReplicLength;
- STRING StoredGroup;
+ char *StoredGroup;
int StoredGroupLength;
HASH *Hash;
BUFFER *Headers;
@@ -427,7 +427,7 @@
extern BOOL Tracing;
EXTERN int Overfdcount;
EXTERN int SeqNum;
-EXTERN STRING path;
+EXTERN char *path;
EXTERN BUFFER Path;
EXTERN BUFFER Pathalias;
EXTERN char *ModeReason; /* NNTP reject message */
@@ -459,7 +459,7 @@
EXTERN BOOL ThrottledbyIOError;
EXTERN BOOL AddAlias;
EXTERN BOOL Hassamepath;
-EXTERN STRING NCgreeting;
+EXTERN char *NCgreeting;
/*
** Table size for limiting incoming connects. Do not change the table
@@ -501,7 +501,7 @@
extern BOOL ARTreadschema(void);
extern const char *ARTreadarticle(char *files);
extern char *ARTreadheader(char *files);
-extern STRING ARTpost(CHANNEL *cp);
+extern char *ARTpost(CHANNEL *cp);
extern void ARTcancel(const ARTDATA *Data, const char *MessageID, const BOOL Trusted);
extern void ARTclose(void);
extern void ARTsetup(void);
@@ -527,9 +527,9 @@
extern void RCHANadd(CHANNEL *cp);
extern void RCHANremove(CHANNEL *cp);
-extern void SCHANadd(CHANNEL *cp, time_t Waketime, POINTER Event, void (*Waker)(), POINTER Argument);
+extern void SCHANadd(CHANNEL *cp, time_t Waketime, void *Event, void (*Waker)(), void *Argument);
extern void SCHANremove(CHANNEL *cp);
-extern void SCHANwakeup(POINTER *Event);
+extern void SCHANwakeup(void *Event);
extern BOOL WCHANflush(CHANNEL *cp);
extern void WCHANadd(CHANNEL *cp);
@@ -537,10 +537,10 @@
extern void WCHANsetfrombuffer(CHANNEL *cp, BUFFER *bp);
extern void CCcopyargv();
-extern STRING CCblock();
-extern STRING CCcancel();
-extern STRING CCcheckfile();
-extern STRING CCaddhist(char *av[]);
+extern char *CCblock();
+extern char *CCcancel();
+extern char *CCcheckfile();
+extern char *CCaddhist(char *av[]);
extern BOOL HIShavearticle(const HASH MessageID);
extern BOOL HISwrite(const ARTDATA *Data, const HASH hash, char *paths, TOKEN *token);
@@ -611,7 +611,7 @@
extern char **SITEreadfile();
extern SITE *SITEfind();
extern SITE *SITEfindnext();
-extern STRING SITEparseone();
+extern char *SITEparseone();
extern void SITEchanclose();
extern void SITEdrop();
extern void SITEflush();
@@ -668,7 +668,7 @@
#if defined(DO_PYTHON)
extern BOOL PythonFilterActive;
-extern STRING PYcontrol(char **av);
+extern char *PYcontrol(char **av);
extern int PYreadfilter(void);
extern char *PYartfilter(char *artBody, long artLen, int lines);
extern char *PYmidfilter(char *messageID, int msglen);
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/innd/lc.c Fri Jun 8 22:44:26 2001
@@ -80,7 +80,7 @@
syslog(L_FATAL, "%s cant socket %s %m", LogName, LCpath);
exit(1);
}
- (void)memset((POINTER)&server, 0, sizeof server);
+ (void)memset(&server, 0, sizeof server);
server.sun_family = AF_UNIX;
(void)strcpy(server.sun_path, LCpath);
if (bind(i, (struct sockaddr *) &server, SUN_LEN(&server)) < 0) {
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 22:17:22 2001
+++ inn2-2.3.1/innd/nc.c Fri Jun 8 22:44:26 2001
@@ -24,7 +24,7 @@
** of every command we support.
*/
typedef struct _NCDISPATCH {
- STRING Name;
+ char *Name;
void (*Function)();
int Size;
} NCDISPATCH;
@@ -182,7 +182,7 @@
static void
NCpostit(CHANNEL *cp)
{
- STRING response;
+ char *response;
/* Note that some use break, some use return here. */
switch (Mode) {
@@ -191,7 +191,7 @@
return;
case OMpaused:
SCHANadd(cp, (time_t)(Now.time + innconf->pauseretrytime),
- (POINTER)&Mode, NCpostit, (POINTER)NULL);
+ &Mode, NCpostit, NULL);
return;
case OMrunning:
response = ARTpost(cp);
@@ -921,7 +921,7 @@
bp->Used = cp->SaveUsed;
RCHANremove(cp); /* don't bother trying to read more for now */
SCHANadd(cp, (time_t)(Now.time + innconf->pauseretrytime),
- (POINTER)&Mode, NCproc, (POINTER)NULL);
+ &Mode, NCproc, NULL);
return;
}
@@ -1174,7 +1174,7 @@
** would require changes to the bp structure and
** the way it is used.
*/
- (void)memmove((POINTER)bp->Data, (POINTER)&bp->Data[cp->Rest], (size_t)bp->Used);
+ (void)memmove(bp->Data, &bp->Data[cp->Rest], (size_t)bp->Used);
cp->Rest = cp->Lastch = 0;
} else {
bp->Used = cp->Lastch = 0;
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 22:17:22 2001
+++ inn2-2.3.1/innd/newsfeeds.c Fri Jun 8 22:44:26 2001
@@ -198,7 +198,7 @@
** If subbed is NULL, we don't update the SITE array, since we're just
** doing syntax checking.
*/
-STRING SITEparseone(char *Entry, SITE *sp, char *subbed, char *poison)
+char *SITEparseone(char *Entry, SITE *sp, char *subbed, char *poison)
{
int i;
int j;
@@ -262,8 +262,8 @@
if (subbed) {
/* Read the subscription patterns and set the bits. */
- (void)memset((POINTER)subbed, SUB_DEFAULT, (size_t)nGroups);
- (void)memset((POINTER)poison, SUB_DEFAULT, (size_t)nGroups);
+ (void)memset(subbed, SUB_DEFAULT, (size_t)nGroups);
+ (void)memset(poison, SUB_DEFAULT, (size_t)nGroups);
if (ME.Patterns)
SITEsetlist(ME.Patterns, subbed, poison, &ME.PoisonEntry);
SITEsetlist(sp->Patterns, subbed, poison, &sp->PoisonEntry);
@@ -607,7 +607,7 @@
SITE *sp;
char *subbed;
char *poison;
- STRING error;
+ char *error;
int errors;
int setuperrors;
@@ -625,7 +625,7 @@
for (strings = SITEreadfile(FALSE), nSites = 0; strings[nSites]; nSites++)
continue;
Sites = NEW(SITE, nSites);
- (void)memset((POINTER)Sites, '\0', (size_t)(nSites * sizeof(SITE)));
+ (void)memset(Sites, '\0', (size_t)(nSites * sizeof(SITE)));
/* Set up scratch subscription list. */
subbed = NEW(char, nGroups);
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 22:17:22 2001
+++ inn2-2.3.1/innd/ng.c Fri Jun 8 22:44:26 2001
@@ -55,8 +55,8 @@
*/
static int
NGcompare(p1, p2)
- CPOINTER p1;
- CPOINTER p2;
+ const void * p1;
+ const void * p2;
{
NEWSGROUP **ng1;
NEWSGROUP **ng2;
@@ -230,7 +230,7 @@
/* Sort each bucket. */
for (i = NGH_SIZE, htp = NGHtable; --i >= 0; htp++)
if (htp->Used > 1)
- qsort((POINTER)htp->Groups, (size_t)htp->Used,
+ qsort(htp->Groups, (size_t)htp->Used,
sizeof htp->Groups[0], NGcompare);
/* Chase down any alias flags. */
diff -Naur --recursive inn2-2.3.1.orig/innd/python.c inn2-2.3.1/innd/python.c
--- inn2-2.3.1.orig/innd/python.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/innd/python.c Fri Jun 8 22:44:26 2001
@@ -65,7 +65,7 @@
/*
** Front end for PYfilter()
*/
-STRING
+char *
PYcontrol(av)
char **av;
{
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 22:17:22 2001
+++ inn2-2.3.1/innd/rc.c Fri Jun 8 22:44:26 2001
@@ -20,7 +20,7 @@
#endif
#define COPYADDR(dest, src) \
- (void)memcpy((POINTER)dest, (POINTER)src, (size_t)sizeof (INADDR))
+ (void)memcpy(dest, src, (size_t)sizeof (INADDR))
#define TEST_CONFIG(a, b) \
{ \
@@ -298,7 +298,7 @@
void
RChandoff(int fd, HANDOFF h)
{
- STRING argv[6];
+ char *argv[6];
char buff[SMBUF];
int i;
@@ -1575,7 +1575,7 @@
(caddr_t)&on, sizeof on) < 0)
syslog(L_ERROR, "%s cant setsockopt RCreader %m", LogName);
#endif /* defined(SO_REUSEADDR) */
- (void)memset((POINTER)&server, 0, sizeof server);
+ (void)memset(&server, 0, sizeof server);
server.sin_port = htons(innconf->port);
server.sin_family = AF_INET;
server.sin_addr.s_addr = htonl(INADDR_ANY);
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 22:17:22 2001
+++ inn2-2.3.1/innd/site.c Fri Jun 8 22:44:26 2001
@@ -193,7 +193,7 @@
return FALSE;
}
while(sp->Channel->Out.Left > 0) {
- i = write(fd, (POINTER) &sp->Channel->Out.Data[sp->Channel->Out.Used],
+ i = write(fd, &sp->Channel->Out.Data[sp->Channel->Out.Used],
(size_t) sp->Channel->Out.Left);
if(i <= 0) {
syslog(L_ERROR,"%s cant spool count %d",CHANname(sp->Channel),
@@ -252,7 +252,7 @@
int j;
if (bp->Left == 0)
return;
- j = write(cp->fd, (POINTER)&bp->Data[bp->Used], (size_t)bp->Left);
+ j = write(cp->fd, &bp->Data[bp->Used], (size_t)bp->Left);
if (j > 0) {
bp->Left -= j;
bp->Used += j;
@@ -291,7 +291,7 @@
/*
** Send a control line to an exploder.
*/
-void SITEwrite(SITE *sp, STRING text)
+void SITEwrite(SITE *sp, char *text)
{
static char PREFIX[] = { EXP_CONTROL, '\0' };
BUFFER *bp;
@@ -474,7 +474,7 @@
char *p;
char *temp;
char buff[BUFSIZ];
- STRING argv[MAX_BUILTIN_ARGV];
+ char *argv[MAX_BUILTIN_ARGV];
int fd;
switch (sp->Type) {
@@ -573,7 +573,7 @@
static BOOL SITEstartprocess(SITE *sp)
{
pid_t i;
- STRING argv[MAX_BUILTIN_ARGV];
+ char *argv[MAX_BUILTIN_ARGV];
char *process;
int *ip;
int pan[2];
@@ -629,7 +629,7 @@
ip = NEW(int, 1);
*ip = sp - Sites;
SCHANadd(sp->Channel, (time_t)(Now.time + innconf->chanretrytime),
- (POINTER)NULL, SITEspoolwake, (POINTER)ip);
+ NULL, SITEspoolwake, ip);
return TRUE;
}
@@ -781,7 +781,7 @@
ip = NEW(int, 1);
*ip = sp - Sites;
SCHANadd(sp->Channel, (time_t)(Now.time + innconf->chanretrytime),
- (POINTER)NULL, SITEspoolwake, (POINTER)ip);
+ NULL, SITEspoolwake, ip);
break;
}
}
diff -Naur --recursive inn2-2.3.1.orig/innfeed/config_l.c inn2-2.3.1/innfeed/config_l.c
--- inn2-2.3.1.orig/innfeed/config_l.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/innfeed/config_l.c Fri Jun 8 22:44:26 2001
@@ -1161,7 +1161,7 @@
b->yy_ch_buf = (char *)
/* Include room in for 2 EOB chars. */
- yy_flex_realloc( (void *) b->yy_ch_buf,
+ yy_flex_realloc( b->yy_ch_buf,
b->yy_buf_size + 2 );
}
else
@@ -1506,9 +1506,9 @@
yy_current_buffer = (YY_BUFFER_STATE) 0;
if ( b->yy_is_our_buffer )
- yy_flex_free( (void *) b->yy_ch_buf );
+ yy_flex_free( b->yy_ch_buf );
- yy_flex_free( (void *) b );
+ yy_flex_free( b );
}
@@ -1689,7 +1689,7 @@
else
yy_start_stack = (int *) yy_flex_realloc(
- (void *) yy_start_stack, new_size );
+ yy_start_stack, new_size );
if ( ! yy_start_stack )
YY_FATAL_ERROR(
@@ -1796,7 +1796,7 @@
yy_size_t size;
#endif
{
- return (void *) malloc( size );
+ return malloc( size );
}
#ifdef YY_USE_PROTOS
@@ -1814,7 +1814,7 @@
* any pointer type to void*, and deal with argument conversions
* as though doing an assignment.
*/
- return (void *) realloc( (char *) ptr, size );
+ return realloc( (char *) ptr, size );
}
#ifdef YY_USE_PROTOS
diff -Naur --recursive inn2-2.3.1.orig/innfeed/main.c inn2-2.3.1/innfeed/main.c
--- inn2-2.3.1.orig/innfeed/main.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/innfeed/main.c Fri Jun 8 22:44:26 2001
@@ -326,7 +326,7 @@
}
val = TRUE;
- if (!SMsetup(SM_PREOPEN, (void *)&val)) {
+ if (!SMsetup(SM_PREOPEN, &val)) {
syslog(LOG_ERR, "cant setup the storage subsystem\n");
exit(1);
}
diff -Naur --recursive inn2-2.3.1.orig/innfeed/malloc.c inn2-2.3.1/innfeed/malloc.c
--- inn2-2.3.1.orig/innfeed/malloc.c Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/innfeed/malloc.c Fri Jun 8 22:44:26 2001
@@ -115,7 +115,7 @@
#endif
#endif
-POINTER
+void *
malloc(nbytes)
register size_t nbytes;
{
@@ -239,7 +239,7 @@
void
free(cp)
- POINTER cp;
+ void *cp;
{
register int size;
register union overhead *op;
@@ -284,9 +284,9 @@
*/
int reall_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */
-POINTER
+void *
realloc(cp, nbytes)
- POINTER cp;
+ void *cp;
size_t nbytes;
{
register u_int onb;
@@ -407,7 +407,7 @@
}
#endif
-POINTER
+void *
calloc(num, size)
size_t num;
register size_t size;
diff -Naur --recursive inn2-2.3.1.orig/lib/date.c inn2-2.3.1/lib/date.c
--- inn2-2.3.1.orig/lib/date.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/date.c Fri Jun 8 22:44:26 2001
@@ -96,7 +96,7 @@
long tz_offset;
int tz_hour_offset, tz_min_offset, tz_sign;
size_t date_length;
- char *tz_name;
+ char const *tz_name;
/* Make sure the buffer is large enough. */
if (buflen < DATE_LENGTH + 1) return FALSE;
diff -Naur --recursive inn2-2.3.1.orig/lib/dbz.c inn2-2.3.1/lib/dbz.c
--- inn2-2.3.1.orig/lib/dbz.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/lib/dbz.c Fri Jun 8 22:44:26 2001
@@ -976,7 +976,7 @@
DEBUG(("fetch: seek failed\n"));
return FALSE;
}
- keylen = fread((POINTER)buffer, 1, nb2r, basef);
+ keylen = fread(buffer, 1, nb2r, basef);
if (keylen < MIN_KEY_LENGTH) {
DEBUG(("fetch: read failed\n"));
return FALSE;
@@ -1076,7 +1076,7 @@
#ifdef DO_TAGGED_HASH
/* copy the value in to ensure alignment */
- (void) memcpy((POINTER)&value, (POINTER)&data, SOF);
+ (void) memcpy(&value, &data, SOF);
/* update maximum offset value if necessary */
if (value > conf.vused[0])
@@ -1119,7 +1119,7 @@
sizeof(evalue.hash) < sizeof(srch.hash) ? sizeof(evalue.hash) : sizeof(srch.hash));
/* Set the value in the index first since we don't care if it's out of date */
- if (!set(&srch, &idxtab, (void *)&data))
+ if (!set(&srch, &idxtab, &data))
return DBZSTORE_ERROR;
if (!set(&srch, &etab, &evalue))
return DBZSTORE_ERROR;
@@ -1292,7 +1292,7 @@
} else {
it = NEW(char, conf.tsize * tab->reclen);
- nread = read(tab->fd, (POINTER)it, tab->reclen * conf.tsize);
+ nread = read(tab->fd, it, tab->reclen * conf.tsize);
if (nread < 0) {
DEBUG(("getcore: read failed\n"));
DISPOSE(it);
@@ -1317,7 +1317,7 @@
if (tab->incore == INCORE_MEM) {
SetNonBlocking(tab->fd, FALSE);
size = tab->reclen * conf.tsize;
- if (pwrite(tab->fd, (POINTER)tab->core, size, 0) != size) {
+ if (pwrite(tab->fd, tab->core, size, 0) != size) {
SetNonBlocking(tab->fd, options.nonblock);
return FALSE;
}
@@ -1415,7 +1415,7 @@
/* read it */
errno = 0;
- if (pread(pagtab.fd, (POINTER)&value, sizeof(value), dest) != sizeof(value)) {
+ if (pread(pagtab.fd, &value, sizeof(value), dest) != sizeof(value)) {
if (errno != 0) {
DEBUG(("search: read failed\n"));
pagtab.pos = -1;
@@ -1485,7 +1485,7 @@
/* read it */
errno = 0;
- if (pread(etab.fd, (POINTER)&value, sizeof(erec), dest) != sizeof(erec)) {
+ if (pread(etab.fd, &value, sizeof(erec), dest) != sizeof(erec)) {
if (errno != 0) {
DEBUG(("search: read failed\n"));
etab.pos = -1;
@@ -1528,7 +1528,7 @@
/* If we have the index file in memory, use it */
if ((tab->incore != INCORE_NO) && (sp->place < conf.tsize)) {
- memcpy((void *)((char *)tab->core + (sp->place * tab->reclen)), value, tab->reclen);
+ memcpy(((char *)tab->core + (sp->place * tab->reclen)), value, tab->reclen);
DEBUG(("set: incore\n"));
if (tab->incore == INCORE_MMAP)
return TRUE;
@@ -1541,7 +1541,7 @@
offset = sp->place * tab->reclen;
/* write in data */
- while (pwrite(tab->fd, (POINTER)value, tab->reclen, offset) != tab->reclen) {
+ while (pwrite(tab->fd, value, tab->reclen, offset) != tab->reclen) {
if (errno == EAGAIN) {
fd_set writeset;
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 22:17:22 2001
+++ inn2-2.3.1/lib/inndcomm.c Fri Jun 8 22:44:26 2001
@@ -88,7 +88,7 @@
ICCfailure = "socket";
return -1;
}
- (void)memset((POINTER)&ICCclient, 0, sizeof ICCclient);
+ (void)memset(&ICCclient, 0, sizeof ICCclient);
ICCclient.sun_family = AF_UNIX;
(void)strcpy(ICCclient.sun_path, ICCsockname);
mask = umask(0);
@@ -103,7 +103,7 @@
(void)umask(mask);
/* Name the server's socket. */
- (void)memset((POINTER)&ICCserv, 0, sizeof ICCserv);
+ (void)memset(&ICCserv, 0, sizeof ICCserv);
ICCserv.sun_family = AF_UNIX;
(void)strcpy(ICCserv.sun_path, innconf->pathrun);
(void)strcat(ICCserv.sun_path, "/");
diff -Naur --recursive inn2-2.3.1.orig/lib/localopen.c inn2-2.3.1/lib/localopen.c
--- inn2-2.3.1.orig/lib/localopen.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/localopen.c Fri Jun 8 22:44:26 2001
@@ -39,7 +39,7 @@
return -1;
/* Connect to the server. */
- (void)memset((POINTER)&server, 0, sizeof server);
+ (void)memset(&server, 0, sizeof server);
server.sun_family = AF_UNIX;
(void)strcpy(server.sun_path, innconf->pathrun);
(void)strcat(server.sun_path, "/");
diff -Naur --recursive inn2-2.3.1.orig/lib/malloc.c inn2-2.3.1/lib/malloc.c
--- inn2-2.3.1.orig/lib/malloc.c Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/lib/malloc.c Fri Jun 8 22:44:26 2001
@@ -115,7 +115,7 @@
#endif
#endif
-POINTER malloc(size_t nbytes)
+void *malloc(size_t nbytes)
{
union overhead *p;
int bucket = 0;
@@ -233,7 +233,7 @@
}
}
-void free(POINTER cp)
+void free(void *cp)
{
int size;
union overhead *op;
@@ -278,7 +278,7 @@
*/
int reall_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */
-POINTER realloc(POINTER cp, size_t nbytes)
+void *realloc(void *cp, size_t nbytes)
{
u_int onb;
union overhead *op;
diff -Naur --recursive inn2-2.3.1.orig/lib/parsedate.y inn2-2.3.1/lib/parsedate.y
--- inn2-2.3.1.orig/lib/parsedate.y Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/parsedate.y Fri Jun 8 22:44:26 2001
@@ -70,7 +70,7 @@
** An entry in the lexical lookup table.
*/
typedef struct _TABLE {
- STRING name;
+ char *name;
int type;
time_t value;
} TABLE;
@@ -632,7 +632,7 @@
static int LookupWord(char *buff, int length)
{
char *p;
- STRING q;
+ char *q;
TABLE *tp;
int c;
@@ -684,7 +684,7 @@
length++;
/* Drop out any periods. */
- for (p = buff, q = (STRING)buff; *q; q++)
+ for (p = buff, q = buff; *q; q++)
if (*q != '.')
*p++ = *q;
*p = '\0';
diff -Naur --recursive inn2-2.3.1.orig/lib/qio.c inn2-2.3.1/lib/qio.c
--- inn2-2.3.1.orig/lib/qio.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/lib/qio.c Fri Jun 8 22:44:26 2001
@@ -108,7 +108,7 @@
if (qp->End > qp->Start) {
/* Find the newline. */
- p = memchr((POINTER)qp->Start,'\n',(size_t)(qp->End - qp->Start));
+ p = memchr(qp->Start,'\n',(size_t)(qp->End - qp->Start));
if (p != NULL) {
*p = '\0';
qp->Length = p - qp->Start;
@@ -140,7 +140,7 @@
qp->End = &p[i];
/* Now try to find it. */
- p = memchr((POINTER)qp->Start, '\n', (size_t)(qp->End - qp->Start));
+ p = memchr(qp->Start, '\n', (size_t)(qp->End - qp->Start));
if (p != NULL) {
*p = '\0';
qp->Length = p - qp->Start;
diff -Naur --recursive inn2-2.3.1.orig/lib/remopen.c inn2-2.3.1/lib/remopen.c
--- inn2-2.3.1.orig/lib/remopen.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/lib/remopen.c Fri Jun 8 22:44:26 2001
@@ -74,11 +74,11 @@
return -1;
/* Set up the socket address. */
- (void)memset((POINTER)&server, 0, sizeof server);
+ (void)memset(&server, 0, sizeof server);
server.sin_family = hp->h_addrtype;
server.sin_port = htons(port);
/* Source IP address to which we bind. */
- (void)memset((POINTER)&client, 0, sizeof client);
+ (void)memset(&client, 0, sizeof client);
client.sin_family = AF_INET;
if (innconf->sourceaddress) {
client.sin_addr.s_addr = inet_addr(innconf->sourceaddress);
@@ -100,8 +100,7 @@
continue;
}
/* Copy the address via inline memcpy:
- * (void)memcpy((POINTER)&server.sin_addr, (POINTER)*ap,
- (int)hp->h_length); */
+ * (void)memcpy(&server.sin_addr, *ap, (int)hp->h_length); */
p = (char *)*ap;
for (dest = (char *)&server.sin_addr, j = hp->h_length; --j >= 0; )
*dest++ = *p++;
diff -Naur --recursive inn2-2.3.1.orig/lib/xwrite.c inn2-2.3.1/lib/xwrite.c
--- inn2-2.3.1.orig/lib/xwrite.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/lib/xwrite.c Fri Jun 8 22:44:26 2001
@@ -15,7 +15,7 @@
int c;
for ( ; i; p += c, i -= c)
- if ((c = write(fd, (POINTER)p, (size_t)i)) <= 0)
+ if ((c = write(fd, p, (size_t)i)) <= 0)
return -1;
return 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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/nnrpd/article.c Fri Jun 8 22:44:26 2001
@@ -37,7 +37,7 @@
typedef struct _SENDDATA {
SENDTYPE Type;
int ReplyCode;
- STRING Item;
+ char *Item;
} SENDDATA;
static char ARTnotingroup[] = NNTP_NOTINGROUP;
@@ -719,7 +719,7 @@
BOOL next;
int delta;
int errcode;
- STRING message;
+ char *message;
if (!PERMcanread) {
Reply("%s\r\n", NOACCESS);
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 22:17:22 2001
+++ inn2-2.3.1/nnrpd/commands.c Fri Jun 8 22:44:26 2001
@@ -10,11 +10,11 @@
#include "ov.h"
typedef struct _LISTINFO {
- STRING Path;
- STRING File;
+ char *Path;
+ char *File;
BOOL Required;
- STRING Items;
- STRING Format;
+ char *Items;
+ char *Format;
} LISTINFO;
typedef struct {
@@ -727,7 +727,7 @@
long l;
long sleeptime;
char *path;
- STRING response;
+ char *response;
char idbuff[SMBUF];
static int backoff_inited = FALSE;
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 22:17:22 2001
+++ inn2-2.3.1/nnrpd/nnrpd.c Fri Jun 8 22:44:26 2001
@@ -56,12 +56,12 @@
typedef struct _CMDENT {
- STRING Name;
+ char *Name;
void (*Function)();
BOOL Needauth;
int Minac;
int Maxac;
- STRING Help;
+ char *Help;
} CMDENT;
@@ -385,15 +385,13 @@
#if defined(h_addr)
/* We have many addresses */
for (pp = hp->h_addr_list; *pp; pp++)
- if (memcmp((POINTER)&ap->s_addr, (POINTER)*pp,
- (size_t)hp->h_length) == 0)
+ if (memcmp(&ap->s_addr, *pp, (size_t)hp->h_length) == 0)
break;
if (*pp == NULL)
return FALSE;
#else
/* We have one address. */
- if (memcmp((POINTER)&ap->s_addr, (POINTER)hp->h_addr,
- (size_t)hp->h_length) != 0)
+ if (memcmp(&ap->s_addr, hp->h_addr, (size_t)hp->h_length) != 0)
return FALSE;
#endif
@@ -700,7 +698,7 @@
#endif /* defined(DO_PYTHON) */
val = TRUE;
- if (SMsetup(SM_PREOPEN, (void *)&val) && !SMinit()) {
+ if (SMsetup(SM_PREOPEN, &val) && !SMinit()) {
syslog(L_NOTICE, "cant initialize storage method, %s", SMerrorstr);
Reply("%d NNTP server unavailable. Try later.\r\n", NNTP_TEMPERR_VAL);
ExitWithStats(1, TRUE);
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/nnrpd.h inn2-2.3.1/nnrpd/nnrpd.h
--- inn2-2.3.1.orig/nnrpd/nnrpd.h Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/nnrpd/nnrpd.h Fri Jun 8 22:44:26 2001
@@ -184,7 +184,7 @@
#if NNRP_LOADLIMIT > 0
extern int GetLoadAverage();
#endif /* NNRP_LOADLIMIT > 0 */
-extern STRING ARTpost();
+extern char *ARTpost();
extern void ARTclose();
extern BOOL ARTreadschema();
extern char *Glom();
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/perm.c inn2-2.3.1/nnrpd/perm.c
--- inn2-2.3.1.orig/nnrpd/perm.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/nnrpd/perm.c Fri Jun 8 22:44:26 2001
@@ -602,7 +602,7 @@
case PERMresolv:
case PERMresprog:
m = NEW(METHOD, 1);
- (void) memset((POINTER) m, 0, sizeof(METHOD));
+ (void) memset(m, 0, sizeof(METHOD));
memset(ConfigBit, '\0', ConfigBitsize);
GrowArray((void***) &curauth->res_methods, (void*) m);
@@ -630,7 +630,7 @@
case PERMauth:
case PERMauthprog:
m = NEW(METHOD, 1);
- (void) memset((POINTER) m, 0, sizeof(METHOD));
+ (void) memset(m, 0, sizeof(METHOD));
memset(ConfigBit, '\0', ConfigBitsize);
GrowArray((void***) &curauth->auth_methods, (void*) m);
if (oldtype == PERMauthprog)
@@ -1015,7 +1015,7 @@
curauth = copy_authgroup(curgroup->auth);
else {
curauth = NEW(AUTHGROUP, 1);
- memset((POINTER) curauth, 0, sizeof(AUTHGROUP));
+ memset(curauth, 0, sizeof(AUTHGROUP));
memset(ConfigBit, '\0', ConfigBitsize);
}
@@ -1028,7 +1028,7 @@
curaccess = copy_accessgroup(curgroup->access);
else {
curaccess = NEW(ACCESSGROUP, 1);
- memset((POINTER) curaccess, 0, sizeof(ACCESSGROUP));
+ memset(curaccess, 0, sizeof(ACCESSGROUP));
memset(ConfigBit, '\0', ConfigBitsize);
SetDefaultAccess(curaccess);
}
@@ -1064,12 +1064,12 @@
case PERMdefdomain:
if (curgroup == NULL) {
curgroup = NEW(GROUP, 1);
- memset((POINTER) curgroup, 0, sizeof(GROUP));
+ memset(curgroup, 0, sizeof(GROUP));
memset(ConfigBit, '\0', ConfigBitsize);
}
if (curgroup->auth == NULL) {
curgroup->auth = NEW(AUTHGROUP, 1);
- (void)memset((POINTER)curgroup->auth, 0, sizeof(AUTHGROUP));
+ (void)memset(curgroup->auth, 0, sizeof(AUTHGROUP));
memset(ConfigBit, '\0', ConfigBitsize);
}
@@ -1115,13 +1115,12 @@
case PERMnewsmaster:
if (!curgroup) {
curgroup = NEW(GROUP, 1);
- memset((POINTER) curgroup, 0, sizeof(GROUP));
+ memset(curgroup, 0, sizeof(GROUP));
memset(ConfigBit, '\0', ConfigBitsize);
}
if (!curgroup->access) {
curgroup->access = NEW(ACCESSGROUP, 1);
- (void)memset((POINTER)curgroup->access, 0,
- sizeof(ACCESSGROUP));
+ (void)memset(curgroup->access, 0, sizeof(ACCESSGROUP));
memset(ConfigBit, '\0', ConfigBitsize);
SetDefaultAccess(curgroup->access);
}
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 22:17:22 2001
+++ inn2-2.3.1/nnrpd/post.c Fri Jun 8 22:44:26 2001
@@ -23,7 +23,7 @@
BOOL HeadersModified;
static int OtherSize;
static BOOL WasMailed;
-static STRING BadDistribs[] = {
+static char *BadDistribs[] = {
BAD_DISTRIBS
};
@@ -249,7 +249,7 @@
** Check the control message, and see if it's legit. Return pointer to
** error message if not.
*/
-static STRING
+static char *
CheckControl(ctrl)
char *ctrl;
{
@@ -292,12 +292,12 @@
/*
** Check the Distribution header, and exit on error.
*/
-static STRING
+static char *
CheckDistribution(p)
register char *p;
{
static char SEPS[] = " \t,";
- register STRING *dp;
+ register char **dp;
if ((p = strtok(p, SEPS)) == NULL)
return "Can't parse Distribution line.";
@@ -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 char *
ProcessHeaders(int linecount, char *idbuff)
{
static char MONTHS[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
@@ -333,7 +333,7 @@
time_t t;
struct tm *gmt;
TIMEINFO Now;
- STRING error;
+ char *error;
pid_t pid;
BOOL addvirtual = FALSE;
@@ -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 char *
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 char *
MailArticle(group, article)
char *group;
char *article;
@@ -641,7 +641,7 @@
}
(void)fprintf(F, "\n");
i = strlen(article);
- if (fwrite((POINTER)article, (size_t)1, (size_t)i, F) != i)
+ if (fwrite(article, (size_t)1, (size_t)i, F) != i)
return "Can't send article";
if (FLUSH_ERROR(F)) {
(void)pclose(F);
@@ -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 char * ValidNewsgroups(char *hdr, char **modgroup)
{
static char distbuff[SMBUF];
char *groups;
@@ -802,7 +802,7 @@
/*
** Spool article to temp file.
*/
-static STRING
+static char *
SpoolitTo(article, Error, SpoolDir)
char *article;
char *Error;
@@ -848,7 +848,7 @@
/* Write the article body */
i = strlen(article);
- if (fwrite((POINTER)article, (size_t)1, (size_t)i, F) != i) {
+ if (fwrite(article, (size_t)1, (size_t)i, F) != i) {
fclose(F);
return CANTSPOOL;
}
@@ -870,7 +870,7 @@
/*
** Spool article to temp file.
*/
-static STRING
+static char *
Spoolit(article, Error)
char *article;
char *Error;
@@ -911,7 +911,7 @@
return s;
}
-STRING
+char *
ARTpost(article, idbuff)
char *article;
char *idbuff;
@@ -925,7 +925,7 @@
FILE *FromServer;
char buff[NNTP_STRLEN + 2], frombuf[SMBUF];
char *modgroup = NULL;
- STRING error;
+ char *error;
char TrackID[NNTP_STRLEN];
FILE *ftd;
int result;
@@ -1044,7 +1044,7 @@
if (modgroup)
{
if (idbuff != NULL) {
- STRING retstr;
+ char *retstr;
retstr = MailArticle(modgroup, article);
strcpy (idbuff,"(mailed to moderator)") ;
return retstr;
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/post.h inn2-2.3.1/nnrpd/post.h
--- inn2-2.3.1.orig/nnrpd/post.h Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/nnrpd/post.h Fri Jun 8 22:44:26 2001
@@ -9,7 +9,7 @@
} HEADERTYPE;
typedef struct _HEADER {
- STRING Name;
+ char *Name;
BOOL CanSet;
HEADERTYPE Type;
int Size;
diff -Naur --recursive inn2-2.3.1.orig/nnrpd/tls.c inn2-2.3.1/nnrpd/tls.c
--- inn2-2.3.1.orig/nnrpd/tls.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/nnrpd/tls.c Fri Jun 8 22:44:26 2001
@@ -610,7 +610,7 @@
{
#define min(a, b) ((a) > (b) ? (b) : (a))
size_t copy = min (vector[i].iov_len, to_copy);
- (void) memcpy ((void *) bp, (void *) vector[i].iov_base, copy);
+ (void) memcpy (bp, (void *) vector[i].iov_base, copy);
bp += copy;
to_copy -= copy;
if (to_copy == 0)
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 22:17:22 2001
+++ inn2-2.3.1/storage/buffindexed/buffindexed.c Fri Jun 8 22:44:26 2001
@@ -1061,7 +1061,7 @@
return TRUE;
if (GROUPheader) {
- if (munmap((void *)GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
+ if (munmap(GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
syslog(L_FATAL, "%s: Could not munmap group.index in GROUPremapifneeded: %m", LocalLogName);
return FALSE;
}
@@ -1084,7 +1084,7 @@
int flag = 0;
if (GROUPheader) {
- if (munmap((void *)GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
+ if (munmap(GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
syslog(L_FATAL, "%s: Could not munmap group.index in GROUPexpand: %m", LocalLogName);
return FALSE;
}
@@ -1482,7 +1482,7 @@
return gdb;
}
-static int INDEXcompare(CPOINTER p1, CPOINTER p2) {
+static int INDEXcompare(const void *p1, const void *p2) {
OVINDEX *oi1;
OVINDEX *oi2;
@@ -1557,7 +1557,7 @@
munmap(addr, len);
}
Gibcount = count;
- qsort((POINTER)Gib, Gibcount, sizeof(OVINDEX), INDEXcompare);
+ qsort(Gib, Gibcount, sizeof(OVINDEX), INDEXcompare);
/* Remove duplicates. */
for (i = 0; i < Gibcount - 1; i++) {
if (Gib[i].artnum == Gib[i+1].artnum) {
@@ -1639,7 +1639,7 @@
search->group = COPY(group);
search->needov = needov;
search->gloc = gloc;
- return (void *)search;
+ return search;
}
void *buffindexed_opensearch(char *group, int low, int high) {
@@ -1976,7 +1976,7 @@
close(GROUPfd);
if (GROUPheader) {
- if (munmap((void *)GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
+ if (munmap(GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
syslog(L_FATAL, "%s: could not munmap group.index in buffindexed_close: %m", LocalLogName);
return;
}
@@ -2098,7 +2098,7 @@
char *data;
int len;
TOKEN token;
- while (buffindexed_search((void *)search, &artnum, &data, &len, &token, NULL)) {
+ while (buffindexed_search(search, &artnum, &data, &len, &token, NULL)) {
if (len == 0)
fprintf(stdout, "%d: len is 0\n", artnum);
else {
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 22:17:22 2001
+++ inn2-2.3.1/storage/cnfs/cnfs.c Fri Jun 8 22:44:26 2001
@@ -1327,7 +1327,7 @@
return NULL;
}
private = NEW(PRIV_CNFS, 1);
- art->private = (void *)private;
+ art->private = private;
art->arrived = ntohl(cah.arrived);
if (innconf->articlemmap) {
offset += sizeof(cah) + plusoffset;
@@ -1601,7 +1601,7 @@
#endif /* OLD_CNFS */
art = NEW(ARTHANDLE, 1);
private = NEW(PRIV_CNFS, 1);
- art->private = (void *)private;
+ art->private = private;
art->type = TOKEN_CNFS;
*private = priv;
private->cycbuff = cycbuff;
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 22:17:22 2001
+++ inn2-2.3.1/storage/ov.c Fri Jun 8 22:44:26 2001
@@ -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(const void *p1, const void *p2)
{
NEWSGROUP **ng1;
NEWSGROUP **ng2;
@@ -605,8 +605,7 @@
/* Sort each hash bucket. */
for (i = NGH_SIZE, htp = NGHtable; --i >= 0; htp++)
if (htp->Used > 1)
- qsort((POINTER)htp->Groups, (size_t)htp->Used, sizeof htp->Groups[0],
- NGcompare);
+ qsort(htp->Groups, (size_t)htp->Used, sizeof htp->Groups[0], NGcompare);
/* Ok, now change our use of the Last field. Set them all to maxint. */
for (i = NGH_SIZE, htp = NGHtable; --i >= 0; htp++) {
@@ -1155,7 +1154,7 @@
BOOL OVhisthasmsgid(char *data) {
char *p;
- static STRING History;
+ static char *History;
HASH key;
OFFSET_T offset;
static FILE *F;
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 Fri Jun 8 22:17:22 2001
+++ inn2-2.3.1/storage/ov3/ov3.c Fri Jun 8 22:44:26 2001
@@ -316,7 +316,7 @@
return TRUE;
if (GROUPheader) {
- if (munmap((void *)GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
+ if (munmap(GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
syslog(L_FATAL, "tradindexed: could not munmap group.index in GROUPremapifneeded: %m");
return FALSE;
}
@@ -339,7 +339,7 @@
int flag = 0;
if (GROUPheader) {
- if (munmap((void *)GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
+ if (munmap(GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
syslog(L_FATAL, "tradindexed: could not munmap group.index in GROUPexpand: %m");
return FALSE;
}
@@ -566,7 +566,7 @@
close(gh->indexfd);
close(gh->datafd);
if (gh->indexmem)
- munmap((void *)gh->indexmem, gh->indexlen);
+ munmap(gh->indexmem, gh->indexlen);
if (gh->datamem)
munmap(gh->datamem, gh->datalen);
if (gh->group)
@@ -825,7 +825,7 @@
search->base = base;
search->gh = gh;
search->group = COPY(group);
- return (void *)search;
+ return search;
}
BOOL ov3search(void *handle, ARTNUM *artnum, char **data, int *len, TOKEN *token, time_t *arrived, time_t *expires) {
@@ -1219,7 +1219,7 @@
close(GROUPfd);
if (GROUPheader) {
- if (munmap((void *)GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
+ if (munmap(GROUPheader, GROUPfilesize(GROUPcount)) < 0) {
syslog(L_FATAL, "tradindexed: could not munmap group.index in tradindexed_close: %m");
return;
}
diff -Naur --recursive inn2-2.3.1.orig/storage/ovdb/ovdb.c inn2-2.3.1/storage/ovdb/ovdb.c
--- inn2-2.3.1.orig/storage/ovdb/ovdb.c Thu Jan 11 01:55:23 2001
+++ inn2-2.3.1/storage/ovdb/ovdb.c Fri Jun 8 22:44:26 2001
@@ -1250,7 +1250,7 @@
s->hikey.artnum = htonl(high);
s->state = 0;
- return (void *)s;
+ return s;
}
BOOL ovdb_search(void *handle, ARTNUM *artnum, char **data, int *len, TOKEN *token, time_t *arrived)
diff -Naur --recursive inn2-2.3.1.orig/storage/timecaf/caf.c inn2-2.3.1/storage/timecaf/caf.c
--- inn2-2.3.1.orig/storage/timecaf/caf.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/storage/timecaf/caf.c Fri Jun 8 22:44:26 2001
@@ -98,7 +98,7 @@
static int
OurRead(fd, buf, n)
int fd;
-POINTER buf;
+void *buf;
size_t n;
{
int rval;
@@ -119,7 +119,7 @@
static int
OurWrite(fd, buf, n)
int fd;
-CPOINTER buf;
+const void *buf;
size_t n;
{
int rval;
diff -Naur --recursive inn2-2.3.1.orig/storage/timecaf/timecaf.c inn2-2.3.1/storage/timecaf/timecaf.c
--- inn2-2.3.1.orig/storage/timecaf/timecaf.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/storage/timecaf/timecaf.c Fri Jun 8 22:44:26 2001
@@ -450,7 +450,7 @@
}
private = NEW(PRIV_TIMECAF, 1);
- art->private = (void *)private;
+ art->private = private;
private->artlen = len;
if (innconf->articlemmap) {
off_t curoff, tmpoff;
@@ -813,7 +813,7 @@
art->type = TOKEN_TIMECAF;
art->data = NULL;
art->len = 0;
- art->private = (void *)NEW(PRIV_TIMECAF, 1);
+ art->private = NEW(PRIV_TIMECAF, 1);
}
newpriv = (PRIV_TIMECAF *)art->private;
newpriv->top = priv.top;
diff -Naur --recursive inn2-2.3.1.orig/storage/timehash/timehash.c inn2-2.3.1/storage/timehash/timehash.c
--- inn2-2.3.1.orig/storage/timehash/timehash.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/storage/timehash/timehash.c Fri Jun 8 22:44:26 2001
@@ -212,7 +212,7 @@
}
private = NEW(PRIV_TIMEHASH, 1);
- art->private = (void *)private;
+ art->private = private;
private->len = sb.st_size;
if (innconf->articlemmap) {
if ((private->base = mmap((caddr_t)0, sb.st_size, PROT_READ, MAP__ARG, fd, 0)) == (caddr_t)-1) {
@@ -481,7 +481,7 @@
art->type = TOKEN_TIMEHASH;
art->data = NULL;
art->len = 0;
- art->private = (void *)NEW(PRIV_TIMEHASH, 1);
+ art->private = NEW(PRIV_TIMEHASH, 1);
newpriv = (PRIV_TIMEHASH *)art->private;
newpriv->base = NULL;
}
diff -Naur --recursive inn2-2.3.1.orig/storage/tradspool/tradspool.c inn2-2.3.1/storage/tradspool/tradspool.c
--- inn2-2.3.1.orig/storage/tradspool/tradspool.c Fri Jun 8 22:17:16 2001
+++ inn2-2.3.1/storage/tradspool/tradspool.c Fri Jun 8 22:44:26 2001
@@ -752,7 +752,7 @@
art->arrived = sb.st_mtime;
private = NEW(PRIV_TRADSPOOL, 1);
- art->private = (void *)private;
+ art->private = private;
private->artlen = sb.st_size;
if (innconf->articlemmap) {
if ((private->artbase = mmap((caddr_t)0, sb.st_size, PROT_READ, MAP__ARG, fd, 0)) == (caddr_t)-1) {
@@ -1109,7 +1109,7 @@
art->type = TOKEN_TRADSPOOL;
art->data = NULL;
art->len = 0;
- art->private = (void *)NEW(PRIV_TRADSPOOL, 1);
+ art->private = NEW(PRIV_TRADSPOOL, 1);
newpriv = (PRIV_TRADSPOOL *) art->private;
newpriv->artbase = NULL;
} else {
More information about the inn-patches
mailing list