From 4f578a160f36e2a8ba44488bb8e2dd59bc96ab45 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 8 Sep 2014 10:25:23 -0700
Subject: [PATCH] GUAC-847: Rename conf-file to conf-parse.

---
 src/guacd/Makefile.am                   | 18 +++++++++---------
 src/guacd/{conf-file.c => conf-parse.c} |  2 +-
 src/guacd/{conf-file.h => conf-parse.h} |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename src/guacd/{conf-file.c => conf-parse.c} (99%)
 rename src/guacd/{conf-file.h => conf-parse.h} (97%)

diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am
index 8ce296b0..6139f48e 100644
--- a/src/guacd/Makefile.am
+++ b/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@
diff --git a/src/guacd/conf-file.c b/src/guacd/conf-parse.c
similarity index 99%
rename from src/guacd/conf-file.c
rename to src/guacd/conf-parse.c
index d9c531f4..79410f82 100644
--- a/src/guacd/conf-file.c
+++ b/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>
diff --git a/src/guacd/conf-file.h b/src/guacd/conf-parse.h
similarity index 97%
rename from src/guacd/conf-file.h
rename to src/guacd/conf-parse.h
index 28082b7f..23c79e4e 100644
--- a/src/guacd/conf-file.h
+++ b/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.