move some new_* functions from parse.y to utils.c

3 files changed, 37 insertions, 37 deletions

diff --git a/gmid.h b/gmid.h
index 8fd974f..af95f1b 100644
--- a/gmid.h
+++ b/gmid.h
@@ -340,9 +340,6 @@ void		 yyerror(const char*, ...);
 void		 parse_conf(const char*);
 void		 print_conf(void);
 int		 cmdline_symset(char *);
-struct vhost	*new_vhost(void);
-struct location	*new_location(void);
-struct proxy	*new_proxy(void);
 
 /* mime.c */
 void		 init_mime(struct mime*);
@@ -421,5 +418,8 @@ void		*xcalloc(size_t, size_t);
 void		 gen_certificate(const char*, const char*, const char*);
 X509_STORE	*load_ca(const char*);
 int		 validate_against_ca(X509_STORE*, const uint8_t*, size_t);
+struct vhost	*new_vhost(void);
+struct location	*new_location(void);
+struct proxy	*new_proxy(void);
 
 #endif
diff --git a/parse.y b/parse.y
index d3de710..2fb53f2 100644
--- a/parse.y
+++ b/parse.y
@@ -1035,40 +1035,6 @@ symget(const char *nam)
 	return NULL;
 }
 
-struct vhost *
-new_vhost(void)
-{
-	struct vhost *h;
-
-	h = xcalloc(1, sizeof(*h));
-	TAILQ_INIT(&h->locations);
-	TAILQ_INIT(&h->params);
-	TAILQ_INIT(&h->aliases);
-	TAILQ_INIT(&h->proxies);
-	return h;
-}
-
-struct location *
-new_location(void)
-{
-	struct location *l;
-
-	l = xcalloc(1, sizeof(*l));
-	l->dirfd = -1;
-	l->fcgi = -1;
-	return l;
-}
-
-struct proxy *
-new_proxy(void)
-{
-	struct proxy *p;
-
-	p = xcalloc(1, sizeof(*p));
-	p->protocols = TLS_PROTOCOLS_DEFAULT;
-	return p;
-}
-
 char *
 ensure_absolute_path(char *path)
 {
diff --git a/utils.c b/utils.c
index ff69a35..794f896 100644
--- a/utils.c
+++ b/utils.c
@@ -241,3 +241,37 @@ end:
 		X509_STORE_CTX_free(ctx);
 	return ret;
 }
+
+struct vhost *
+new_vhost(void)
+{
+	struct vhost *h;
+
+	h = xcalloc(1, sizeof(*h));
+	TAILQ_INIT(&h->locations);
+	TAILQ_INIT(&h->params);
+	TAILQ_INIT(&h->aliases);
+	TAILQ_INIT(&h->proxies);
+	return h;
+}
+
+struct location *
+new_location(void)
+{
+	struct location *l;
+
+	l = xcalloc(1, sizeof(*l));
+	l->dirfd = -1;
+	l->fcgi = -1;
+	return l;
+}
+
+struct proxy *
+new_proxy(void)
+{
+	struct proxy *p;
+
+	p = xcalloc(1, sizeof(*p));
+	p->protocols = TLS_PROTOCOLS_DEFAULT;
+	return p;
+}