Added a couple of FIXME's.

diff --git a/lib/config.h b/lib/config.h
index 833e636231cd3c76e05512ce13737c7802da4c75..9b867f7b465bdbf82c4ee9daca9315a21702ed31 100644 (file)
--- a/lib/config.h
+++ b/lib/config.h
@@ -9,10 +9,11 @@
 
 /* Version */
 
-#define SHER_VER "1.3"
+#define SHER_VER "2.0-alpha"
 
 /* Features */
 
+/* FIXME: Prune */
 #define SHERLOCK_CONFIG_REF_WEIGHTS    /* Weighed references */
 #define SHERLOCK_CONFIG_LARGE_DB       /* Support for DB files >4GB */
 #define SHERLOCK_CONFIG_LFS            /* Large files on 32-bit systems */
@@ -69,11 +70,13 @@ typedef s32 sh_foff_t;
 
 #undef inline
 #define NONRET __attribute__((noreturn))
+#define UNUSED __attribute__((unused))
 
 #else
 
 #define inline
 #define NONRET
+#define UNUSED
 
 #endif
 

diff --git a/lib/lib.h b/lib/lib.h
index 48d49ec9a9aa532fd065362a945f6bc0d3dca926..57e8ef82a18184ccc2b4eb4940772677063f7653 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -29,6 +29,7 @@ void open_temp(struct tempfile *, byte *);
 void delete_temp(struct tempfile *);
 u32 temprand(uns);
 
+/* FIXME: Remove? */
 #define TF_GENERIC "t"
 #define TF_QUEUE_CONTROL "c"
 #define TF_QUEUE_DATA "d"
@@ -36,26 +37,10 @@ u32 temprand(uns);
 #define TF_TRANSFORM "s"
 #define TF_OBJECT "o"
 
-/* Config Files */
-
-struct cfitem {
-  byte *name;
-  int type;
-  void *var;
-};
-
-#define CI_STOP 0
-#define CI_INT 1
-#define CI_STRING 2
-#define CI_FUNCTION 3
-
-typedef byte *(*ci_func)(struct cfitem *, byte *);
-
-void cf_read(byte *, struct cfitem *);
-int cf_read_err(byte *, struct cfitem *); /* Read with possible error, 1 = succeeded */
-
 /* Logging */
 
+/* FIXME: Define new logging mechanism? */
+
 #define L_DEBUG "<0>"
 #define L_INFO "<2>"
 #define L_WARN "<4>"
@@ -81,20 +66,16 @@ byte *stralloc(byte *);
 
 /* Content-Type pattern matching and filters */
 
-struct ct_filter;
-
 int match_ct_patt(byte *, byte *);
 
-struct ct_filter *new_ct_filter(void);
-byte *add_ct_filter(struct ct_filter *, byte *);
-int match_ct_filter(struct ct_filter *, byte *);
-
 /* Binary log */
 
 int log2(u32);
 
 /* obj.c */
 
+/* FIXME: What to do with this? */
+
 struct odes {                          /* Object description */
   struct oattr *attrs;
   struct mempool *pool;
@@ -124,6 +105,8 @@ struct oattr *prepend_attr(struct odes *, uns, byte *);
 
 /* oname.c */
 
+/* FIXME: Kill? */
+
 #define OID_MIN 0x10000                /* Values less than this have special meaning */
 
 oid_t new_oid(uns);
@@ -166,10 +149,6 @@ void rx_free(regex *r);
 int rx_match(regex *r, byte *s);
 int rx_subst(regex *r, byte *by, byte *src, byte *dest, uns destlen);
 
-/* objwalk.c */
-
-void scan_obj_tree(byte *, void (*)(oid_t, byte *));
-
 /* random.c */
 
 uns random_max(uns);

diff --git a/lib/lists.h b/lib/lists.h
index ce03656b10bc7eedc00d9ef5586ad9b0b1a0e34d..48b7de99c0dd01c58d2ef15125c1bd38b8c269a3 100644 (file)
--- a/lib/lists.h
+++ b/lib/lists.h
@@ -38,7 +38,7 @@ void init_list(list *);
 void insert_node(node *, node *);
 
 #if !defined(_SHERLOCK_LISTS_C) && defined(__GNUC__)
-#define LIST_INLINE static inline
+#define LIST_INLINE extern inline
 #include "lib/lists.c"
 #undef LIST_INLINE
 #else