GUAC-847: Rename conf-file to conf-parse.

src/guacd/Makefile.am

@@ -27,17 +27,17 @@ AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@ @COMMON_INCLUDE@
 sbin_PROGRAMS = guacd
 man_MANS = man/guacd.8
 
-noinst_HEADERS = \
-    client.h     \
-    client-map.h \
-    conf-file.h  \
+noinst_HEADERS =  \
+    client.h      \
+    client-map.h  \
+    conf-parse.h  \
     log.h
 
-guacd_SOURCES =  \
-    daemon.c     \
-	client.c     \
-	client-map.c \
-	conf-file.c  \
+guacd_SOURCES =   \
+    daemon.c      \
+	client.c      \
+	client-map.c  \
+	conf-parse.c  \
 	log.c
 
 guacd_LDADD   = @LIBGUAC_LTLIB@ @COMMON_LTLIB@

src/guacd/conf-parse.c

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include "conf-file.h"
+#include "conf-parse.h"
 
 #include <ctype.h>
 #include <string.h>

src/guacd/conf-parse.h

@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef _GUACD_CONF_FILE_H
-#define _GUACD_CONF_FILE_H
+#ifndef _GUACD_CONF_PARSE_H
+#define _GUACD_CONF_PARSE_H
 
 /**
  * The maximum length of a name, in characters.