Author: adrian.chadd
Date: Tue Apr 21 17:52:36 2009
New Revision: 13975
Modified:
branches/LUSCA_HEAD/libsqstore/store_meta.h
branches/LUSCA_HEAD/libsqstore/store_mgr.h
branches/LUSCA_HEAD/src/squid.h
branches/LUSCA_HEAD/tools/cossdump.c
Log:
migrate the STORE_META_ enum type to the store_meta.h include file.
Modified: branches/LUSCA_HEAD/libsqstore/store_meta.h
==============================================================================
--- branches/LUSCA_HEAD/libsqstore/store_meta.h (original)
+++ branches/LUSCA_HEAD/libsqstore/store_meta.h Tue Apr 21 17:52:36 2009
@@ -2,6 +2,25 @@
#define __LIBSQSTORE_STORE_META_H__
/*
+ * NOTE! We must preserve the order of this list!
+ */
+typedef enum {
+ STORE_META_VOID, /* should not come up */
+ STORE_META_KEY_URL, /* key w/ keytype */
+ STORE_META_KEY_SHA,
+ STORE_META_KEY_MD5,
+ STORE_META_URL, /* the url , if not in the header */
+ STORE_META_STD, /* standard metadata */
+ STORE_META_HITMETERING, /* reserved for hit metering */
+ STORE_META_VALID,
+ STORE_META_VARY_HEADERS, /* Stores Vary request headers */
+ STORE_META_STD_LFS, /* standard metadata in lfs format */
+ STORE_META_OBJSIZE, /* object size, if its known */
+ STORE_META_STOREURL, /* the store url, if different to the
normal URL */
+ STORE_META_END
+} store_meta_types;
+
+/*
* For now these aren't used in the application itself; they're
* designed to be used by other bits of code which are manipulating
* store swap entries.
Modified: branches/LUSCA_HEAD/libsqstore/store_mgr.h
==============================================================================
--- branches/LUSCA_HEAD/libsqstore/store_mgr.h (original)
+++ branches/LUSCA_HEAD/libsqstore/store_mgr.h Tue Apr 21 17:52:36 2009
@@ -20,23 +20,4 @@
#define SIZEOF_SQUID_FILE_SZ SIZEOF_SIZE_T
#endif
-/*
- * NOTE! We must preserve the order of this list!
- */
-typedef enum {
- STORE_META_VOID, /* should not come up */
- STORE_META_KEY_URL, /* key w/ keytype */
- STORE_META_KEY_SHA,
- STORE_META_KEY_MD5,
- STORE_META_URL, /* the url , if not in the header */
- STORE_META_STD, /* standard metadata */
- STORE_META_HITMETERING, /* reserved for hit metering */
- STORE_META_VALID,
- STORE_META_VARY_HEADERS, /* Stores Vary request headers */
- STORE_META_STD_LFS, /* standard metadata in lfs format */
- STORE_META_OBJSIZE, /* object size, if its known */
- STORE_META_STOREURL, /* the store url, if different to the
normal URL */
- STORE_META_END
-} store_meta_types;
-
#endif
Modified: branches/LUSCA_HEAD/src/squid.h
==============================================================================
--- branches/LUSCA_HEAD/src/squid.h (original)
+++ branches/LUSCA_HEAD/src/squid.h Tue Apr 21 17:52:36 2009
@@ -444,6 +444,7 @@
#include "../libsqstore/store_key.h"
#include "../libsqstore/store_mgr.h"
+#include "../libsqstore/store_meta.h"
#include "../libsqstore/store_log.h"
#include "defines.h"
Modified: branches/LUSCA_HEAD/tools/cossdump.c
==============================================================================
--- branches/LUSCA_HEAD/tools/cossdump.c (original)
+++ branches/LUSCA_HEAD/tools/cossdump.c Tue Apr 21 17:52:36 2009
@@ -30,6 +30,7 @@
#include "../libsqtlv/tlv.h"
#include "../libsqstore/store_mgr.h"
+#include "../libsqstore/store_meta.h"
#define STRIPESIZE 1048576
#define BLOCKSIZE 1024
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
