Removed help.txt, it's automatically generated during the build.

Added make lint
Performed cleanups found by lint
Updated dependencies
Properly set up headers to prevent multiple inclusions
Updated make clean to remove all of the generated files

diff --git a/.depend b/.depend
index 16d4c82465aaf369f281d5ddb5e0471b7a4ef1d9..ae7f456ea04c801c08fdfb96225ae45bd4d9cb40 100644 (file)
--- a/.depend
+++ b/.depend
@@ -9,14 +9,16 @@ clients.o: clients.c include/config.h include/define.h \
 clones.o: clones.c include/config.h include/define.h include/struct.h \
  include/utils.h include/funcs.h
 dyntfuncs.o: dyntfuncs.c include/define.h include/config.h \
- include/struct.h include/dyntrans.h include/utils.h
+ include/struct.h include/utils.h include/dyntrans.h
 database.o: database.c include/config.h include/define.h \
  include/struct.h include/utils.h include/funcs.h
 efserv.o: efserv.c include/config.h include/define.h include/struct.h \
  include/utils.h include/funcs.h
-log.o: log.c include/config.h include/define.h include/struct.h
+log.o: log.c include/config.h include/define.h include/struct.h \
+ include/utils.h
 match.o: match.c
-md5.o: md5.c include/config.h include/define.h include/struct.h
+md5.o: md5.c include/config.h include/define.h include/struct.h \
+ include/utils.h
 msg.o: msg.c include/config.h include/define.h include/struct.h \
  include/utils.h include/funcs.h include/conf.h
 utils.o: utils.c include/config.h include/define.h include/utils.h

diff --git a/Makefile.in b/Makefile.in
index b8e48ac947d68c9cbcc31f9a4fcdba44dffe13cb..f11cdb7f7ef2f1cbf7c642ca6fb8f476b263a799 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # efserv Makefile.in
 # DO NOT EDIT
 #
-# $Id: Makefile.in,v 1.11 2002/01/03 04:56:01 wcampbel Exp $
+# $Id: Makefile.in,v 1.12 2002/04/15 17:44:31 wcampbel Exp $
 #
 
 # Don't edit these unless you know what you are doing
@@ -83,12 +83,19 @@ dtheader.h: include/config.h include/define.h include/struct.h
 help.txt: help.txt.in makehelp.pl
        perl makehelp.pl
 
-depend: lex.yy.c sconfig.tab.c dyntrans.tab.c
+lint:
+       lint -aacgprxhH ${DPATH} -Iinclude/ channels.c clients.c clones.c \
+               commands.c config.c database.c efserv.c log.c match.c md5.c \
+               modules.c msg.c utils.c > lint.out
+
+depend: sconfig.tab.c dyntrans.tab.c dyntrans.setup.c lex.yy.c
        ${CC} ${CFLAGS} -MM ${SRCS} dyntrans.tab.c >.depend
 
 clean:
        ${RM} -f *.o *.so core efserv.core efserv lex.yy.c
        ${RM} -f sconfig.tab.* help.txt
+       ${RM} -f dyntrans dyntrans.setup.c dyntrans.ll.c dyntrans.tab.*
+       ${RM} -f dtheader.i
 
 distclean: clean
        ${RM} -f Makefile config.status config.cache config.log

diff --git a/help.txt b/help.txt
deleted file mode 100644 (file)
index 06e9dad..0000000
--- a/help.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-\ 39efserv\ 3 services facilitate in the smooth running of your IRC network.
-Much of efserv's functionality is automated. However, some commands can
-be given by IRC operators and administrators. Type
-\ 2/msg services <command> ...
-Note that you should always check that it is the real services before
-sending passwords or sensitive data to it.
-The following commands are available:
-- \ 2HELP\ 2 - Prints this message.
-- \ 2ADMIN <username> <password>\ 2 - Lets you log in as an administrator.
-- \ 2JUPE <server> <reason>\ 2 - Starts a call for votes to jupe.
-- \ 2JUPE <server> +\ 2 - Votes for a jupe.
-- \ 2JUPE <server> -\ 2 - Votes against a jupe.
-Note that a jupe should be regarded as a last resort, and should only
-be used in the following situations:
-1) Server is possibly compromised/hacked.
-2) O-lines are compromised, with no-one to D-line.
-3) Trouble with route which breaks the network, causing splits.
-Each server gets one, and only one, vote. Anyone on your server can change
-your vote once it is placed, although a global operator can not change a
-vote which was placed by an administrator.
-3 admin votes(the admin must have logged in with \ 2ADMIN\ 2, or 5 oper
-votes result in the activation/deactivation of a jupe.
-There are stringent policies in place for dealing with jupe abuse.
-For more information, see:
-\ 312https://voting.blackened.com/docs/services.int.shtml
-
-$Id: help.txt,v 1.1 2001/12/10 07:22:35 a1kmm Exp $

diff --git a/include/conf.h b/include/conf.h
index 8af9f5c69ed615576411c41ff3115a1f7a95aec7..12b422b0a9f62076fc3c5fabc5ba136bf55affa6 100644 (file)
--- a/include/conf.h
+++ b/include/conf.h
@@ -16,9 +16,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA.
- * $Id: conf.h,v 1.2 2001/11/11 21:22:24 wcampbel Exp $
+ * $Id: conf.h,v 1.3 2002/04/15 17:44:34 wcampbel Exp $
  */
 
+#ifndef _CONF_H
+#define _CONF_H
+
 extern struct yystype
 {
  unsigned long number;
@@ -31,6 +34,7 @@ enum
  ALEVEL_ADMIN,
  ALEVEL_OPER,
  ALEVEL_SERVADMIN,
- ALEVEL_ANY,
+ ALEVEL_ANY
 };
 
+#endif

diff --git a/include/define.h b/include/define.h
index 5a192c3c2969f37db746d2ace3a98cff79e149d8..e567d1615010e61ce8da29bb5e3c6b73accedb30 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -16,9 +16,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA.
- * $Id: define.h,v 1.11 2001/12/10 07:04:50 a1kmm Exp $
+ * $Id: define.h,v 1.12 2002/04/15 17:44:34 wcampbel Exp $
  */
 
+#ifndef _DEFINE_H
+#define _DEFINE_H
+
 /* The maximum number of clients per user@host */
 #define MAXCLONES_UHOST 4
 /* The maximum number of clients per host */
@@ -96,3 +99,5 @@
 
 #define JEFLAG_AUTO 1
 #define JEFLAG_MANUAL 2
+
+#endif

diff --git a/include/dyntrans.h b/include/dyntrans.h
index a4376cb9c8b492713ac37f274ec9ec254f3b630f..25e260d5e9789818e2c13584dc70d367d84170c9 100644 (file)
--- a/include/dyntrans.h
+++ b/include/dyntrans.h
@@ -16,9 +16,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA.
- * $Id: dyntrans.h,v 1.1 2001/12/10 07:04:50 a1kmm Exp $
+ * $Id: dyntrans.h,v 1.2 2002/04/15 17:44:34 wcampbel Exp $
  */
 
+#ifndef _DYNTRANS_H
+#define _DYNTRANS_H
+
 struct StructType
 {
  unsigned long serno;
@@ -70,3 +73,5 @@ struct StructType *FindStructType(const char *name);
 void SaveStructType(const char *name, struct StructType **to);
 void RegisterStructInst(const char *name, const char *type, int isptr,
                         int nrep, void *data);
+
+#endif

diff --git a/include/funcs.h b/include/funcs.h
index 8b5ac29be3fc8cc13f8ba66ede6e5aca24834e77..791b2d647d5247a1aaa012ea04d07112d4d93f5f 100644 (file)
--- a/include/funcs.h
+++ b/include/funcs.h
@@ -1,3 +1,10 @@
+/* efserv funcs.h - Prototypes
+ * $Id: funcs.h,v 1.5 2002/04/15 17:44:34 wcampbel Exp $
+ */
+
+#ifndef _FUNCS_H
+#define _FUNCS_H
+
 void process_smode(const char *chname, const char *mode);
 void pick_a_hub(void);
 int check_admin(struct User*, const char*, const char*);
@@ -32,3 +39,5 @@ void fatal_error(const char *, ...);
 int send_msg(char *msg, ...);
 void log(const char *error, ...);
 #endif
+
+#endif

diff --git a/include/struct.h b/include/struct.h
index 2cd47913dfa104b07d14dbca182aa79778ce3095..a75ae8acfb809f736f613b1bc14280880cf59ab8 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -16,9 +16,13 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA.
- * $Id: struct.h,v 1.7 2001/12/10 07:04:50 a1kmm Exp $
+ * $Id: struct.h,v 1.8 2002/04/15 17:44:34 wcampbel Exp $
  */
 #include "define.h"
+#include "utils.h"
+
+#ifndef _STRUCT_H
+#define _STRUCT_H
 
 /*  We don't need to translate this, as we reinstall the commands on reload. */
 /*PNOTRANS*/
@@ -146,3 +150,5 @@ struct List* add_to_list_before(struct List **list, struct List *before,
                                 void *data);
 void move_list(struct List **dest, struct List **src);
 void remove_from_list(struct List **list, struct List *node);
+
+#endif

diff --git a/include/utils.h b/include/utils.h
index 863eebe9ddd7e4134d4374b84d23d1bf5ae5b609..2286d70c0dd80a564cda45bd24b23e1c11c900db 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -16,16 +16,19 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA.
- * $Id: utils.h,v 1.2 2001/12/10 07:04:50 a1kmm Exp $
+ * $Id: utils.h,v 1.3 2002/04/15 17:44:34 wcampbel Exp $
  */
 
+#ifndef _UTILS_H
+#define _UTILS_H
+
 enum
 {
  HASH_COMMAND,
  HASH_SERVER,
  HASH_USER,
  HASH_CHAN,
- HASH_HOST,
+ HASH_HOST
 };
 
 struct HashEntry
@@ -61,3 +64,5 @@ struct List
 #define find_user(name) (struct User*)find_in_hash(HASH_USER,name)
 #define find_channel(name) (struct Channel*)find_in_hash(HASH_CHAN,name)
 #define find_host(name) (struct Host*)find_in_hash(HASH_HOST,name)
+
+#endif

diff --git a/modules.c b/modules.c
index b7f764c8f767f9885723279b3bff6c22a28d2715..9e7786eaaabb001b0c84f5c4a13b3dbeedec7947 100644 (file)
--- a/modules.c
+++ b/modules.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA.
- * $Id: modules.c,v 1.8 2001/12/10 07:47:20 a1kmm Exp $
+ * $Id: modules.c,v 1.9 2002/04/15 17:44:31 wcampbel Exp $
  */
 
 #define PATH PREFIX
@@ -27,6 +27,8 @@
 #include <signal.h>
 #include <time.h>
 #include <unistd.h>
+#include "utils.h"
+#include "struct.h"
 
 int reload_module = 0, die = 0;
 int connected = 0, server_count = 0, minimum_servers = 0;