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

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
 

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"

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"

src/buffer.c

@@ -25,7 +25,7 @@
  * the ends of an array. :)
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "buffer.h"
 #include "heap.h"

src/child.c

@@ -20,7 +20,7 @@
  * processing incoming connections.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "child.h"
 #include "daemon.h"

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.
  */

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"
 

src/conns.c

@@ -22,7 +22,7 @@
  * connection structure definition.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "buffer.h"
 #include "conns.h"

src/conns.h

@@ -21,7 +21,7 @@
 #ifndef TINYPROXY_CONNS_H
 #define TINYPROXY_CONNS_H
 
-#include "tinyproxy.h"
+#include "main.h"
 #include "hashmap.h"
 
 /*

src/daemon.c

@@ -21,7 +21,7 @@
  * a function to portably set a signal handler.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "daemon.h"
 

src/filter.c

@@ -22,7 +22,7 @@
  * pointed at by DEFAULT_FILTER.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "filter.h"
 #include "heap.h"

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"

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"
 

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"

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"

src/main.c

@@ -26,7 +26,7 @@
  * elsewhere.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "anonymous.h"
 #include "buffer.h"

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
+#ifndef __MAIN_H__
-#define TINYPROXY_TINYPROXY_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__ */

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"

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"

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"

src/sock.c

@@ -25,7 +25,7 @@
  * actually is.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "log.h"
 #include "heap.h"

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"

src/text.c

@@ -22,7 +22,7 @@
  * with the standard C string library.
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "text.h"
 

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"

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"

src/vector.c

@@ -21,7 +21,7 @@
  * vector.)
  */
 
-#include "tinyproxy.h"
+#include "main.h"
 
 #include "heap.h"
 #include "vector.h"