[master] 0bf86e4 Rename argv.h to vav.h

[Poul-Henning Kamp]

commit 0bf86e4bb63ba19b39c4448f6c8bcbc802e2ba38
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 31 08:00:48 2011 +0000

    Rename argv.h to vav.h

diff --git a/include/Makefile.am b/include/Makefile.am
index 29ddec3..6835d0f 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -10,7 +10,6 @@ pkginclude_HEADERS = \
 	varnishapi.h
 
 nobase_noinst_HEADERS = \
-	argv.h \
 	ban_vars.h \
 	binary_heap.h \
 	cli.h \
@@ -28,6 +27,7 @@ nobase_noinst_HEADERS = \
 	miniobj.h \
 	persistent.h \
 	vas.h \
+	vav.h \
 	vsha256.h \
 	vqueue.h \
 	vpf.h \
diff --git a/include/argv.h b/include/argv.h
deleted file mode 100644
index 4a7e809..0000000
--- a/include/argv.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2009 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.
- *
- */
-
-void VAV_Free(char **argv);
-char **VAV_Parse(const char *s, int *argc, int flag);
-char *VAV_BackSlashDecode(const char *s, const char *e);
-int VAV_BackSlash(const char *s, char *res);
-#define ARGV_COMMENT	(1 << 0)
-#define ARGV_COMMA	(1 << 1)
-#define ARGV_NOESC	(1 << 2)
diff --git a/include/libvarnish.h b/include/libvarnish.h
index 039e373..ee20a54 100644
--- a/include/libvarnish.h
+++ b/include/libvarnish.h
@@ -41,7 +41,7 @@
 
 struct vsb;
 
-#include "argv.h"
+#include "vav.h"
 
 /* from libvarnish/num.c */
 const char *str2bytes(const char *p, uintmax_t *r, uintmax_t rel);
diff --git a/include/vav.h b/include/vav.h
new file mode 100644
index 0000000..4a7e809
--- /dev/null
+++ b/include/vav.h
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2009 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.
+ *
+ */
+
+void VAV_Free(char **argv);
+char **VAV_Parse(const char *s, int *argc, int flag);
+char *VAV_BackSlashDecode(const char *s, const char *e);
+int VAV_BackSlash(const char *s, char *res);
+#define ARGV_COMMENT	(1 << 0)
+#define ARGV_COMMA	(1 << 1)
+#define ARGV_NOESC	(1 << 2)
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 1187767..2902e13 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -35,9 +35,9 @@
 #include <stdlib.h>
 
 #include "vas.h"
+#include "vav.h"
 #include "vsm.h"
 #include "vsc.h"
-#include "argv.h"
 #include "vqueue.h"
 #include "miniobj.h"
 #include "varnishapi.h"