Tie the names of the states to the enums

FreeRADIUS · Feb 11, 2014 · bad2892 · bad2892
1 parent 7c5e50c
commit bad2892
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/include/radiusd.h b/src/include/radiusd.h
@@ -188,6 +188,7 @@ typedef enum {
 	REQUEST_STOP_PROCESSING,
 	REQUEST_COUNTED
 } rad_master_state_t;
+#define REQUEST_MASTER_NUM_STATES (REQUEST_COUNTED + 1)
 
 typedef enum {
 	REQUEST_QUEUED = 1,
@@ -197,6 +198,7 @@ typedef enum {
 	REQUEST_CLEANUP_DELAY,
 	REQUEST_DONE
 } rad_child_state_t;
+#define REQUEST_CHILD_NUM_STATES (REQUEST_DONE + 1)
 
 struct request {
 #ifndef NDEBUG

diff --git a/src/main/process.c b/src/main/process.c
@@ -68,14 +68,14 @@ static char const *action_codes[] = {
 #ifdef DEBUG_STATE_MACHINE
 #define TRACE_STATE_MACHINE if (debug_flag) printf("(%u) ********\tSTATE %s action %s live M-%s C-%s\t********\n", request->number, __FUNCTION__, action_codes[action], master_state_names[request->master_state], child_state_names[request->child_state])
 
-static char const *master_state_names[4] = {
+static char const *master_state_names[REQUEST_MASTER_NUM_STATES] = {
 	"?",
 	"active",
 	"stop-processing",
 	"counted"
 };
 
-static char const *child_state_names[7] = {
+static char const *child_state_names[REQUEST_CHILD_NUM_STATES] = {
 	"?",
 	"queued",
 	"running",