[master] 44a623a Rename cli_serve.h to vcli_serve.h

Poul-Henning Kamp phk at varnish-cache.org
Mon Oct 10 13:14:44 CEST 2011


commit 44a623a6c77bdbec1a0b6154af3c2665bda6db0a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Oct 10 11:14:25 2011 +0000

    Rename cli_serve.h to vcli_serve.h

diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index e519b01..818b9ab 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -44,11 +44,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "vcli.h"
-#include "cli_common.h"
 #include "vapi/vsl.h"
 #include "vapi/vsm.h"
 #include "vas.h"
+#include "vcli.h"
 #include "vss.h"
 
 #ifdef HAVE_LIBEDIT
diff --git a/bin/varnishd/cache_cli.c b/bin/varnishd/cache_cli.c
index f66075e..a278e84 100644
--- a/bin/varnishd/cache_cli.c
+++ b/bin/varnishd/cache_cli.c
@@ -43,8 +43,8 @@
 #include "vcli.h"
 #include "cli_common.h"
 #include "cli_priv.h"
-#include "cli_serve.h"
 #include "hash_slinger.h"		// objhead
+#include "vcli_serve.h"
 
 pthread_t		cli_thread;
 static struct lock	cli_mtx;
diff --git a/bin/varnishd/mgt_cli.c b/bin/varnishd/mgt_cli.c
index 4a7925a..f1bb2d8 100644
--- a/bin/varnishd/mgt_cli.c
+++ b/bin/varnishd/mgt_cli.c
@@ -47,9 +47,9 @@
 #include "vcli.h"
 #include "cli_common.h"
 #include "cli_priv.h"
-#include "cli_serve.h"
 #include "heritage.h"
 #include "mgt_cli.h"
+#include "vcli_serve.h"
 #include "vev.h"
 #include "vlu.h"
 #include "vss.h"
diff --git a/bin/varnishd/storage_persistent.c b/bin/varnishd/storage_persistent.c
index 18b96c3..d3ab02e 100644
--- a/bin/varnishd/storage_persistent.c
+++ b/bin/varnishd/storage_persistent.c
@@ -47,12 +47,12 @@
 
 #include "cli_priv.h"
 #include "hash_slinger.h"
-#include "persistent.h"
 #include "stevedore.h"
 #include "vcli.h"
 #include "vend.h"
 #include "vsha256.h"
 
+#include "persistent.h"
 #include "storage_persistent.h"
 
 /*--------------------------------------------------------------------*/
diff --git a/include/Makefile.am b/include/Makefile.am
index 935a6f9..9c92b1e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -28,7 +28,6 @@ nobase_noinst_HEADERS = \
 	binary_heap.h \
 	cli_common.h \
 	cli_priv.h \
-	cli_serve.h \
 	compat/daemon.h \
 	compat/execinfo.h \
 	compat/srandomdev.h \
@@ -40,6 +39,7 @@ nobase_noinst_HEADERS = \
 	vav.h \
 	vbm.h \
 	vcl.h \
+	vcli_serve.h \
 	vcs_version.h \
 	vcs.h \
 	vct.h \
diff --git a/include/cli_serve.h b/include/cli_serve.h
deleted file mode 100644
index 0ac29f8..0000000
--- a/include/cli_serve.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2010-2011 Varnish Software 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.
- *
- */
-
-struct VCLS;
-typedef void cls_cb_f(void *priv);
-typedef void cls_cbc_f(const struct cli*);
-struct VCLS *VCLS_New(cls_cbc_f *before, cls_cbc_f *after, unsigned maxlen);
-struct cli *VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc,
-    void *priv);
-int VCLS_AddFunc(struct VCLS *cs, unsigned auth, struct cli_proto *clp);
-int VCLS_Poll(struct VCLS *cs, int timeout);
-int VCLS_PollFd(struct VCLS *cs, int fd, int timeout);
-void VCLS_Destroy(struct VCLS **);
-
-/* From libvarnish/cli.c */
-cli_func_t	VCLS_func_close;
-cli_func_t	VCLS_func_help;
-cli_func_t	VCLS_func_ping;
-
diff --git a/include/flopen.h b/include/flopen.h
index e5b6030..9833efa 100644
--- a/include/flopen.h
+++ b/include/flopen.h
@@ -31,8 +31,6 @@
 #ifndef FLOPEN_H_INCLUDED
 #define FLOPEN_H_INCLUDED
 
-#include <sys/types.h>
-
 int flopen(const char *, int, ...);
 int fltest(int fd, pid_t *pid);
 
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
new file mode 100644
index 0000000..0ac29f8
--- /dev/null
+++ b/include/vcli_serve.h
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 2010-2011 Varnish Software 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.
+ *
+ */
+
+struct VCLS;
+typedef void cls_cb_f(void *priv);
+typedef void cls_cbc_f(const struct cli*);
+struct VCLS *VCLS_New(cls_cbc_f *before, cls_cbc_f *after, unsigned maxlen);
+struct cli *VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc,
+    void *priv);
+int VCLS_AddFunc(struct VCLS *cs, unsigned auth, struct cli_proto *clp);
+int VCLS_Poll(struct VCLS *cs, int timeout);
+int VCLS_PollFd(struct VCLS *cs, int fd, int timeout);
+void VCLS_Destroy(struct VCLS **);
+
+/* From libvarnish/cli.c */
+cli_func_t	VCLS_func_close;
+cli_func_t	VCLS_func_help;
+cli_func_t	VCLS_func_ping;
+
diff --git a/lib/libvarnish/cli_serve.c b/lib/libvarnish/cli_serve.c
index 2c3a09c..9a9daed 100644
--- a/lib/libvarnish/cli_serve.c
+++ b/lib/libvarnish/cli_serve.c
@@ -46,8 +46,8 @@
 #include "vcli.h"
 #include "cli_common.h"
 #include "cli_priv.h"
-#include "cli_serve.h"
 #include "vav.h"
+#include "vcli_serve.h"
 #include "vlu.h"
 #include "vqueue.h"
 #include "vsb.h"



More information about the varnish-commit mailing list