commit - 1caf8972f3e1c8ed34e6a9a3ce7a24ebb3d6cc6a
commit + 25005dc3b0e6dc5d627ed020f3ef1ef039b94a4f
blob - 4035f97632b4cd9544bf5566cc128d3ec4d8996f
blob + 980ecf25520da4497a36f585459ebecbf7b1d3f5
--- gotwebd/config.c
+++ gotwebd/config.c
@@ -68,17 +68,17 @@ int
 config_getcfg(struct gotwebd *env, struct imsg *imsg)
 {
 	/* nothing to do but tell gotwebd configuration is done */
-	if (sockets_compose_main(env, IMSG_CFG_DONE, NULL, 0) == -1)
-		fatal("sockets_compose_main IMSG_CFG_DONE");
+	if (sockets_compose_main(env, GOTWEBD_IMSG_CFG_DONE, NULL, 0) == -1)
+		fatal("sockets_compose_main GOTWEBD_IMSG_CFG_DONE");
 	return 0;
 }
 
 int
 config_setserver(struct gotwebd *env, struct server *srv)
 {
-	if (main_compose_sockets(env, IMSG_CFG_SRV, -1, srv, sizeof(*srv))
-	    == -1)
-		fatal("main_compose_sockets IMSG_CFG_SRV");
+	if (main_compose_sockets(env, GOTWEBD_IMSG_CFG_SRV,
+	    -1, srv, sizeof(*srv)) == -1)
+		fatal("main_compose_sockets GOTWEBD_IMSG_CFG_SRV");
 	return 0;
 }
 
@@ -112,9 +112,9 @@ config_setsock(struct gotwebd *env, struct socket *soc
 	if (sockets_privinit(env, sock) == -1)
 		return -1;
 
-	if (main_compose_sockets(env, IMSG_CFG_SOCK, sock->fd,
+	if (main_compose_sockets(env, GOTWEBD_IMSG_CFG_SOCK, sock->fd,
 	    &sock->conf, sizeof(sock->conf)) == -1)
-		fatal("main_compose_sockets IMSG_CFG_SOCK");
+		fatal("main_compose_sockets GOTWEBD_IMSG_CFG_SOCK");
 
 	sock->fd = -1;
 	return 0;
@@ -173,8 +173,8 @@ config_setfd(struct gotwebd *env)
 			if (fd == -1)
 				fatal("got_opentemp");
 			if (imsg_compose_event(&env->iev_server[j],
-			    IMSG_CFG_FD, 0, -1, fd, NULL, 0) == -1)
-				fatal("imsg_compose_event IMSG_CFG_FD");
+			    GOTWEBD_IMSG_CFG_FD, 0, -1, fd, NULL, 0) == -1)
+				fatal("imsg_compose_event GOTWEBD_IMSG_CFG_FD");
 
 			if (imsgbuf_flush(&env->iev_server[j].ibuf) == -1)
 				fatal("imsgbuf_flush");
blob - 5d6725709e8735a0482737ccc7db1c9026a33e45
blob + 2b5c5209c8dc42c0657ba83ee32ac955e281524d
--- gotwebd/gotwebd.c
+++ gotwebd/gotwebd.c
@@ -158,7 +158,7 @@ gotwebd_dispatch_sockets(int fd, short event, void *ar
 			break;
 
 		switch (imsg.hdr.type) {
-		case IMSG_CFG_DONE:
+		case GOTWEBD_IMSG_CFG_DONE:
 			gotwebd_configure_done(env);
 			break;
 		default:
@@ -456,8 +456,8 @@ gotwebd_configure(struct gotwebd *env)
 	if (config_setfd(env) == -1)
 		fatalx("%s: send priv_fd error", __func__);
 
-	if (main_compose_sockets(env, IMSG_CFG_DONE, -1, NULL, 0) == -1)
-		fatal("main_compose_sockets IMSG_CFG_DONE");
+	if (main_compose_sockets(env, GOTWEBD_IMSG_CFG_DONE, -1, NULL, 0) == -1)
+		fatal("main_compose_sockets GOTWEBD_IMSG_CFG_DONE");
 
 	return (0);
 }
@@ -472,8 +472,8 @@ gotwebd_configure_done(struct gotwebd *env)
 
 	env->gotwebd_reload--;
 	if (env->gotwebd_reload == 0 &&
-	    main_compose_sockets(env, IMSG_CTL_START, -1, NULL, 0) == -1)
-		fatal("main_compose_sockets IMSG_CTL_START");
+	    main_compose_sockets(env, GOTWEBD_CTL_START, -1, NULL, 0) == -1)
+		fatal("main_compose_sockets GOTWEBD_CTL_START");
 }
 
 void
blob - f6a54900f231bcf8db79e76bbea47944ab3a713a
blob + 7dd491f1a07f53e526bf9e5df13d9e0767649384
--- gotwebd/gotwebd.h
+++ gotwebd/gotwebd.h
@@ -118,11 +118,11 @@ struct got_tree_entry;
 struct got_reflist_head;
 
 enum imsg_type {
-	IMSG_CFG_SRV,
-	IMSG_CFG_SOCK,
-	IMSG_CFG_FD,
-	IMSG_CFG_DONE,
-	IMSG_CTL_START,
+	GOTWEBD_IMSG_CFG_SRV,
+	GOTWEBD_IMSG_CFG_SOCK,
+	GOTWEBD_IMSG_CFG_FD,
+	GOTWEBD_IMSG_CFG_DONE,
+	GOTWEBD_CTL_START,
 };
 
 struct imsgev {
blob - a395d6adaa88c79a67693a290699a888af6b1b95
blob + 9c4f858066e52a609ae73033943e507a94e16303
--- gotwebd/sockets.c
+++ gotwebd/sockets.c
@@ -275,19 +275,19 @@ sockets_dispatch_main(int fd, short event, void *arg)
 			break;
 
 		switch (imsg.hdr.type) {
-		case IMSG_CFG_SRV:
+		case GOTWEBD_IMSG_CFG_SRV:
 			config_getserver(env, &imsg);
 			break;
-		case IMSG_CFG_SOCK:
+		case GOTWEBD_IMSG_CFG_SOCK:
 			config_getsock(env, &imsg);
 			break;
-		case IMSG_CFG_FD:
+		case GOTWEBD_IMSG_CFG_FD:
 			config_getfd(env, &imsg);
 			break;
-		case IMSG_CFG_DONE:
+		case GOTWEBD_IMSG_CFG_DONE:
 			config_getcfg(env, &imsg);
 			break;
-		case IMSG_CTL_START:
+		case GOTWEBD_CTL_START:
 			sockets_launch();
 			break;
 		default: