[mw-devel] MW3 r1352 - in trunk/src: . client server

welshbyte at sucs.org welshbyte at sucs.org
Fri Nov 1 23:07:35 GMT 2013


Author: welshbyte
Date: 2013-11-01 23:07:35 +0000 (Fri, 01 Nov 2013)
New Revision: 1352

Modified:
   trunk/src/client/Parse.c
   trunk/src/client/add.c
   trunk/src/client/alias.c
   trunk/src/client/edit.c
   trunk/src/client/folders.c
   trunk/src/client/incoming.c
   trunk/src/client/js.c
   trunk/src/client/log.c
   trunk/src/client/main.c
   trunk/src/client/mesg.c
   trunk/src/client/new.c
   trunk/src/client/newmain.c
   trunk/src/client/read.c
   trunk/src/client/script_inst.c
   trunk/src/client/sqlite.c
   trunk/src/client/talker.c
   trunk/src/client/uri.c
   trunk/src/client/user.c
   trunk/src/client/who.c
   trunk/src/ipc.c
   trunk/src/rooms.c
   trunk/src/server/mwserv.c
   trunk/src/server/servsock.c
   trunk/src/strings.c
   trunk/src/user.c
Log:
Remove some unnecessary includes


Modified: trunk/src/client/Parse.c
===================================================================
--- trunk/src/client/Parse.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/Parse.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -5,7 +5,6 @@
 #include "bb.h"
 #include "init.h"
 #include "talker.h"
-#include "strings.h"
 #include "user.h"
 #include "talker_privs.h"
 #include "userio.h"

Modified: trunk/src/client/add.c
===================================================================
--- trunk/src/client/add.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/add.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -8,7 +8,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <signal.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

Modified: trunk/src/client/alias.c
===================================================================
--- trunk/src/client/alias.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/alias.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "talker.h"
-#include "strings.h"
 #include "main.h"
 #include "intl.h"
 #include "userio.h"

Modified: trunk/src/client/edit.c
===================================================================
--- trunk/src/client/edit.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/edit.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -7,7 +7,6 @@
 #include <inttypes.h>
 #include <fcntl.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>

Modified: trunk/src/client/folders.c
===================================================================
--- trunk/src/client/folders.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/folders.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -5,13 +5,11 @@
  *       see licence for furthur information.            *
  *********************************************************/
 
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include "ipc.h"
 #include "files.h"
-#include "strings.h"
 #include "perms.h"
 #include "intl.h"
 #include "user.h"

Modified: trunk/src/client/incoming.c
===================================================================
--- trunk/src/client/incoming.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/incoming.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -23,7 +23,6 @@
 #include "mesg.h"
 #include "echo.h"
 #include "intl.h"
-#include "socket.h"
 #include "bb.h"
 #include "who.h"
 #include "user.h"

Modified: trunk/src/client/js.c
===================================================================
--- trunk/src/client/js.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/js.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -1,12 +1,9 @@
 /* Add javascript functionality using spidermonkey */
 
 #include <fcntl.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
-#include <iconv.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <readline/readline.h>
@@ -17,7 +14,6 @@
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
 #pragma GCC diagnostic ignored "-Winvalid-offsetof"
 #pragma GCC diagnostic ignored "-Wbad-function-cast"
-#include <jsapi.h>
 #include <jsdbgapi.h>
 #pragma GCC diagnostic warning "-Wbad-function-cast"
 #pragma GCC diagnostic warning "-Winvalid-offsetof"
@@ -25,17 +21,16 @@
 
 #include <who.h>
 #include <sqlite.h>
+#include <iconv.h>
 #include "bb.h"
 #include "chattable.h"
 #include "script.h"
 #include "talker_privs.h"
 #include "talker.h"
-#include "iconv.h"
 #include "alias.h"
 #include "alarm.h"
 #include "log.h"
 #include "main.h"
-#include "files.h"
 #include "init.h"
 #include "js.h"
 #include "util.h"

Modified: trunk/src/client/log.c
===================================================================
--- trunk/src/client/log.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/log.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -13,7 +13,6 @@
 #include "js.h"
 #include "log.h"
 #include "uri.h"
-#include "sqlite.h"
 #include "user.h"
 
 extern struct person *user;

Modified: trunk/src/client/main.c
===================================================================
--- trunk/src/client/main.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/main.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -29,7 +29,6 @@
 #include "talker_privs.h"
 #include "special.h"
 #include "frl.h"
-#include "files.h"
 
 #include "incoming.h"
 #include "script.h"

Modified: trunk/src/client/mesg.c
===================================================================
--- trunk/src/client/mesg.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/mesg.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -7,7 +7,6 @@
 #include "special.h"
 #include "ipc.h"
 #include "perms.h"
-#include "files.h"
 #include "intl.h"
 #include "mesg.h"
 #include "bb.h"

Modified: trunk/src/client/new.c
===================================================================
--- trunk/src/client/new.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/new.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -14,7 +14,6 @@
 #include "incoming.h"
 #include "strings.h"
 #include "talker.h"
-#include "files.h"
 #include "perms.h"
 #include "read.h"
 #include "main.h"

Modified: trunk/src/client/newmain.c
===================================================================
--- trunk/src/client/newmain.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/newmain.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -5,7 +5,6 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <errno.h>
 #include <unistd.h>
 #include <time.h>
 #include <stdbool.h>

Modified: trunk/src/client/read.c
===================================================================
--- trunk/src/client/read.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/read.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -13,7 +13,6 @@
 #include "strings.h"
 #include "perms.h"
 #include "read.h"
-#include "files.h"
 #include "talker.h"
 #include "echo.h"
 #include "util.h"

Modified: trunk/src/client/script_inst.c
===================================================================
--- trunk/src/client/script_inst.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/script_inst.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -21,7 +21,6 @@
 #include "expand.h"
 #include "ipc.h"
 #include "iconv.h"
-#include "files.h"
 #include "perms.h"
 #include "main.h"
 #include "user.h"

Modified: trunk/src/client/sqlite.c
===================================================================
--- trunk/src/client/sqlite.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/sqlite.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sqlite3.h>

Modified: trunk/src/client/talker.c
===================================================================
--- trunk/src/client/talker.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/talker.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -16,7 +16,6 @@
 #include "special.h"
 #include "script_inst.h"
 #include "js.h"
-#include "files.h"
 #include "sqlite.h"
 #include "perms.h"
 #include "main.h"

Modified: trunk/src/client/uri.c
===================================================================
--- trunk/src/client/uri.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/uri.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -9,7 +9,6 @@
 #include "sqlite.h"
 #include "talker.h"
 #include "main.h"
-#include "strings.h"
 #include "perms.h"
 #include "bb.h"
 #include "userio.h"

Modified: trunk/src/client/user.c
===================================================================
--- trunk/src/client/user.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/user.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -15,7 +15,6 @@
 #include "special.h"
 #include "talker_privs.h"
 #include "talker.h"
-#include "files.h"
 #include "strings.h"
 #include "getpass.h"
 #include "perms.h"

Modified: trunk/src/client/who.c
===================================================================
--- trunk/src/client/who.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/client/who.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -16,7 +16,6 @@
 #include "special.h"
 #include "strings.h"
 #include "ipc.h"
-#include "files.h"
 #include "perms.h"
 #include "talker.h"
 #include "userio.h"

Modified: trunk/src/ipc.c
===================================================================
--- trunk/src/ipc.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/ipc.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -7,8 +7,6 @@
 
 #include "ipc.h"
 #include "iconv.h"
-#include "files.h"
-#include "socket.h"
 #include "strings.h"
 #include "bb.h"
 

Modified: trunk/src/rooms.c
===================================================================
--- trunk/src/rooms.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/rooms.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -1,9 +1,6 @@
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "talker_privs.h"
 #include "sqlite.h"
-#include "user.h"
 #include "rooms.h"
 #include "util.h"
 

Modified: trunk/src/server/mwserv.c
===================================================================
--- trunk/src/server/mwserv.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/server/mwserv.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -9,7 +9,6 @@
 #include <string.h>
 #include <time.h>
 #include <socket.h>
-#include <files.h>
 #include <who.h>
 #include "servsock.h"
 

Modified: trunk/src/server/servsock.c
===================================================================
--- trunk/src/server/servsock.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/server/servsock.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -12,16 +12,15 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "../socket.h"
-#include "servsock.h"
-#include "../files.h"
+#include <socket.h>
 #include <nonce.h>
-#include "../util.h"
-#include "../who.h"
-#include "../rooms.h"
-#include "../talker_privs.h"
-#include "../ipc.h"
+#include <util.h>
+#include <rooms.h>
+#include <talker_privs.h>
+#include <ipc.h>
 
+#include "servsock.h"
+
 struct list_head connection_list;
 
 static int pollfd = -1;

Modified: trunk/src/strings.c
===================================================================
--- trunk/src/strings.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/strings.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -3,8 +3,6 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <string.h>
-#include <arpa/telnet.h>
-#include <errno.h>
 #include <stdarg.h>
 #include "bb.h"
 #include "strings.h"

Modified: trunk/src/user.c
===================================================================
--- trunk/src/user.c	2013-11-01 22:41:18 UTC (rev 1351)
+++ trunk/src/user.c	2013-11-01 23:07:35 UTC (rev 1352)
@@ -1,5 +1,4 @@
 #include <fcntl.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>




More information about the mw-devel mailing list