]> git.sur5r.net Git - openocd/commitdiff
projects / openocd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 7c7fed0)
Audit and eliminate redundant #include directives from src/server.
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 11 May 2009 04:22:15 +0000 (04:22 +0000)
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 11 May 2009 04:22:15 +0000 (04:22 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@1709 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/server/gdb_server.c patch | blob | history
src/server/gdb_server.h patch | blob | history
src/server/httpd.c patch | blob | history
src/server/server.c patch | blob | history
src/server/server.h patch | blob | history
src/server/tcl_server.c patch | blob | history
src/server/telnet_server.c patch | blob | history

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 7ba5281bd7898413b42e682c4d8445a792801fbb..4537c2d2764d967b2355e1b49ed556425778ced4 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -27,24 +27,14 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "gdb_server.h"
-
+#include "target_request.h"
+#include "register.h"
 #include "server.h"
-#include "log.h"
-#include "binarybuffer.h"
-#include "jtag.h"
-#include "breakpoints.h"
 #include "flash.h"
-#include "target.h"
-#include "target_request.h"
-#include "configuration.h"
+#include "image.h"
+#include "jtag.h"
 
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 
 #if 0
 #define _DEBUG_GDB_IO_
diff --git a/src/server/gdb_server.h b/src/server/gdb_server.h
index 691cebf4fbd3421575256cd33454f9d2fe64d58d..d9d31067fa728369da0a4bc3342aebddf3679cf2 100644 (file)
--- a/src/server/gdb_server.h
+++ b/src/server/gdb_server.h
@@ -27,8 +27,8 @@
 #define GDB_SERVER_H
 
 #include "target.h"
-#include "server.h"
-#include "image.h"
+
+struct image_s;
 
 #define GDB_BUFFER_SIZE        16384
 
@@ -39,7 +39,7 @@ typedef struct gdb_connection_s
        int buf_cnt;
        int ctrl_c;
        enum target_state frontend_state;
-       image_t *vflash_image;
+       struct image_s *vflash_image;
        int closed;
        int busy;
        int noack_mode;
diff --git a/src/server/httpd.c b/src/server/httpd.c
index 6a4302f99c173440c8c8b818162acc2b8a89c6b5..6d9851533d8af87ece3c307b3133e810f6a175da 100644 (file)
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -27,30 +27,13 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
-#include "server.h"
-
-#include "log.h"
 #include "telnet_server.h"
 #include "target.h"
 
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include <microhttpd.h>
 #include <pthread.h>
 #include <signal.h>
 
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <microhttpd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
 #define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
 
 int loadFile(const char *name, void **data, size_t *len);
diff --git a/src/server/server.c b/src/server/server.c
index 2c5f643e5ac46beb6f4dafd132d90789493f7320..0840c52399c0ef52ccda3c36ea12f3d57c8fb892 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -27,25 +27,16 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "server.h"
-
-#include "log.h"
-#include "telnet_server.h"
 #include "target.h"
 
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <signal.h>
+
 #ifndef _WIN32
 #include <netinet/tcp.h>
 #endif
 
+
 service_t *services = NULL;
 
 /* shutdown_openocd == 1: exit the main event loop, and quit the debugger */
diff --git a/src/server/server.h b/src/server/server.h
index 2268c310ccd409df6ba3813bea10c1cbe8f03f5c..bfb862007952a1033838819dc947a45ebf09e829 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -26,9 +26,11 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "command.h"
-#include "binarybuffer.h"
-#include "replacements.h"
+#include "log.h"
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 
 enum connection_type
 {
diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index 070f933611e3611f5d9d5b443594e620bd4ce451..b5ca3c965a958a7081a96564aa9b8f4e125b215c 100644 (file)
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -21,17 +21,8 @@
 #include "config.h"
 #endif
 
-#include <stdarg.h>
 #include "tcl_server.h"
 
-#include "log.h"
-#include "command.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
 
 #define TCL_SERVER_VERSION     "TCL Server 0.1"
 #define TCL_MAX_LINE           (4096)
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 95dfce161563ee73eb1cb42944951df6fcc12c07..16662bbdfe090d2e5f46c54986003fcb3d5ea3f5 100644 (file)
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -27,22 +27,9 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "telnet_server.h"
-
-#include "server.h"
-#include "log.h"
-#include "command.h"
-#include "target.h"
 #include "target_request.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-
 static unsigned short telnet_port = 0;
 
 int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
Cloned from https://git.code.sf.net/p/openocd/code