Mailing List Archive

r3441 - trunk/varnish-cache/bin/varnishd
Author: phk
Date: 2008-11-25 14:42:40 +0100 (Tue, 25 Nov 2008)
New Revision: 3441

Added:
trunk/varnish-cache/bin/varnishd/param.h
Modified:
trunk/varnish-cache/bin/varnishd/mgt_param.c
Log:
Move parameter declaration into a .h file of its own.



Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c 2008-11-25 13:39:15 UTC (rev 3440)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c 2008-11-25 13:42:40 UTC (rev 3441)
@@ -50,35 +50,15 @@
#include "mgt_cli.h"

#include "heritage.h"
+#include "param.h"

#include "vss.h"

#define MAGIC_INIT_STRING "\001"
-
-struct parspec;
-static int margin;
-
-typedef void tweak_t(struct cli *, const struct parspec *, const char *arg);
-
-struct parspec {
- const char *name;
- tweak_t *func;
- volatile void *priv;
- unsigned umin;
- unsigned umax;
- const char *descr;
- int flags;
-#define DELAYED_EFFECT 1
-#define EXPERIMENTAL 2
-#define MUST_RESTART 4
-#define MUST_RELOAD 8
- const char *def;
- const char *units;
-};
-
static struct params master;
static int nparspec;
static struct parspec const ** parspec;
+static int margin;

/*--------------------------------------------------------------------*/


Added: trunk/varnish-cache/bin/varnishd/param.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/param.h (rev 0)
+++ trunk/varnish-cache/bin/varnishd/param.h 2008-11-25 13:42:40 UTC (rev 3441)
@@ -0,0 +1,50 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2008 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: mgt_param.c 3440 2008-11-25 13:39:15Z phk $
+ */
+
+struct parspec;
+
+typedef void tweak_t(struct cli *, const struct parspec *, const char *arg);
+
+struct parspec {
+ const char *name;
+ tweak_t *func;
+ volatile void *priv;
+ unsigned umin;
+ unsigned umax;
+ const char *descr;
+ int flags;
+#define DELAYED_EFFECT 1
+#define EXPERIMENTAL 2
+#define MUST_RESTART 4
+#define MUST_RELOAD 8
+ const char *def;
+ const char *units;
+};