Rename conffile.[ch] to conf.[ch]

src/Makefile.am

@@ -26,7 +26,7 @@ tinyproxy_SOURCES = \
 	buffer.c buffer.h \
 	child.c child.h \
 	common.h \
-	conffile.c conffile.h \
+	conf.c conf.h \
 	conns.c conns.h \
 	daemon.c daemon.h \
 	hashmap.c hashmap.h \

src/conf.c

@@ -24,7 +24,7 @@
 
 #include "main.h"
 
-#include "conffile.h"
+#include "conf.h"
 
 #include "acl.h"
 #include "anonymous.h"

src/conf.h

@@ -16,10 +16,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/* See 'conffile.c' for detailed information. */
+/* See 'conf.c' for detailed information. */
 
-#ifndef TINYPROXY_CONFFILE_H
-#define TINYPROXY_CONFFILE_H
+#ifndef TINYPROXY_CONF_H
+#define TINYPROXY_CONF_H
 
 extern int config_compile (void);
 extern int config_parse (struct config_s *conf, FILE * f);

src/main.c

@@ -30,7 +30,7 @@
 
 #include "anonymous.h"
 #include "buffer.h"
-#include "conffile.h"
+#include "conf.h"
 #include "daemon.h"
 #include "heap.h"
 #include "filter.h"