From e56710e1da3e4f7ab0c71d450532257e35e7ccb1 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Mon, 5 Apr 2010 10:11:31 -0500
Subject: [PATCH] Refactor: Move the state definition to ppp_cp.c

---
 gatchat/ppp_cp.c | 21 +++++++++++++++++----
 gatchat/ppp_cp.h | 15 +--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gatchat/ppp_cp.c b/gatchat/ppp_cp.c
index c5af89a6..ea2ee7f9 100644
--- a/gatchat/ppp_cp.c
+++ b/gatchat/ppp_cp.c
@@ -34,10 +34,6 @@
 #include "gatppp.h"
 #include "ppp.h"
 
-static const char *pppcp_state_strings[] =
-	{"INITIAL", "STARTING", "CLOSED", "STOPPED", "CLOSING", "STOPPING",
-	"REQSENT", "ACKRCVD", "ACKSENT", "OPENED" };
-
 #define pppcp_trace(p) do { \
 	char *str = g_strdup_printf("%s: %s: current state %d:%s", \
 				p->prefix, __FUNCTION__, \
@@ -57,6 +53,23 @@ static const char *pppcp_state_strings[] =
 #define MAX_FAILURE		5
 #define CP_HEADER_SZ		4
 
+enum pppcp_state {
+	INITIAL		= 0,
+	STARTING	= 1,
+	CLOSED		= 2,
+	STOPPED		= 3,
+	CLOSING		= 4,
+	STOPPING	= 5,
+	REQSENT		= 6,
+	ACKRCVD		= 7,
+	ACKSENT		= 8,
+	OPENED		= 9,
+};
+
+static const char *pppcp_state_strings[] =
+	{"INITIAL", "STARTING", "CLOSED", "STOPPED", "CLOSING", "STOPPING",
+	"REQSENT", "ACKRCVD", "ACKSENT", "OPENED" };
+
 static void pppcp_packet_free(struct pppcp_packet *packet)
 {
 	g_free(pppcp_to_ppp_packet(packet));
diff --git a/gatchat/ppp_cp.h b/gatchat/ppp_cp.h
index ee7ac8db..89394e9c 100644
--- a/gatchat/ppp_cp.h
+++ b/gatchat/ppp_cp.h
@@ -54,19 +54,6 @@ enum pppcp_event_type {
 	RXR,
 };
 
-enum pppcp_state {
-	INITIAL,
-	STARTING,
-	CLOSED,
-	STOPPED,
-	CLOSING,
-	STOPPING,
-	REQSENT,
-	ACKRCVD,
-	ACKSENT,
-	OPENED,
-};
-
 /* option format */
 struct ppp_option {
 	guint8 type;
@@ -107,7 +94,7 @@ struct pppcp_timer_data {
 };
 
 struct pppcp_data {
-	enum pppcp_state state;
+	unsigned char state;
 	struct pppcp_timer_data config_timer_data;
 	struct pppcp_timer_data terminate_timer_data;
 	guint max_failure;