[master] 96c3600 Add base64 prototypes too

Tollef Fog Heen tfheen at varnish-cache.org
Mon Jun 6 11:01:19 CEST 2011


commit 96c3600d9c70fadd6919b7bd7c046f5d202df5f1
Author: Tollef Fog Heen <tfheen at err.no>
Date:   Mon Jun 6 11:00:52 2011 +0200

    Add base64 prototypes too

diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index f7f4d56..e1baa79 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -9,6 +9,7 @@ dist_man_MANS = varnishncsa.1
 varnishncsa_SOURCES = \
 	varnishncsa.c \
 	base64.c \
+	base64.h \
 	$(top_builddir)/lib/libvarnish/flopen.c \
 	$(top_builddir)/lib/libvarnish/vpf.c
 
diff --git a/bin/varnishncsa/base64.c b/bin/varnishncsa/base64.c
index 4ff88ce..23dae14 100644
--- a/bin/varnishncsa/base64.c
+++ b/bin/varnishncsa/base64.c
@@ -8,6 +8,7 @@
 
 #include <sys/types.h>
 #include "varnishapi.h"
+#include "base64.h"
 
 static const char b64[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/bin/varnishncsa/base64.h b/bin/varnishncsa/base64.h
new file mode 100644
index 0000000..31b166c
--- /dev/null
+++ b/bin/varnishncsa/base64.h
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-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.
+ *
+ */
+
+void VB64_init(void);
+int VB64_decode(char *d, unsigned dlen, const char *s);
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index d53ddbc..89c1ee1 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -77,6 +77,7 @@
 #include "vsl.h"
 #include "vre.h"
 #include "varnishapi.h"
+#include "base64.h"
 
 static volatile sig_atomic_t reopen;
 



More information about the varnish-commit mailing list