Merge r3391: Merge cache_vrt_acl.c into cache_vrt.c

Merge cache_vrt_acl.c into cache_vrt.c, one one-line function is silly
in a source-file.

(All the work is done by vcc generated code now)



git-svn-id: http://www.varnish-cache.org/svn/branches/2.0@3607 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/Makefile.am

@@ -36,7 +36,6 @@ varnishd_SOURCES = \
 	cache_vary.c \
 	cache_vcl.c \
 	cache_vrt.c \
-	cache_vrt_acl.c \
 	cache_vrt_esi.c \
 	cache_vrt_re.c \
 	cache_ws.c \

bin/varnishd/cache_vrt.c

@@ -80,6 +80,14 @@ VRT_count(const struct sess *sp, unsigned u)
 
 /*--------------------------------------------------------------------*/
 
+void
+VRT_acl_log(const struct sess *sp, const char *msg)
+{
+	WSL(sp->wrk, SLT_VCL_acl, sp->fd, msg);
+}
+
+/*--------------------------------------------------------------------*/
+
 static struct http *
 vrt_selecthttp(const struct sess *sp, enum gethdr_e where)
 {

bin/varnishd/cache_vrt_acl.c

-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
- * All rights reserved.
- *
- * Author: Poul-Henning Kamp <phk@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$
- *
- * Runtime support for compiled VCL programs, ACLs
- *
- */
-
-#include "config.h"
-
-#include "shmlog.h"
-#include "vrt.h"
-#include "cache.h"
-
-void
-VRT_acl_log(const struct sess *sp, const char *msg)
-{
-	WSL(sp->wrk, SLT_VCL_acl, sp->fd, msg);
-}