[master] e1d2d67 Namespace cleanup: base64_* -> VB64_*

[Poul-Henning Kamp]

commit e1d2d67c9fc94d288d2851c987b59f9016375439
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 31 08:14:23 2011 +0000

    Namespace cleanup:  base64_* -> VB64_*

diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 26279ff..dc2d927 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -608,11 +608,11 @@ h_ncsa(void *priv, enum vsl_tag tag, unsigned fd,
 				char *rubuf;
 				size_t rulen;
 
-				base64_init();
+				VB64_init();
 				rulen = ((strlen(lp->df_u) + 3) * 4) / 3;
 				rubuf = malloc(rulen);
 				assert(rubuf != NULL);
-				base64_decode(rubuf, rulen, lp->df_u);
+				VB64_decode(rubuf, rulen, lp->df_u);
 				q = strchr(rubuf, ':');
 				if (q != NULL)
 					*q = '\0';
diff --git a/include/varnishapi.h b/include/varnishapi.h
index 230bdbb..dbb3931 100644
--- a/include/varnishapi.h
+++ b/include/varnishapi.h
@@ -264,7 +264,7 @@ extern const char *VSL_tags[256];
 
 
 /* base64.c */
-void base64_init(void);
-int base64_decode(char *d, unsigned dlen, const char *s);
+void VB64_init(void);
+int VB64_decode(char *d, unsigned dlen, const char *s);
 
 #endif
diff --git a/lib/libvarnishapi/base64.c b/lib/libvarnishapi/base64.c
index f55199d..4ff88ce 100644
--- a/lib/libvarnishapi/base64.c
+++ b/lib/libvarnishapi/base64.c
@@ -15,7 +15,7 @@ static const char b64[] =
 static char i64[256];
 
 void
-base64_init(void)
+VB64_init(void)
 {
 	int i;
 	const char *p;
@@ -28,7 +28,7 @@ base64_init(void)
 }
 
 int
-base64_decode(char *d, unsigned dlen, const char *s)
+VB64_decode(char *d, unsigned dlen, const char *s)
 {
 	unsigned u, v, l;
 	int i;
@@ -78,9 +78,9 @@ main(int argc, char **argv)
 	(void)argc;
 	(void)argv;
 
-	base64_init();
+	VB64_init();
 	l = sizeof buf;
-	base64_decode(buf, &l, test1);
+	VB64_decode(buf, &l, test1);
 	printf("%s\n", buf);
 	return (0);
 }