Author: adrian.chadd
Date: Tue Apr 21 02:11:04 2009
New Revision: 13963
Modified:
branches/LUSCA_HEAD/libsqstore/store_mgr.h
branches/LUSCA_HEAD/src/enums.h
branches/LUSCA_HEAD/tools/cossdump.c
Log:
Migrate out the store meta types into libsqstore; convert cossdump.c to use
these.
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 02:11:04 2009
@@ -17,4 +17,23 @@
#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/enums.h
==============================================================================
--- branches/LUSCA_HEAD/src/enums.h (original)
+++ branches/LUSCA_HEAD/src/enums.h Tue Apr 21 02:11:04 2009
@@ -375,25 +375,6 @@
#endif
-/*
- * NOTE! We must preserve the order of this list!
- */
-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
-};
-
enum {
STORE_LOG_CREATE,
STORE_LOG_SWAPIN,
Modified: branches/LUSCA_HEAD/tools/cossdump.c
==============================================================================
--- branches/LUSCA_HEAD/tools/cossdump.c (original)
+++ branches/LUSCA_HEAD/tools/cossdump.c Tue Apr 21 02:11:04 2009
@@ -25,11 +25,15 @@
#include <fcntl.h>
#endif
+#include "../libcore/kb.h"
+#include "../libsqstore/store_mgr.h"
+
#include "../src/defines.h"
/* XXX Needed for stuff in enums.h; remove later! -adrian */
#include "../libhttp/HttpHeaderType.h"
#include "../src/enums.h"
+
struct _tlv;
typedef struct _tlv tlv;
@@ -60,12 +64,10 @@
#endif
#if SIZEOF_INT64_T > SIZEOF_LONG && HAVE_STRTOLL
-typedef int64_t squid_off_t;
#define SIZEOF_SQUID_OFF_T SIZEOF_INT64_T
#define PRINTF_OFF_T PRId64
#define strto_off_t (int64_t)strtoll
#else
-typedef long squid_off_t;
#define SIZEOF_SQUID_OFF_T SIZEOF_LONG
#define PRINTF_OFF_T "ld"
#define strto_off_t strtol
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
