compilation fixes

diff --git a/Makefile b/Makefile
index d0462d6fc767f5c39cc22c67f1d47414b4fcdb8d..9e7377687ba67605bba184b6320ccad310e23815 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-SUBDIRS=       base adns hbytes crypto
+SUBDIRS=       base adns hbytes cdb crypto
 # dgram tuntap
 
 default: all

diff --git a/cdb/cdb.tct b/cdb/cdb.tct
index d113af977771cf888dc8f05c054c690c70c4d562..29325f19cb339e0ebdd0a7e707f70b0caaea3fe1 100644 (file)
--- a/cdb/cdb.tct
+++ b/cdb/cdb.tct
@@ -106,7 +106,8 @@ Table cdbwr Cdbwr_SubCommand
                db      iddata(&cdbtcl_rwdatabases)
        compact-check 0
                db      iddata(&cdbtcl_rwdatabases)
-       compact-auto 0 # this is the default
+       compact-auto 0
+               # this is the default
                db      iddata(&cdbtcl_rwdatabases)
        compact-explicit 0
                db      iddata(&cdbtcl_rwdatabases)

diff --git a/cdb/writeable.c b/cdb/writeable.c
index 0334a45fea0f049c29de372942bfebda07a32bec..3c718d83fd813f63e26645839cfba0f02e0bf1a5 100644 (file)
--- a/cdb/writeable.c
+++ b/cdb/writeable.c
@@ -63,13 +63,16 @@ static HashValue *htv_prep(int len) {
   HashValue *hd;
   hd= TALLOC((hd->data - (Byte*)hd) + len);
   hd->len= len;
+  return hd;
 }  
 static Byte *htv_fillptr(HashValue *hd) {
   return hd->data;
 }
+#if 0
 static void htv_fill(HashValue *hd, const Byte *data) {
   memcpy(hd->data, data, hd->len);
 }
+#endif
 
 static void ht_setup(HashTable *ht) {
   Tcl_InitHashTable(&ht->t, TCL_STRING_KEYS);