use enums instead of bare #defines

ghosthamlet · Jan 3, 2012 · c3e2c93 · c3e2c93
1 parent ff78a5f
commit c3e2c93
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git a/include/tofu.h b/include/tofu.h
@@ -45,9 +45,11 @@
 extern "C" {
 #endif
 
-#define TOFU_FCGI	0
-#define TOFU_ZMQ	1
-#define TOFU_EVHTTP	2
+typedef enum {
+	TOFU_FCGI,
+	TOFU_ZMQ,
+	TOFU_EVHTTP
+} tofu_enum_backend_t;
 
 void tofu_loop(tofu_ctx_t *ctx);
 

diff --git a/include/tofu/req.h b/include/tofu/req.h
@@ -40,10 +40,12 @@
 extern "C" {
 #endif
 
-#define GET	0
-#define POST	1
-#define PUT	2
-#define DELETE	3
+typedef enum {
+	GET,
+	POST,
+	PUT,
+	DELETE,
+} tofu_enum_method_t;
 
 typedef void tofu_req_t;
 

diff --git a/src/backend.h b/src/backend.h
@@ -33,15 +33,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define BACKEND_FCGI	0
-#define BACKEND_ZMQ	1
-#define BACKEND_EVHTTP	2
-
 typedef struct {
 	int id;
 	char *name;
 
 	void (*loop)(tofu_ctx_t *ctx);
 } tofu_backend_t;
 
-tofu_backend_t backend;
+typedef enum {
+	TOFU_FCGI,
+	TOFU_ZMQ,
+	TOFU_EVHTTP
+} tofu_enum_backend_t;
diff --git a/src/backend/evhttp.c b/src/backend/evhttp.c
@@ -54,7 +54,7 @@ void tofu_backend_evhttp_loop(tofu_ctx_t *ctx);
 static void tofu_backend_evhttp_cb(struct evhttp_request *req, void *arg);
 
 tofu_backend_t tofu_backend_evhttp = {
-	.id   = BACKEND_EVHTTP,
+	.id   = TOFU_EVHTTP,
 	.name = "evhttp",
 
 	.loop = tofu_backend_evhttp_loop,

diff --git a/src/backend/fcgi.c b/src/backend/fcgi.c
@@ -52,7 +52,7 @@ void tofu_backend_fcgi_loop(tofu_ctx_t *ctx);
 static void tofu_backend_fcgi_send(tofu_rep_t *rep);
 
 tofu_backend_t tofu_backend_fcgi = {
-	.id   = BACKEND_FCGI,
+	.id   = TOFU_FCGI,
 	.name = "fcgi",
 
 	.loop = tofu_backend_fcgi_loop,

diff --git a/src/backend/zmq.c b/src/backend/zmq.c
@@ -57,7 +57,7 @@
 void tofu_backend_zmq_loop(tofu_ctx_t *ctx);
 
 tofu_backend_t tofu_backend_zmq = {
-	.id   = BACKEND_ZMQ,
+	.id   = TOFU_ZMQ,
 	.name = "zmq",
 
 	.loop = tofu_backend_zmq_loop,

diff --git a/src/tofu.c b/src/tofu.c
@@ -58,19 +58,19 @@ void tofu_loop(tofu_ctx_t *ctx) {
 
 	switch (ctx -> backend) {
 #ifdef HAVE_FCGI_STDIO_H
-		case BACKEND_FCGI:
+		case TOFU_FCGI:
 			backend = tofu_backend_fcgi;
 			break;
 #endif
 
 #ifdef HAVE_ZMQ_H
-		case BACKEND_ZMQ:
+		case TOFU_ZMQ:
 			backend = tofu_backend_zmq;
 			break;
 #endif
 
 #ifdef HAVE_EVHTTP_H
-		case BACKEND_EVHTTP:
+		case TOFU_EVHTTP:
 			backend = tofu_backend_evhttp;
 			break;
 #endif