Properly declare functions in headers; remove redundant declarations.

diff --git a/src/client/Makefile.standalone b/src/client/Makefile.standalone
index 0c5949641f1dfbd07d9596dcf0b91bf6a35bffff..149defc250c50c8c018528dfcae8102b92e095ad 100644 (file)
--- a/src/client/Makefile.standalone
+++ b/src/client/Makefile.standalone
@@ -69,17 +69,16 @@ clean:
        -(del /q $(OBJFILES))
        -(del /q empire.exe)
 
-# created using mkmf
 expect.o: misc.h fnlist.h
 globals.o: misc.h fnlist.h proto.h
-host.o: misc.h 
+host.o: misc.h
 ioqueue.o: misc.h queue.h ioqueue.h
-ipglob.o: misc.h fnlist.h proto.h
+ipglob.o: misc.h
 login.o: misc.h proto.h
-main.o: misc.h proto.h queue.h ioqueue.h
+main.o: misc.h proto.h queue.h ioqueue.h tags.h
 queue.o: misc.h queue.h
 saveargv.o: misc.h
-servcmd.o: misc.h proto.h queue.h ioqueue.h
+servcmd.o: misc.h proto.h queue.h ioqueue.h tags.h
 serverio.o: misc.h queue.h ioqueue.h
 tags.o: misc.h tags.h
 termio.o: misc.h tags.h

diff --git a/src/client/ioqueue.c b/src/client/ioqueue.c
index 6804412637445feb0b68abe8c91ded3ccd1beb16..e1caac94ce4293cde02de51eb1b30b4fcb892583 100644 (file)
--- a/src/client/ioqueue.c
+++ b/src/client/ioqueue.c
@@ -43,10 +43,6 @@ static int ioqtobuf(register struct ioqueue *ioq, s_char *buf, int cc);
 static void enqueuecc(struct ioqueue *ioq, s_char *buf, int cc);
 static int dequeuecc(register struct ioqueue *ioq, register int cc);
 
-void insque(struct qelem *, struct qelem *);
-void remque(struct qelem *);
-void initque(struct qelem *p);
-struct qelem *makeqt(int nelem);
 
 void
 ioq_init(struct ioqueue *ioq, int bsize)

diff --git a/src/client/ioqueue.h b/src/client/ioqueue.h
index c5aeac9da452493f8a630fb7dcbc5ff7c512fbc4..c933599a55dae9c58b9fb0a811052b7204c39817 100644 (file)
--- a/src/client/ioqueue.h
+++ b/src/client/ioqueue.h
@@ -46,3 +46,12 @@ struct io {
     int offset;                        /* offset into current entry */
     s_char *data;              /* pointer to start */
 };
+
+void ioq_init(struct ioqueue *ioq, int bsize);
+int ioq_peek(struct ioqueue *ioq, s_char *buf, int cc);
+int ioq_dequeue(struct ioqueue *ioq, int cc);
+int ioq_read(struct ioqueue *ioq, s_char *buf, int cc);
+void ioq_write(struct ioqueue *ioq, s_char *buf, int cc);
+int ioq_qsize(struct ioqueue *ioq);
+void ioq_drain(struct ioqueue *ioq);
+s_char *ioq_gets(struct ioqueue *ioq, s_char *buf, int cc);

diff --git a/src/client/main.c b/src/client/main.c
index e3571a15b5cf65dedbc9f307c1a9f72647b5c659..827bba72df45b1f3c05e7b26395012c6cd627371 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -40,6 +40,7 @@
 #include "proto.h"
 #include "queue.h"
 #include "ioqueue.h"
+#include "tags.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -78,13 +79,10 @@ int hostport(s_char *name, struct sockaddr_in *addr);
 int hostaddr(s_char *name, struct sockaddr_in *addr);
 int hostconnect(struct sockaddr_in *addr);
 int login(int s, s_char *uname, s_char *cname, s_char *cpass, int kill_proc);
-void ioq_init(struct ioqueue *ioq, int bsize);
-void io_init(void);
 int handleintr(int);
 int termio(int fd, int sock, FILE *auxfi);
 int serverio(int s, struct ioqueue *ioq);
 void servercmd(struct ioqueue *ioq, FILE *auxfi);
-void ioq_drain(struct ioqueue *ioq);
 
 static void intr(int sig);
 

diff --git a/src/client/queue.h b/src/client/queue.h
index bb01ae3570a8b6401abdcaed078e0c701f08a005..7e1cc4314b4fb41923cf97be367f84757af2e116 100644 (file)
--- a/src/client/queue.h
+++ b/src/client/queue.h
@@ -41,4 +41,9 @@ struct qelem {
     struct qelem *q_back;
 };
 
+void insque(struct qelem *p, struct qelem *q);
+void remque(struct qelem *p);
+void initque(struct qelem *p);
+struct qelem *makeqt(int nelem);
+
 #endif /* _QUEUE */

diff --git a/src/client/servcmd.c b/src/client/servcmd.c
index bde8fa9674944ed6ca41f21ab8a48f9760b8e7c9..f2ae219da9477c41b926f5f65dba68224fbbe3e6 100644 (file)
--- a/src/client/servcmd.c
+++ b/src/client/servcmd.c
@@ -36,6 +36,7 @@
 #include "proto.h"
 #include "queue.h"
 #include "ioqueue.h"
+#include "tags.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,8 +49,6 @@
 #include <io.h>
 #endif
 
-extern s_char *gettag(s_char *p);
-
 s_char num_teles[64];
 static s_char the_prompt[1024];
 static int mode;
@@ -75,7 +74,6 @@ extern s_char *SE;
 void
 servercmd(struct ioqueue *ioq, FILE *auxfi)
 {
-    s_char *ioq_gets(struct ioqueue *, s_char *, int);
     s_char buf[1024];
     s_char *p;
     int code;

diff --git a/src/client/serverio.c b/src/client/serverio.c
index 3420fc0eb322dcd1f5027be8e9a9c680eb71ffed..b2ccb0c191b8ccda6d53f1ad064a2d8bc70ac77b 100644 (file)
--- a/src/client/serverio.c
+++ b/src/client/serverio.c
@@ -40,14 +40,11 @@
 
 #if !defined(_WIN32)
 #include <unistd.h>
-#endif
-
-#ifdef _WIN32
+#else
 #include <winsock.h>
 #include <io.h>
 #endif
 
-void ioq_write(struct ioqueue *ioq, s_char *buf, int cc);
 
 int
 serverio(int s, struct ioqueue *ioq)

diff --git a/src/client/tags.h b/src/client/tags.h
index 806fd606a61de15bb1236cf46d26c5574e498346..69a69f5d10a5066a84b0e27d332b38ef38ecb8d3 100644 (file)
--- a/src/client/tags.h
+++ b/src/client/tags.h
@@ -39,4 +39,7 @@ struct tagstruct {
     struct tagstruct *next;
 };
 
+void io_init(void);
+s_char *gettag(s_char *p);
+
 #endif