INN commit: branches/2.5 (10 files)
INN Commit
rra at isc.org
Wed Aug 5 21:01:48 UTC 2009
Date: Wednesday, August 5, 2009 @ 14:01:48
Author: iulius
Revision: 8556
Move dbz.h into the public inn directory (it is for instance
used by suck).
However, it should be noted that if another history file format
is implemented in the future, it might cause problems to
external programs.
Added:
branches/2.5/include/inn/dbz.h
(from rev 8531, branches/2.5/include/dbz.h)
Modified:
branches/2.5/MANIFEST
branches/2.5/doc/man/dbz.3
branches/2.5/expire/Makefile
branches/2.5/expire/makedbz.c
branches/2.5/history/Makefile
branches/2.5/history/hisv6/hisv6.c
branches/2.5/lib/Makefile
branches/2.5/lib/dbz.c
Deleted:
branches/2.5/include/dbz.h
-----------------------+
MANIFEST | 2 -
doc/man/dbz.3 | 2 -
expire/Makefile | 2 -
expire/makedbz.c | 2 -
history/Makefile | 2 -
history/hisv6/hisv6.c | 2 -
include/dbz.h | 76 ------------------------------------------------
include/inn/dbz.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++
lib/Makefile | 2 -
lib/dbz.c | 2 -
10 files changed, 84 insertions(+), 84 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2009-07-30 19:13:47 UTC (rev 8555)
+++ MANIFEST 2009-08-05 21:01:48 UTC (rev 8556)
@@ -359,10 +359,10 @@
include/clibrary.h C library portability
include/conffile.h Header file for reading *.conf files
include/config.h.in Template configuration data
-include/dbz.h Header file for DBZ
include/inn Installed header files (Directory)
include/inn/buffer.h Header file for reusable counted buffers
include/inn/confparse.h Header file for configuration parser
+include/inn/dbz.h Header file for DBZ
include/inn/defines.h Portable defs for installed headers
include/inn/dispatch.h Header file for command dispatching
include/inn/hashtab.h Header file for generic hash table
Modified: doc/man/dbz.3
===================================================================
--- doc/man/dbz.3 2009-07-30 19:13:47 UTC (rev 8555)
+++ doc/man/dbz.3 2009-08-05 21:01:48 UTC (rev 8556)
@@ -4,7 +4,7 @@
dbzinit, dbzfresh, dbzagain, dbzclose, dbzexists, dbzfetch, dbzstore, dbzsync, dbzsize, dbzgetoptions, dbzsetoptions, dbzdebug \- database routines
.SH SYNOPSIS
.nf
-.B #include <dbz.h>
+.B #include <inn/dbz.h>
.PP
.B "bool dbzinit(const char *base)"
.PP
Modified: expire/Makefile
===================================================================
--- expire/Makefile 2009-07-30 19:13:47 UTC (rev 8555)
+++ expire/Makefile 2009-08-05 21:01:48 UTC (rev 8556)
@@ -122,7 +122,7 @@
../include/inn/options.h
makedbz.o: makedbz.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
- ../include/config.h ../include/dbz.h ../include/inn/libinn.h \
+ ../include/config.h ../include/inn/dbz.h ../include/inn/libinn.h \
../include/inn/defines.h ../include/inn/innconf.h \
../include/inn/libinn.h ../include/inn/messages.h \
../include/inn/newsuser.h ../include/config.h ../include/clibrary.h \
Modified: expire/makedbz.c
===================================================================
--- expire/makedbz.c 2009-07-30 19:13:47 UTC (rev 8555)
+++ expire/makedbz.c 2009-08-05 21:01:48 UTC (rev 8556)
@@ -8,7 +8,7 @@
#include <errno.h>
#include <syslog.h>
-#include "dbz.h"
+#include "inn/dbz.h"
#include "inn/innconf.h"
#include "inn/libinn.h"
#include "inn/messages.h"
Modified: history/Makefile
===================================================================
--- history/Makefile 2009-07-30 19:13:47 UTC (rev 8555)
+++ history/Makefile 2009-08-05 21:01:48 UTC (rev 8556)
@@ -108,6 +108,6 @@
../include/config.h hisinterface.h ../include/config.h hisv6/hisv6.h \
hisv6/hisv6-private.h ../include/inn/history.h ../include/inn/defines.h \
../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/libinn.h ../include/dbz.h ../include/inn/libinn.h \
+ ../include/inn/libinn.h ../include/inn/dbz.h ../include/inn/libinn.h \
../include/inn/innconf.h ../include/inn/timer.h ../include/inn/qio.h \
../include/inn/sequence.h ../include/inn/inndcomm.h
Modified: history/hisv6/hisv6.c
===================================================================
--- history/hisv6/hisv6.c 2009-07-30 19:13:47 UTC (rev 8555)
+++ history/hisv6/hisv6.c 2009-08-05 21:01:48 UTC (rev 8556)
@@ -45,7 +45,7 @@
#include "hisinterface.h"
#include "hisv6.h"
#include "hisv6-private.h"
-#include "dbz.h"
+#include "inn/dbz.h"
#include "inn/innconf.h"
#include "inn/timer.h"
#include "inn/qio.h"
Deleted: include/dbz.h
===================================================================
--- include/dbz.h 2009-07-30 19:13:47 UTC (rev 8555)
+++ include/dbz.h 2009-08-05 21:01:48 UTC (rev 8556)
@@ -1,76 +0,0 @@
-#ifndef __DBZ_H__
-#define __DBZ_H__
-
-/* Need the definition of HASH. */
-#include "inn/libinn.h"
-
-BEGIN_DECLS
-
-/* This is the number of bytes of the md5 to actually store in
- * the .pag file. This number directly effects the collision
- * rate and memory usage. You can probably set this number as
- * low as 5 w/o problems and some sites may want to set it as
- * high as 8. Anything higher than that is probably not useful.
- * Note at the internal hash size isn't the only factor that
- * effects collision rate. The table index is used as an implicit
- * part of the hash value stored also.
- */
-#ifdef DO_TAGGED_HASH
-#define DBZMAXKEY 255
-#define DBZ_INTERNAL_HASH_SIZE 4
-#else
-#define DBZ_INTERNAL_HASH_SIZE 6
-#endif
-
-typedef enum {DBZSTORE_OK, DBZSTORE_EXISTS, DBZSTORE_ERROR} DBZSTORE_RESULT;
-typedef enum {INCORE_NO, INCORE_MEM, INCORE_MMAP} dbz_incore_val;
-
-typedef struct {
- /* Whether to write to the filesystem in addition to updating the incore
- copy. This will replace a single large write to disk when dbzsync is
- called. */
- bool writethrough;
- /* Whether to do hash lookups from disk, memory or a mmap'ed file */
- dbz_incore_val pag_incore;
- dbz_incore_val exists_incore;
- /* Whether dbzstore should update the database async or sync. This
- is only applicable if you're not mmaping the database */
- bool nonblock;
-} dbzoptions;
-
-#ifdef __GNUC__
-#define PACKED __attribute__ ((packed))
-#else
-#if !defined(PACKED)
-#define PACKED
-#endif
-#endif
-
-#if !defined(lint) && (defined(__SUNPRO_C) || defined(_nec_ews))
-#pragma pack(1)
-#endif /* nor lint, nor __SUNPRO_C, nor sgi, nor _nec_ews */
-typedef struct {
- char hash[DBZ_INTERNAL_HASH_SIZE];
-} PACKED erec;
-#if !defined(lint) && (defined(__SUNPRO_C) || defined(_nec_ews))
-#pragma pack()
-#endif /* nor lint, nor__SUNPRO_C, nor _nec_ews */
-
-/* standard dbm functions */
-extern bool dbzinit(const char *name);
-extern bool dbzclose(void);
-
-/* new stuff for dbz */
-extern bool dbzfresh(const char *name, off_t size);
-extern bool dbzagain(const char *name, const char *oldname);
-extern bool dbzexists(const HASH key);
-extern bool dbzfetch(const HASH key, off_t *value);
-extern DBZSTORE_RESULT dbzstore(const HASH key, off_t data);
-extern bool dbzsync(void);
-extern long dbzsize(off_t contents);
-extern void dbzsetoptions(const dbzoptions options);
-extern void dbzgetoptions(dbzoptions *options);
-
-END_DECLS
-
-#endif /* __DBZ_H__ */
Copied: branches/2.5/include/inn/dbz.h (from rev 8531, branches/2.5/include/dbz.h)
===================================================================
--- include/inn/dbz.h (rev 0)
+++ include/inn/dbz.h 2009-08-05 21:01:48 UTC (rev 8556)
@@ -0,0 +1,76 @@
+#ifndef __DBZ_H__
+#define __DBZ_H__
+
+/* Need the definition of HASH. */
+#include "inn/libinn.h"
+
+BEGIN_DECLS
+
+/* This is the number of bytes of the md5 to actually store in
+ * the .pag file. This number directly effects the collision
+ * rate and memory usage. You can probably set this number as
+ * low as 5 w/o problems and some sites may want to set it as
+ * high as 8. Anything higher than that is probably not useful.
+ * Note at the internal hash size isn't the only factor that
+ * effects collision rate. The table index is used as an implicit
+ * part of the hash value stored also.
+ */
+#ifdef DO_TAGGED_HASH
+#define DBZMAXKEY 255
+#define DBZ_INTERNAL_HASH_SIZE 4
+#else
+#define DBZ_INTERNAL_HASH_SIZE 6
+#endif
+
+typedef enum {DBZSTORE_OK, DBZSTORE_EXISTS, DBZSTORE_ERROR} DBZSTORE_RESULT;
+typedef enum {INCORE_NO, INCORE_MEM, INCORE_MMAP} dbz_incore_val;
+
+typedef struct {
+ /* Whether to write to the filesystem in addition to updating the incore
+ copy. This will replace a single large write to disk when dbzsync is
+ called. */
+ bool writethrough;
+ /* Whether to do hash lookups from disk, memory or a mmap'ed file */
+ dbz_incore_val pag_incore;
+ dbz_incore_val exists_incore;
+ /* Whether dbzstore should update the database async or sync. This
+ is only applicable if you're not mmaping the database */
+ bool nonblock;
+} dbzoptions;
+
+#ifdef __GNUC__
+#define PACKED __attribute__ ((packed))
+#else
+#if !defined(PACKED)
+#define PACKED
+#endif
+#endif
+
+#if !defined(lint) && (defined(__SUNPRO_C) || defined(_nec_ews))
+#pragma pack(1)
+#endif /* nor lint, nor __SUNPRO_C, nor sgi, nor _nec_ews */
+typedef struct {
+ char hash[DBZ_INTERNAL_HASH_SIZE];
+} PACKED erec;
+#if !defined(lint) && (defined(__SUNPRO_C) || defined(_nec_ews))
+#pragma pack()
+#endif /* nor lint, nor__SUNPRO_C, nor _nec_ews */
+
+/* standard dbm functions */
+extern bool dbzinit(const char *name);
+extern bool dbzclose(void);
+
+/* new stuff for dbz */
+extern bool dbzfresh(const char *name, off_t size);
+extern bool dbzagain(const char *name, const char *oldname);
+extern bool dbzexists(const HASH key);
+extern bool dbzfetch(const HASH key, off_t *value);
+extern DBZSTORE_RESULT dbzstore(const HASH key, off_t data);
+extern bool dbzsync(void);
+extern long dbzsize(off_t contents);
+extern void dbzsetoptions(const dbzoptions options);
+extern void dbzgetoptions(dbzoptions *options);
+
+END_DECLS
+
+#endif /* __DBZ_H__ */
Modified: lib/Makefile
===================================================================
--- lib/Makefile 2009-07-30 19:13:47 UTC (rev 8555)
+++ lib/Makefile 2009-08-05 21:01:48 UTC (rev 8556)
@@ -130,7 +130,7 @@
dbz.o: dbz.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/options.h ../include/clibrary.h \
../include/config.h ../include/portable/mmap.h ../include/config.h \
- ../include/dbz.h ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/inn/dbz.h ../include/inn/libinn.h ../include/inn/defines.h \
../include/inn/messages.h ../include/inn/innconf.h \
../include/inn/mmap.h ../include/inn/libinn.h
defdist.o: defdist.c ../include/config.h ../include/inn/defines.h \
Modified: lib/dbz.c
===================================================================
--- lib/dbz.c 2009-07-30 19:13:47 UTC (rev 8555)
+++ lib/dbz.c 2009-08-05 21:01:48 UTC (rev 8556)
@@ -77,7 +77,7 @@
#include <sys/stat.h>
#include <sys/time.h>
-#include "dbz.h"
+#include "inn/dbz.h"
#include "inn/messages.h"
#include "inn/innconf.h"
#include "inn/mmap.h"
More information about the inn-committers
mailing list