[master] b4d0866 Rearrange function order

Poul-Henning Kamp phk at FreeBSD.org
Tue Feb 10 16:18:15 CET 2015


commit b4d086600d110e8bfbaded421c98e476e7285480
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Feb 10 10:55:09 2015 +0000

    Rearrange function order

diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index 24fe666..62a03d5 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -83,6 +83,58 @@ static const char * const builtin_vcl =
 #include "builtin_vcl.h"
     ""	;
 
+/*--------------------------------------------------------------------*/
+
+static struct vclprog *
+mgt_vcc_add(const char *name, char *file)
+{
+	struct vclprog *vp;
+
+	vp = calloc(sizeof *vp, 1);
+	XXXAN(vp);
+	vp->name = strdup(name);
+	XXXAN(vp->name);
+	vp->fname = file;
+	VTAILQ_INSERT_TAIL(&vclhead, vp, list);
+	return (vp);
+}
+
+static void
+mgt_vcc_del(struct vclprog *vp)
+{
+	VTAILQ_REMOVE(&vclhead, vp, list);
+	printf("unlink %s\n", vp->fname);
+	XXXAZ(unlink(vp->fname));
+	free(vp->fname);
+	free(vp->name);
+	free(vp);
+}
+
+static struct vclprog *
+mgt_vcc_byname(const char *name)
+{
+	struct vclprog *vp;
+
+	VTAILQ_FOREACH(vp, &vclhead, list)
+		if (!strcmp(name, vp->name))
+			return (vp);
+	return (NULL);
+}
+
+
+static int
+mgt_vcc_delbyname(const char *name)
+{
+	struct vclprog *vp;
+
+	vp = mgt_vcc_byname(name);
+	if (vp != NULL) {
+		mgt_vcc_del(vp);
+		return (0);
+	}
+	return (1);
+}
+
 /*--------------------------------------------------------------------
  * Prepare the compiler command line
  */
@@ -332,58 +384,6 @@ mgt_VccCompile(struct vsb **sb, const char *vclname, const char *vclsrc,
 
 /*--------------------------------------------------------------------*/
 
-static struct vclprog *
-mgt_vcc_add(const char *name, char *file)
-{
-	struct vclprog *vp;
-
-	vp = calloc(sizeof *vp, 1);
-	XXXAN(vp);
-	vp->name = strdup(name);
-	XXXAN(vp->name);
-	vp->fname = file;
-	VTAILQ_INSERT_TAIL(&vclhead, vp, list);
-	return (vp);
-}
-
-static void
-mgt_vcc_del(struct vclprog *vp)
-{
-	VTAILQ_REMOVE(&vclhead, vp, list);
-	printf("unlink %s\n", vp->fname);
-	XXXAZ(unlink(vp->fname));
-	free(vp->fname);
-	free(vp->name);
-	free(vp);
-}
-
-static struct vclprog *
-mgt_vcc_byname(const char *name)
-{
-	struct vclprog *vp;
-
-	VTAILQ_FOREACH(vp, &vclhead, list)
-		if (!strcmp(name, vp->name))
-			return (vp);
-	return (NULL);
-}
-
-
-static int
-mgt_vcc_delbyname(const char *name)
-{
-	struct vclprog *vp;
-
-	vp = mgt_vcc_byname(name);
-	if (vp != NULL) {
-		mgt_vcc_del(vp);
-		return (0);
-	}
-	return (1);
-}
-
-/*--------------------------------------------------------------------*/
-
 unsigned
 mgt_vcc_default(const char *b_arg, const char *f_arg, char *vcl, int C_flag)
 {



More information about the varnish-commit mailing list