Be more consistent.

cache_shmlog.c contains stuff for both cache and mgt, so remove the
cache_ prefix.

Rename cache_shmlog.h to common.h and put joint stuff there.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@403 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/Makefile.am b/varnish-cache/bin/varnishd/Makefile.am
index 255fa830ee357cd2fba5ea18564cd2966fd6c743..c26387171cae93ff38ff9e9a1da3d5630c67efae 100644 (file)
--- a/varnish-cache/bin/varnishd/Makefile.am
+++ b/varnish-cache/bin/varnishd/Makefile.am
@@ -26,7 +26,6 @@ varnishd_SOURCES = \
        cache_pass.c \
        cache_pipe.c \
        cache_response.c \
-       cache_shmlog.c \
        cache_vcl.c \
        cache_vrt.c \
        cli_event.c \
@@ -34,6 +33,7 @@ varnishd_SOURCES = \
        hash_classic.c \
        mgt_child.c \
        rfc2616.c \
+       shmlog.c \
        storage_file.c \
        storage_malloc.c \
        tcp.c \

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index bd5086ee7700e981af73e1f81cef8d839a03ca8a..b22a3d464061daf4b935f70f96b11f29a9773d76 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -9,6 +9,7 @@
 #include <event.h>
 
 #include "vcl_returns.h"
+#include "common.h"
 
 #define VCA_ADDRBUFSIZE                64      /* Sizeof ascii network address */
 
@@ -241,7 +242,6 @@ void CacheInitPool(void);
 void DealWithSession(void *arg);
 
 /* cache_shmlog.c */
-#include "cache_shmlog.h"
 
 void VSL_Init(void);
 #ifdef SHMLOGHEAD_MAGIC

diff --git a/varnish-cache/bin/varnishd/cache_shmlog.h b/varnish-cache/bin/varnishd/common.h
similarity index 100%
rename from varnish-cache/bin/varnishd/cache_shmlog.h
rename to varnish-cache/bin/varnishd/common.h

diff --git a/varnish-cache/bin/varnishd/mgt.h b/varnish-cache/bin/varnishd/mgt.h
index ab94bfcdeff70fcebab4d1acd9856f02b7187c4e..263c55819d4e7cdf3a0251ef33f47575e4cb67c9 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt.h
+++ b/varnish-cache/bin/varnishd/mgt.h
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#include "common.h"
+
 extern struct event_base *mgt_eb;
 
 void mgt_child_start(void);
@@ -24,4 +26,3 @@ extern struct stevedore smf_stevedore;
 extern struct hash_slinger hsl_slinger;
 extern struct hash_slinger hcl_slinger;
 
-#include "cache_shmlog.h"

diff --git a/varnish-cache/bin/varnishd/cache_shmlog.c b/varnish-cache/bin/varnishd/shmlog.c
similarity index 100%
rename from varnish-cache/bin/varnishd/cache_shmlog.c
rename to varnish-cache/bin/varnishd/shmlog.c