fixed -Wincompatible-pointer-types compilation warnings onsubstdio.h

sagredo-dev · Apr 6, 2024 · 67bdb4b · 67bdb4b
1 parent bfad8fe
commit 67bdb4b
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 24 deletions.
diff --git a/condredirect.c b/condredirect.c
@@ -18,7 +18,7 @@
 
 struct qmail qqt;
 
-int mywrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t mywrite(fd,buf,len) int fd; char *buf; int len;
 {
   qmail_put(&qqt,buf,len);
   return len;

diff --git a/conf-spawn b/conf-spawn
@@ -1,4 +1,4 @@
-1000
+509
 
 This is a silent concurrency limit. You can't set it above 255. On some
 systems you can't set it above 125. qmail will refuse to compile if the

diff --git a/forward.c b/forward.c
@@ -14,7 +14,7 @@
 
 struct qmail qqt;
 
-int mywrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t mywrite(fd,buf,len) int fd; char *buf; int len;
 {
   qmail_put(&qqt,buf,len);
   return len;

diff --git a/qmail-pop3d.c b/qmail-pop3d.c
@@ -25,15 +25,15 @@
 
 void die() { _exit(0); }
 
-int saferead(fd,buf,len) int fd; char *buf; int len;
+ssize_t saferead(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = timeoutread(1200,fd,buf,len);
   if (r <= 0) die();
   return r;
 }
 
-int safewrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t safewrite(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = timeoutwrite(1200,fd,buf,len);

diff --git a/qmail-popup.c b/qmail-popup.c
@@ -16,15 +16,15 @@
 
 void die() { _exit(1); }
 
-int saferead(fd,buf,len) int fd; char *buf; int len;
+ssize_t saferead(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = timeoutread(1200,fd,buf,len);
   if (r <= 0) die();
   return r;
 }
 
-int safewrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t safewrite(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = timeoutwrite(1200,fd,buf,len);

diff --git a/qmail-qmqpc.c b/qmail-qmqpc.c
@@ -34,14 +34,14 @@ void die_format() { _exit(91); }
 int lasterror = 55;
 int qmqpfd;
 
-int saferead(fd,buf,len) int fd; char *buf; int len;
+ssize_t saferead(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = timeoutread(60,qmqpfd,buf,len);
   if (r <= 0) die_conn();
   return r;
 }
-int safewrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t safewrite(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = timeoutwrite(60,qmqpfd,buf,len);

diff --git a/qmail-qmqpd.c b/qmail-qmqpd.c
@@ -13,14 +13,14 @@
 
 void resources() { _exit(111); }
 
-int safewrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t safewrite(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = write(fd,buf,len);
   if (r <= 0) _exit(0);
   return r;
 }
-int saferead(fd,buf,len) int fd; char *buf; int len;
+ssize_t saferead(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = read(fd,buf,len);

diff --git a/qmail-qmtpd.c b/qmail-qmtpd.c
@@ -17,7 +17,7 @@
 void badproto() { _exit(100); }
 void resources() { _exit(111); }
 
-int safewrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t safewrite(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   r = write(fd,buf,len);
@@ -28,7 +28,7 @@ int safewrite(fd,buf,len) int fd; char *buf; int len;
 char ssoutbuf[256];
 substdio ssout = SUBSTDIO_FDBUF(safewrite,1,ssoutbuf,sizeof ssoutbuf);
 
-int saferead(fd,buf,len) int fd; char *buf; int len;
+ssize_t saferead(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   substdio_flush(&ssout);

diff --git a/qmail-remote.c b/qmail-remote.c
@@ -142,7 +142,7 @@ int timeoutconnect = 60;
 int smtpfd;
 int timeout = 1200;
 
-int saferead(fd,buf,len) int fd; char *buf; int len;
+ssize_t saferead(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
 #ifdef TLS
@@ -155,7 +155,7 @@ int saferead(fd,buf,len) int fd; char *buf; int len;
   if (r <= 0) dropped();
   return r;
 }
-int safewrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t safewrite(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
 #ifdef TLS

diff --git a/qmail-smtpd.c b/qmail-smtpd.c
@@ -91,7 +91,7 @@ static const char *protocol = "SMTP";
 char *remoteip4;
 /* end spf ipv6 fix */
 
-int safewrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t safewrite(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
 #ifdef TLS
@@ -1680,7 +1680,7 @@ void smtp_rcpt(arg) char *arg; {
  */
 }
 
-int saferead(fd,buf,len) int fd; char *buf; int len;
+ssize_t saferead(fd,buf,len) int fd; char *buf; int len;
 {
   int r;
   flush();

diff --git a/srsfilter.c b/srsfilter.c
@@ -39,7 +39,7 @@ void printheader() {
   if (!stralloc_copys(&line,"")) die_nomem();
 }
 
-int mywrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t mywrite(fd,buf,len) int fd; char *buf; int len;
 {
   int i;
   if (flagbody) {

diff --git a/subfd.h b/subfd.h
@@ -9,7 +9,7 @@ extern substdio *subfdout;
 extern substdio *subfdoutsmall;
 extern substdio *subfderr;
 
-extern int subfd_read();
-extern int subfd_readsmall();
+extern ssize_t subfd_read();
+extern ssize_t subfd_readsmall();
 
 #endif
diff --git a/subfdin.c b/subfdin.c
@@ -2,7 +2,7 @@
 #include "substdio.h"
 #include "subfd.h"
 
-int subfd_read(fd,buf,len) int fd; char *buf; int len;
+ssize_t subfd_read(fd,buf,len) int fd; char *buf; int len;
 {
   if (substdio_flush(subfdout) == -1) return -1;
   return read(fd,buf,len);

diff --git a/subfdins.c b/subfdins.c
@@ -2,7 +2,7 @@
 #include "substdio.h"
 #include "subfd.h"
 
-int subfd_readsmall(fd,buf,len) int fd; char *buf; int len;
+ssize_t subfd_readsmall(fd,buf,len) int fd; char *buf; int len;
 {
   if (substdio_flush(subfdoutsmall) == -1) return -1;
   return read(fd,buf,len);

diff --git a/substdio.c b/substdio.c
@@ -2,7 +2,7 @@
 
 void substdio_fdbuf(s,op,fd,buf,len)
 register substdio *s;
-register int (*op)();
+register ssize_t (*op)();
 register int fd;
 register char *buf;
 register int len;

diff --git a/substdio.h b/substdio.h
@@ -1,3 +1,5 @@
+#include <sys/types.h>
+
 #ifndef SUBSTDIO_H
 #define SUBSTDIO_H
 
@@ -6,7 +8,7 @@ typedef struct substdio {
   int p;
   int n;
   int fd;
-  int (*op)();
+  ssize_t (*op)();
 } substdio;
 
 #define SUBSTDIO_FDBUF(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }