# HG changeset patch
# User Henry S. Thompson <ht@inf.ed.ac.uk>
# Date 1738337171 0
# Node ID 3bfef1f22a97a32f5342006f98a6cf9f9e7bd001
# Parent  79b6f035cd96c730dac996160e25c79eee8174ef
trivial changes to get rid of compile-time warnings

diff -r 79b6f035cd96 -r 3bfef1f22a97 Makefile
--- a/Makefile	Fri Jan 31 13:37:33 2025 +0000
+++ b/Makefile	Fri Jan 31 15:26:11 2025 +0000
@@ -266,7 +266,7 @@
 
 prog: \
 cdbget cdbmake cdbdump cdbstats cdbtest cdbmake-12 cdbmake-sv rts \
-testzero
+testzero libcdb.a
 
 # run tests
 rts: \
diff -r 79b6f035cd96 -r 3bfef1f22a97 alloc.c
--- a/alloc.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/alloc.c	Fri Jan 31 15:26:11 2025 +0000
@@ -1,7 +1,6 @@
 #include "alloc.h"
 #include "error.h"
-extern char *malloc();
-extern void free();
+#include <stdlib.h>
 
 #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
 #define SPACE 4096 /* must be multiple of ALIGNMENT */
diff -r 79b6f035cd96 -r 3bfef1f22a97 auto-str.c
--- a/auto-str.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/auto-str.c	Fri Jan 31 15:26:11 2025 +0000
@@ -11,7 +11,7 @@
   if (buffer_puts(&ss1,s) == -1) _exit(111);
 }
 
-main(argc,argv)
+int main(argc,argv)
 int argc;
 char **argv;
 {
diff -r 79b6f035cd96 -r 3bfef1f22a97 buffer.c
--- a/buffer.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/buffer.c	Fri Jan 31 15:26:11 2025 +0000
@@ -1,6 +1,6 @@
 #include "buffer.h"
 
-void buffer_init(buffer *s,int (*op)(),int fd,char *buf,unsigned int len)
+void buffer_init(buffer *s,ssize_t (*op)(),int fd,char *buf,unsigned int len)
 {
   s->x = buf;
   s->fd = fd;
diff -r 79b6f035cd96 -r 3bfef1f22a97 buffer.h
--- a/buffer.h	Fri Jan 31 13:37:33 2025 +0000
+++ b/buffer.h	Fri Jan 31 15:26:11 2025 +0000
@@ -1,19 +1,21 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
+#include <unistd.h>
+
 typedef struct buffer {
   char *x;
   unsigned int p;
   unsigned int n;
   int fd;
-  int (*op)();
+  ssize_t (*op)();
 } buffer;
 
 #define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }
 #define BUFFER_INSIZE 8192
 #define BUFFER_OUTSIZE 8192
 
-extern void buffer_init(buffer *,int (*)(),int,char *,unsigned int);
+extern void buffer_init(buffer *,ssize_t (*)(),int,char *,unsigned int);
 
 extern int buffer_flush(buffer *);
 extern int buffer_put(buffer *,char *,unsigned int);
diff -r 79b6f035cd96 -r 3bfef1f22a97 buffer_0.c
--- a/buffer_0.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/buffer_0.c	Fri Jan 31 15:26:11 2025 +0000
@@ -1,7 +1,7 @@
 #include "readwrite.h"
 #include "buffer.h"
 
-int buffer_0_read(fd,buf,len) int fd; char *buf; int len;
+ssize_t buffer_0_read(fd,buf,len) int fd; char *buf; int len;
 {
   if (buffer_flush(buffer_1) == -1) return -1;
   return read(fd,buf,len);
diff -r 79b6f035cd96 -r 3bfef1f22a97 buffer_get.c
--- a/buffer_get.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/buffer_get.c	Fri Jan 31 15:26:11 2025 +0000
@@ -2,7 +2,7 @@
 #include "byte.h"
 #include "error.h"
 
-static int oneread(int (*op)(),int fd,char *buf,unsigned int len)
+static int oneread(ssize_t (*op)(),int fd,char *buf,unsigned int len)
 {
   int r;
 
diff -r 79b6f035cd96 -r 3bfef1f22a97 buffer_put.c
--- a/buffer_put.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/buffer_put.c	Fri Jan 31 15:26:11 2025 +0000
@@ -3,7 +3,7 @@
 #include "byte.h"
 #include "error.h"
 
-static int allwrite(int (*op)(),int fd,char *buf,unsigned int len)
+static int allwrite(ssize_t (*op)(),int fd,char *buf,unsigned int len)
 {
   int w;
 
diff -r 79b6f035cd96 -r 3bfef1f22a97 cdbdump.c
--- a/cdbdump.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/cdbdump.c	Fri Jan 31 15:26:11 2025 +0000
@@ -58,7 +58,7 @@
 
 char strnum[FMT_ULONG];
 
-main()
+int main()
 {
   uint32 eod;
   uint32 klen;
diff -r 79b6f035cd96 -r 3bfef1f22a97 cdbget.c
--- a/cdbget.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/cdbget.c	Fri Jan 31 15:26:11 2025 +0000
@@ -23,7 +23,7 @@
 static struct cdb c;
 char buf[1024];
 
-main(int argc,char **argv)
+int main(int argc,char **argv)
 {
   char *key;
   int r;
diff -r 79b6f035cd96 -r 3bfef1f22a97 cdbmake.c
--- a/cdbmake.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/cdbmake.c	Fri Jan 31 15:26:11 2025 +0000
@@ -3,6 +3,7 @@
 #include "strerr.h"
 #include "cdb_make.h"
 #include "cdb.h"
+#include <stdio.h>
 
 #define FATAL "cdbmake: fatal: "
 
@@ -36,7 +37,7 @@
 
 static struct cdb_make c;
 
-main(int argc,char **argv)
+int main(int argc,char **argv)
 {
   unsigned int klen;
   unsigned int dlen;
diff -r 79b6f035cd96 -r 3bfef1f22a97 cdbstats.c
--- a/cdbstats.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/cdbstats.c	Fri Jan 31 15:26:11 2025 +0000
@@ -68,7 +68,7 @@
 static unsigned long numrecords;
 static unsigned long numd[11];
 
-main()
+int main()
 {
   uint32 eod;
   uint32 klen;
diff -r 79b6f035cd96 -r 3bfef1f22a97 cdbtest.c
--- a/cdbtest.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/cdbtest.c	Fri Jan 31 15:26:11 2025 +0000
@@ -66,7 +66,7 @@
 
 static struct cdb c;
 
-main()
+int main()
 {
   uint32 eod;
   uint32 klen;
diff -r 79b6f035cd96 -r 3bfef1f22a97 conf-cc.ac
--- a/conf-cc.ac	Fri Jan 31 13:37:33 2025 +0000
+++ b/conf-cc.ac	Fri Jan 31 15:26:11 2025 +0000
@@ -1,4 +1,4 @@
-gcc CFLAGS -include /usr/include/errno.h -fPIC
+gcc CFLAGS -include /usr/include/errno.h -fPIC -fdiagnostics-color=always
 
 This will be used to compile .c files.
 Replace CFLAGS with -O -ggdb for debugging, -O2 for production
diff -r 79b6f035cd96 -r 3bfef1f22a97 conf-ld.ac
--- a/conf-ld.ac	Fri Jan 31 13:37:33 2025 +0000
+++ b/conf-ld.ac	Fri Jan 31 15:26:11 2025 +0000
@@ -1,4 +1,4 @@
-gcc LDFLAGS
+gcc LDFLAGS  -fdiagnostics-color=always
 
 This will be used to link .o files into an executable.
 Remove LDFLAGS for debugging, replace with -s for production
diff -r 79b6f035cd96 -r 3bfef1f22a97 install.c
--- a/install.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/install.c	Fri Jan 31 15:26:11 2025 +0000
@@ -137,7 +137,7 @@
     strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": ");
 }
 
-main()
+int main()
 {
   fdsourcedir = open_read(".");
   if (fdsourcedir == -1)
diff -r 79b6f035cd96 -r 3bfef1f22a97 instcheck.c
--- a/instcheck.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/instcheck.c	Fri Jan 31 15:26:11 2025 +0000
@@ -101,7 +101,7 @@
   perm("",home,"/",file,S_IFREG,uid,gid,mode);
 }
 
-main()
+int main()
 {
   hier();
   _exit(0);
diff -r 79b6f035cd96 -r 3bfef1f22a97 readwrite.h
--- a/readwrite.h	Fri Jan 31 13:37:33 2025 +0000
+++ b/readwrite.h	Fri Jan 31 15:26:11 2025 +0000
@@ -1,7 +1,4 @@
-#ifndef READWRITE_H
-#define READWRITE_H
-
-extern int read();
-extern int write();
+#ifndef _UNISTD_H
+#include <unistd.h>
 
 #endif
diff -r 79b6f035cd96 -r 3bfef1f22a97 seek.h
--- a/seek.h	Fri Jan 31 13:37:33 2025 +0000
+++ b/seek.h	Fri Jan 31 15:26:11 2025 +0000
@@ -1,5 +1,7 @@
 #ifndef SEEK_H
 #define SEEK_H
+#include <sys/types.h>
+#include <unistd.h>
 #include "uint32.h"
 
 typedef uint32 seek_pos;
diff -r 79b6f035cd96 -r 3bfef1f22a97 testzero.c
--- a/testzero.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/testzero.c	Fri Jan 31 15:26:11 2025 +0000
@@ -14,7 +14,7 @@
 static char data[65536];
 struct cdb_make c;
 
-main(int argc,char **argv)
+int main(int argc,char **argv)
 {
   int fd;
   unsigned long loop;
diff -r 79b6f035cd96 -r 3bfef1f22a97 trycpp.c
--- a/trycpp.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/trycpp.c	Fri Jan 31 15:26:11 2025 +0000
@@ -1,4 +1,4 @@
-main()
+int main()
 {
 #ifdef NeXT
   printf("nextstep\n"); exit(0);
diff -r 79b6f035cd96 -r 3bfef1f22a97 x86cpuid.c
--- a/x86cpuid.c	Fri Jan 31 13:37:33 2025 +0000
+++ b/x86cpuid.c	Fri Jan 31 15:26:11 2025 +0000
@@ -5,7 +5,7 @@
   exit(1);
 }
 
-main()
+int main()
 {
   unsigned long x[4];
   unsigned long y[4];