Rename STEP to SESS_STEP

bin/varnishd/cache/cache.h

@@ -123,9 +123,9 @@ typedef struct {
 /*--------------------------------------------------------------------*/
 
 enum step {
-#define STEP(l, u, arg)	STP_##u,
+#define SESS_STEP(l, u, arg)	STP_##u,
 #include "tbl/steps.h"
-#undef STEP
+#undef SESS_STEP
 };
 
 /*--------------------------------------------------------------------*/

bin/varnishd/cache/cache_center.c

@@ -1644,14 +1644,14 @@ CNT_Session(struct sess *sp)
 		}
 
 		switch (sp->step) {
-#define STEP(l,u,arg) \
+#define SESS_STEP(l,u,arg) \
 		    case STP_##u: \
 			if (cache_param->diag_bitmap & 0x01) \
 				cnt_diag(sp, #u); \
 			done = cnt_##l arg; \
 		        break;
 #include "tbl/steps.h"
-#undef STEP
+#undef SESS_STEP
 		default:
 			WRONG("State engine misfire");
 		}

bin/varnishd/cache/cache_panic.c

@@ -278,9 +278,9 @@ pan_sess(const struct sess *sp)
 	    sp->addr ? sp->addr : "?.?.?.?",
 	    sp->port ? sp->port : "?");
 	switch (sp->step) {
-#define STEP(l, u, arg) case STP_##u: stp = "STP_" #u; break;
+#define SESS_STEP(l, u, arg) case STP_##u: stp = "STP_" #u; break;
 #include "tbl/steps.h"
-#undef STEP
+#undef SESS_STEP
 		default: stp = NULL;
 	}
 	if (stp != NULL)

include/tbl/steps.h

@@ -29,20 +29,20 @@
  */
 
 /*lint -save -e525 -e539 */
-STEP(wait,		WAIT,		(sp, sp->wrk, sp->req))
-STEP(first,		FIRST,		(sp, sp->wrk))
-STEP(restart,		RESTART,	(sp, sp->wrk, sp->req))
-STEP(recv,		RECV,		(sp, sp->wrk, sp->req))
-STEP(start,		START,		(sp, sp->wrk, sp->req))
-STEP(pipe,		PIPE,		(sp, sp->wrk, sp->req))
-STEP(pass,		PASS,		(sp, sp->wrk, sp->req))
-STEP(lookup,		LOOKUP,		(sp, sp->wrk, sp->req))
-STEP(miss,		MISS,		(sp, sp->wrk, sp->req))
-STEP(hit,		HIT,		(sp, sp->wrk, sp->req))
-STEP(fetch,		FETCH,		(sp, sp->wrk, sp->req))
-STEP(fetchbody,		FETCHBODY,	(sp, sp->wrk, sp->req))
-STEP(prepresp,		PREPRESP,	(sp, sp->wrk, sp->req))
-STEP(deliver,		DELIVER,	(sp, sp->wrk, sp->req))
-STEP(error,		ERROR,		(sp, sp->wrk, sp->req))
-STEP(done,		DONE,		(sp, sp->wrk, sp->req))
+SESS_STEP(wait,		WAIT,		(sp, sp->wrk, sp->req))
+SESS_STEP(first,		FIRST,		(sp, sp->wrk))
+SESS_STEP(restart,		RESTART,	(sp, sp->wrk, sp->req))
+SESS_STEP(recv,		RECV,		(sp, sp->wrk, sp->req))
+SESS_STEP(start,		START,		(sp, sp->wrk, sp->req))
+SESS_STEP(pipe,		PIPE,		(sp, sp->wrk, sp->req))
+SESS_STEP(pass,		PASS,		(sp, sp->wrk, sp->req))
+SESS_STEP(lookup,		LOOKUP,		(sp, sp->wrk, sp->req))
+SESS_STEP(miss,		MISS,		(sp, sp->wrk, sp->req))
+SESS_STEP(hit,		HIT,		(sp, sp->wrk, sp->req))
+SESS_STEP(fetch,		FETCH,		(sp, sp->wrk, sp->req))
+SESS_STEP(fetchbody,		FETCHBODY,	(sp, sp->wrk, sp->req))
+SESS_STEP(prepresp,		PREPRESP,	(sp, sp->wrk, sp->req))
+SESS_STEP(deliver,		DELIVER,	(sp, sp->wrk, sp->req))
+SESS_STEP(error,		ERROR,		(sp, sp->wrk, sp->req))
+SESS_STEP(done,		DONE,		(sp, sp->wrk, sp->req))
 /*lint -restore */