BUILD : 1.7.15 (1145) BUGS : 579 NOTES : Fixed make strict issues with src/tools

git-svn-id: svn://svn.anope.org/anope/trunk@1145 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@868 5417fbe8-f217-4b02-8779-1006273d7864

9 files changed, 57 insertions, 27 deletions

diff --git a/Changes b/Changes
index b68b40694..770ef4abd 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@ Provided by Anope Dev. <dev@anope.org> - 2006
 08/09 F Fixed port checking when using command line switches.             [#575]
 08/14 F Fixed db_mysql_query for better robustness.                       [#585]
 08/27 F Fixed mod_current_module being incorrect resulting in segfault.   [#593]
+09/10 F Issues with make strict for the src/tools dir.                    [#579]
 
 Provided by Trystan <trystan@nomadirc.net> - 2006
 08/20 F Fixed several compiler warnings.                                  [#586]
diff --git a/Makefile.in b/Makefile.in
index db72760eb..397c5a2a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,8 +22,8 @@ SHARED=@SHARED@
 MODULEFLAGS=@MODULEFLAGS@
 
 all:   language headers build core protocols tools modules 
-strict: language headers strict_build strict_core strict_protocols tools strict_modules
-profile: language headers profile_build profile_core profile_protocols tools profile_modules
+strict: language headers strict_build strict_core strict_protocols strict_tools strict_modules
+profile: language headers profile_build profile_core profile_protocols profile_tools profile_modules
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
@@ -88,6 +88,14 @@ tools: build
 	(cd src/tools ; ${MAKE} ${MAKEARGS} all; )
 	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
 
+strict_tools: strict_build
+	(cd src/tools ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; )
+	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
+
+profile_tools: profile_build
+	(cd src/tools ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' all; )
+	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
+
 strict_modules: strict_build
 	(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=$(CFLAGS) $(STRICT)' all; )
 	@echo "*** All done, now (g)make install to install Anope/Modules";
diff --git a/src/bin/am b/src/bin/am
index 91ad8dd26..1a590c653 100755
--- a/src/bin/am
+++ b/src/bin/am
@@ -23,10 +23,10 @@ my $fhint="version.log";
 
 # Default values, change or use environment variables instead.
 my $copy="anope";
-my $svnuser="";
+my $svnuser="geniusdex";
 my $svnpath="/usr/bin";
 my $svnroot="svn://zero.org/repos/$copy";
-my $editor="/usr/bin/vi";
+my $editor="/usr/bin/mcedit";
 
 # Environment variables SVNBINDIR and SVNROOT override the above 
 # hardcoded values.
diff --git a/src/tools/Makefile b/src/tools/Makefile
index f64c6fa65..c0aa9fb85 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -1,5 +1,5 @@
-OBJS =  $(SRCS:.c=.o)
 SRCS =  anopesmtp.c db-merger.c epona2anope.c
+OBJS =  $(SRCS:.c=.o)
 
 INCLUDES = ../../include/services.h
 
diff --git a/src/tools/anopesmtp.c b/src/tools/anopesmtp.c
index 59231b4ef..3810b29de 100644
--- a/src/tools/anopesmtp.c
+++ b/src/tools/anopesmtp.c
@@ -88,23 +88,6 @@ static void remove_log(void)
 
 /*************************************************************************/
 
-static void checkday(void)
-{
-    time_t t;
-    struct tm tm;
-
-    time(&t);
-    tm = *localtime(&t);
-
-    if (curday != tm.tm_yday) {
-        close_log();
-        remove_log();
-        open_log();
-    }
-}
-
-/*************************************************************************/
-
 /* Open the log file.  Return -1 if the log file could not be opened, else
  * return 0. */
 
@@ -126,6 +109,23 @@ int open_log(void)
 
 /*************************************************************************/
 
+static void checkday(void)
+{
+    time_t t;
+    struct tm tm;
+
+    time(&t);
+    tm = *localtime(&t);
+
+    if (curday != tm.tm_yday) {
+        close_log();
+        remove_log();
+        open_log();
+    }
+}
+
+/*************************************************************************/
+
 /* Log stuff to the log file with a datestamp.  Note that errno is
  * preserved by this routine and log_perror().
  */
@@ -524,8 +524,11 @@ void mail_cleanup()
 int main(int argc, char *argv[])
 {
     char buf[8192];
+/*	These are somehow unused - why are they here? -GD
+
     struct smtp_body_line *b;
     struct smtp_header *h;
+*/
     int headers_done = 0;
 /* Win32 stuff */
 #ifdef _WIN32
@@ -546,7 +549,8 @@ int main(int argc, char *argv[])
 
    if (!server) {
         alog("No Server");
-        return;
+	/* Bad, bad, bad. This was a eturn from main with no value! -GD */
+        return 0;
     } else {
         alog("SMTP: server %s port %d",server,port);
     }
diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c
index 9de23eaca..5af13f4c0 100644
--- a/src/tools/db-merger.c
+++ b/src/tools/db-merger.c
@@ -715,7 +715,9 @@ int main(int argc, char *argv[])
             int n_levels;
             char *s;
             int n_ttb;
+			/* Unused variable - why? -GD
             int J;
+			*/
 
             last = &chanlists[i];
             prev = NULL;
@@ -896,14 +898,16 @@ int main(int argc, char *argv[])
             int c;
 
             for (i = 0; i < 256; i++) {
-                char input[1024];
                 int16 tmp16;
                 int32 tmp32;
                 int n_levels;
                 char *s;
-                NickAlias *na;
                 int n_ttb;
+				/* Unused variables - why? -GD
+                char input[1024];
+                NickAlias *na;
                 int J;
+				*/
 
                 while ((c = getc_db(f)) == 1) {
                     ChannelInfo *ci = NULL, *ciptr = NULL;
@@ -1257,7 +1261,9 @@ int main(int argc, char *argv[])
         if ((f = open_db_write("ChanServ", CHAN_DB_NEW, 16))) {
             ChannelInfo *ci;
             Memo *memos;
+			/* Unused variable - why? -GD
             static time_t lastwarn = 0;
+			*/
 
             for (i = 0; i < 256; i++) {
                 int16 tmp16;
diff --git a/src/tools/epona2anope.c b/src/tools/epona2anope.c
index a87bd0ae0..0cc45ee9d 100644
--- a/src/tools/epona2anope.c
+++ b/src/tools/epona2anope.c
@@ -243,8 +243,10 @@ int main(int argc, char *argv[])
 {
     dbFILE *f;
     int i;
-    NickCore *nc, *ncnext;
     long countr = 0, countw = 0;
+	/* Unused variables - why? -GD
+    NickCore *nc, *ncnext;
+	*/
 
     printf("\n"C_LBLUE"Epona to Anope DB converter by Certus"C_NONE"\n\n");
 
@@ -261,7 +263,9 @@ int main(int argc, char *argv[])
             int n_levels;
             char *s;
             int n_ttb;
+			/* Unused variable - why? -GD
             int J;
+			*/
 
             last = &chanlists[i];
             prev = NULL;
@@ -442,7 +446,9 @@ int main(int argc, char *argv[])
         if ((f = open_db_write("ChanServ", CHAN_DB_ANOPE, 16))) {
             ChannelInfo *ci;
             Memo *memos;
+			/* Unused variable - why? -GD
             static time_t lastwarn = 0;
+			*/
 
             for (i = 0; i < 256; i++) {
                 int16 tmp16;
diff --git a/src/tools/smtp.h b/src/tools/smtp.h
index b04fa98d8..6366f6483 100644
--- a/src/tools/smtp.h
+++ b/src/tools/smtp.h
@@ -47,6 +47,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
+#include <arpa/inet.h>
 #else
 #include <winsock.h>
 #include <windows.h>
diff --git a/version.log b/version.log
index 646848e64..7e5f5a789 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="15"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1144"
+VERSION_BUILD="1145"
 
 # $Log$
 #
+# BUILD : 1.7.15 (1145)
+# BUGS  : 579
+# NOTES : Fixed make strict issues with src/tools
+#
 # BUILD : 1.7.15 (1144)
 # BUGS  : 
 # NOTES : Fixed some c++-comments rob added; c-comments ftw!