removed duplicated declarations

diff --git a/citadel/citadel_decls.h b/citadel/citadel_decls.h
index d858f0b53843adab2a1909280a419bb2fa508faa..e1415336b62c25ae6015ea858b5ac7b490cb9299 100644 (file)
--- a/citadel/citadel_decls.h
+++ b/citadel/citadel_decls.h
@@ -1 +1,18 @@
 extern char fullname[32];
+extern unsigned room_flags;
+extern char room_name[32];
+extern struct CtdlServInfo serv_info;
+extern char axlevel;
+extern char is_room_aide;
+extern unsigned userflags;
+extern char sigcaught;
+extern char editor_path[256];
+extern char printcmd[256];
+extern char have_xterm;
+extern char rc_username[32];
+extern char rc_password[32];
+extern char rc_floor_mode;
+extern char express_msgs;
+void logoff(int code);
+void formout(char *name);
+void sighandler(int which_sig);

diff --git a/citadel/commands.c b/citadel/commands.c
index a0b35bb67c41f15ce5199e5fc706d50c1a3d3c5f..03ddacfcdf552b293b05ca9e0dc096e2e6bcf6ef 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -32,6 +32,10 @@
 #include <errno.h>
 #include "citadel.h"
 #include "commands.h"
+#include "messages.h"
+#include "citadel_decls.h"
+#include "routines.h"
+#include "routines2.h"
 
 struct citcmd {
        struct citcmd *next;
@@ -43,37 +47,13 @@ struct citcmd {
 #define IFNEXPERT if ((userflags&US_EXPERT)==0)
 
 
-extern unsigned room_flags;
-extern char room_name[];
-extern struct CtdlServInfo serv_info;
-extern char axlevel;
-extern char is_room_aide;
-extern unsigned userflags;
-extern char sigcaught;
-extern char editor_path[];
-extern char printcmd[];
-extern char have_xterm;
-extern char rc_username[];
-extern char rc_password[];
-extern char rc_floor_mode;
 char rc_exp_beep;
 char rc_exp_cmd[256];
-extern int lines_printed;
-extern char express_msgs;
 
 char *gl_string;
 
 struct citcmd *cmdlist = NULL;
 
-void sighandler(int which_sig);
-void logoff(int code);
-int struncmp(char *lstr, char *rstr, int len);
-void formout(char *name);
-int room_prompt(int qrflags);
-void back(int spaces);
-int checkpagin(int lp, int pagin, int height);
-void color(int colornum);
-
 
 /* these variables are local to this module */
 char keepalives_enabled = KA_YES;      /* send NOOPs to server when idle */

diff --git a/citadel/messages.h b/citadel/messages.h
index 1b9d2a7ca2b36ecc57a54eac4a1e3777f8259c89..8417a392d93b79c7c7357f6bd1fb98774446a1d7 100644 (file)
--- a/citadel/messages.h
+++ b/citadel/messages.h
@@ -2,3 +2,4 @@ int ka_system(char *shc);
 int entmsg(int is_reply, int c);
 void readmsgs(int c, int rdir, int q);
 void edit_system_message(char *which_message);
+extern int lines_printed;

diff --git a/citadel/routines.h b/citadel/routines.h
index 50deeb8c73efe5842b63c9db502bda5c6fb65938..89b9fe35854f27975e0f3fd9b9dfddc615089df7 100644 (file)
--- a/citadel/routines.h
+++ b/citadel/routines.h
@@ -14,3 +14,4 @@ void misc_server_cmd(char *cmd);
 int nukedir(char *dirname);
 int num_parms(char *source);
 void strproc(char *string);
+void back(int spaces);

diff --git a/citadel/routines2.h b/citadel/routines2.h
index b1db0e7fdc87639e7200f93316684626a33b6c6e..ea908bfd5c03d57066913bb13596a05137c6bbde 100644 (file)
--- a/citadel/routines2.h
+++ b/citadel/routines2.h
@@ -10,3 +10,4 @@ void cli_upload(void);
 void validate(void);
 void read_bio(void);
 void cli_image_upload(char *keyname);
+int room_prompt(int qrflags);