Rename tinyproxy.[ch] to main.[ch]

26 files changed, 29 insertions, 29 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4b616e0..2d11ddc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ tinyproxy_SOURCES = \
 	sock.c sock.h \
 	stats.c stats.h \
 	text.c text.h \
-	tinyproxy.c tinyproxy.h \
+	main.c main.h \
 	utils.c utils.h \
 	vector.c vector.h
 
diff --git a/src/acl.c b/src/acl.c
index aec6773..ece859e 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -21,7 +21,7 @@
  * which is then used to compare incoming connections.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "acl.h"
 #include "heap.h"
diff --git a/src/anonymous.c b/src/anonymous.c
index bfd2dc6..928abb8 100644
--- a/src/anonymous.c
+++ b/src/anonymous.c
@@ -20,7 +20,7 @@
  * when the anonymous feature is turned on.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "anonymous.h"
 #include "hashmap.h"
diff --git a/src/buffer.c b/src/buffer.c
index 796e20a..d158ca0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -25,7 +25,7 @@
  * the ends of an array. :)
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "buffer.h"
 #include "heap.h"
diff --git a/src/child.c b/src/child.c
index b540f3c..bb4110c 100644
--- a/src/child.c
+++ b/src/child.c
@@ -20,7 +20,7 @@
  * processing incoming connections.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "child.h"
 #include "daemon.h"
diff --git a/src/common.h b/src/common.h
index 551d0f9..cf72071 100644
--- a/src/common.h
+++ b/src/common.h
@@ -17,7 +17,7 @@
  */
 
 /* This file groups all the headers required throughout the tinyproxy
- * system.  All this information use to be in the "tinyproxy.h" header,
+ * system.  All this information use to be in the "main.h" header,
  * but various other "libraries" in the program need the same information,
  * without the tinyproxy specific defines.
  */
diff --git a/src/conffile.c b/src/conffile.c
index a3eea02..888ddce 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -22,7 +22,7 @@
  * add new directives to.  Who knows if I'm right though.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "conffile.h"
 
diff --git a/src/conns.c b/src/conns.c
index 433f59a..3dc0575 100644
--- a/src/conns.c
+++ b/src/conns.c
@@ -22,7 +22,7 @@
  * connection structure definition.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "buffer.h"
 #include "conns.h"
diff --git a/src/conns.h b/src/conns.h
index ae1fcaa..f28c2c1 100644
--- a/src/conns.h
+++ b/src/conns.h
@@ -21,7 +21,7 @@
 #ifndef TINYPROXY_CONNS_H
 #define TINYPROXY_CONNS_H
 
-#include "tinyproxy.h"
+#include "main.h"
 #include "hashmap.h"
 
 /*
diff --git a/src/daemon.c b/src/daemon.c
index 9950842..17d41b5 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -21,7 +21,7 @@
  * a function to portably set a signal handler.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "daemon.h"
 
diff --git a/src/filter.c b/src/filter.c
index 30642ed..d74ebb7 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -22,7 +22,7 @@
  * pointed at by DEFAULT_FILTER.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "filter.h"
 #include "heap.h"
diff --git a/src/hashmap.c b/src/hashmap.c
index f8b181d..2c8327c 100644
--- a/src/hashmap.c
+++ b/src/hashmap.c
@@ -25,7 +25,7 @@
  * don't try to free the data, or realloc the memory. :)
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "hashmap.h"
 #include "heap.h"
diff --git a/src/heap.c b/src/heap.c
index c0c768b..b0a0200 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -23,7 +23,7 @@
  * format of the log message is standardized.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 #include "heap.h"
 #include "text.h"
 
diff --git a/src/html-error.c b/src/html-error.c
index 8c95469..09116a6 100644
--- a/src/html-error.c
+++ b/src/html-error.c
@@ -20,7 +20,7 @@
  * HTML error pages with variable substitution.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "common.h"
 #include "buffer.h"
diff --git a/src/log.c b/src/log.c
index ca42c43..51f7c2d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -21,7 +21,7 @@
  * or the syslog daemon. Not much to it...
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "heap.h"
 #include "log.h"
diff --git a/src/tinyproxy.c b/src/main.c
index b5a214d..05b3dd0 100644
--- a/src/tinyproxy.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
  * elsewhere.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "anonymous.h"
 #include "buffer.h"
diff --git a/src/tinyproxy.h b/src/main.h
index 2d4a187..e508aa0 100644
--- a/src/tinyproxy.h
+++ b/src/main.h
@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/* See 'tinyproxy.c' for detailed information. */
+/* See 'main.c' for detailed information. */
 
-#ifndef TINYPROXY_TINYPROXY_H
-#define TINYPROXY_TINYPROXY_H
+#ifndef __MAIN_H__
+#define __MAIN_H__
 
 #include "common.h"
 #include "hashmap.h"
@@ -106,4 +106,4 @@ extern struct config_s config;
 extern unsigned int received_sighup;    /* boolean */
 extern unsigned int processed_config_file;      /* boolean */
 
-#endif
+#endif /* __MAIN_H__ */
diff --git a/src/network.c b/src/network.c
index fe65a15..22dfadf 100644
--- a/src/network.c
+++ b/src/network.c
@@ -23,7 +23,7 @@
  * to write an arbitrary amount of data to the network.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "heap.h"
 #include "network.h"
diff --git a/src/reqs.c b/src/reqs.c
index 0fc4778..1950a5b 100644
--- a/src/reqs.c
+++ b/src/reqs.c
@@ -25,7 +25,7 @@
  * and then relays the bytes between the two.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "acl.h"
 #include "anonymous.h"
diff --git a/src/reverse-proxy.c b/src/reverse-proxy.c
index d4ca7eb..8d97538 100644
--- a/src/reverse-proxy.c
+++ b/src/reverse-proxy.c
@@ -18,7 +18,7 @@
 
 /* Allow tinyproxy to be used as a reverse proxy. */
 
-#include "tinyproxy.h"
+#include "main.h"
 #include "reverse-proxy.h"
 
 #include "conns.h"
diff --git a/src/sock.c b/src/sock.c
index 8da0abf..5673d46 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -25,7 +25,7 @@
  * actually is.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "log.h"
 #include "heap.h"
diff --git a/src/stats.c b/src/stats.c
index 3c3b0d9..6abd4bd 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -25,7 +25,7 @@
  * and the switch statement in update_stats().
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "log.h"
 #include "heap.h"
diff --git a/src/text.c b/src/text.c
index 44ee558..1536eac 100644
--- a/src/text.c
+++ b/src/text.c
@@ -22,7 +22,7 @@
  * with the standard C string library.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "text.h"
 
diff --git a/src/transparent-proxy.c b/src/transparent-proxy.c
index a3c4ee8..7318697 100644
--- a/src/transparent-proxy.c
+++ b/src/transparent-proxy.c
@@ -23,7 +23,7 @@
  * traffic to tinyproxy for this to work properly.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "transparent-proxy.h"
 #include "conns.h"
diff --git a/src/utils.c b/src/utils.c
index b657e65..fc65af0 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -23,7 +23,7 @@
  * it, so it's in here.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "conns.h"
 #include "heap.h"
diff --git a/src/vector.c b/src/vector.c
index 944c38b..77f3955 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -21,7 +21,7 @@
  * vector.)
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "heap.h"
 #include "vector.h"