diag: moved diag_fsm into fsm.c

Since diagnostics about the fsm is only used in fsm.c, move it there so we have less global context and we are all happier. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

diag: moved diag_fsm into fsm.c
Since diagnostics about the fsm is only used in fsm.c, move it there so we have less global context and we are all happier. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
c4e544a9 · Alessandro Rubini · 1bbeb3a0 · c4e544a9 · c4e544a9 · c4e544a9
Commit c4e544a9 authored Mar 07, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 25 deletions

diag-yes.c diag/diag-yes.c +0 -18

fsm.c fsm.c +28 -0

diag.h include/ppsi/diag.h +0 -7

No files found.
--- a/diag/diag-yes.c
+++ b/diag/diag-yes.c
@@ -8,24 +8,6 @@
 * This has diagnostics. It calls pp_printf (which one, we don't know)
 */

-void pp_diag_fsm(struct pp_instance *ppi, char *name, int sequence, int plen)
-{
-	if (sequence == STATE_ENTER) {
-		/* enter with or without a packet len */
-		pp_timed_printf(ppi, "fsm: ENTER %s, packet len %i\n",
-			  name, plen);
-		return;
-	}
-	if (sequence == STATE_LOOP) {
-		pp_timed_printf(ppi, "fsm: %s: reenter in %i ms\n", name,
-				ppi->next_delay);
-		return;
-	}
-	/* leave has one \n more, so different states are separate */
-	pp_timed_printf(ppi, "fsm: LEAVE %s (next: %3i in %i ms)\n\n",
-		name, ppi->next_state, ppi->next_delay);
-}
-
 void pp_diag_error(struct pp_instance *ppi, int err)
 {
 	pp_printf("ERR for %p: %i\n", ppi, err);

--- a/fsm.c
+++ b/fsm.c
@@ -6,6 +6,34 @@

 unsigned long pp_global_flags; /* This is the only "global" file in ppsi */

+/*
+ * Diagnostics about state machine, enter, leave, remain
+ */
+enum {
+	STATE_ENTER,
+	STATE_LOOP,
+	STATE_LEAVE
+};
+
+static void pp_diag_fsm(struct pp_instance *ppi, char *name, int sequence,
+			int plen)
+{
+	if (sequence == STATE_ENTER) {
+		/* enter with or without a packet len */
+		pp_timed_printf(ppi, "fsm: ENTER %s, packet len %i\n",
+			  name, plen);
+		return;
+	}
+	if (sequence == STATE_LOOP) {
+		pp_timed_printf(ppi, "fsm: %s: reenter in %i ms\n", name,
+				ppi->next_delay);
+		return;
+	}
+	/* leave has one \n more, so different states are separate */
+	pp_timed_printf(ppi, "fsm: LEAVE %s (next: %3i in %i ms)\n\n",
+		name, ppi->next_state, ppi->next_delay);
+}
+
 /*
 * This is the state machine code. i.e. the extension-independent
 * function that runs the machine. Errors are managed and reported

--- a/include/ppsi/diag.h
+++ b/include/ppsi/diag.h
@@ -12,13 +12,6 @@
 * strerror(errno) together with the explanation. Avoid diag_printf if
 * possible, for size reasons, but here it is anyways.
 */
-enum {
-	STATE_ENTER,
-	STATE_LOOP,
-	STATE_LEAVE
-};
-
-extern void pp_diag_fsm(struct pp_instance *ppi, char *name, int seq, int plen);
 extern void pp_diag_error(struct pp_instance *ppi, int err);
 extern void pp_diag_error_str2(struct pp_instance *ppi, char *s1, char *s2);
 extern void pp_diag_printf(struct pp_instance *ppi, char *fmt, ...);