Replaced obuck_fetch_end() by bclose() (which is a nop as obuck_fetch_end was :) ).

[libucw.git] / lib / lib.h

diff --git a/lib/lib.h b/lib/lib.h
index dea7c10c8929fa7fe923d24f69bbb78d12204e0a..a7cf04170a071c9c4d5df8fb4498480f6f7fe4ee 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -1,7 +1,10 @@
 /*
  *     Sherlock Library -- Miscellaneous Functions
  *
 /*
  *     Sherlock Library -- Miscellaneous Functions
  *

- *     (c) 1997--2001 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2003 Martin Mares <mj@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.

  */
 
 /*
  */
 
 /*


@@ -24,6 +27,7 @@
 #define OFFSETOF(s, i) ((unsigned int)&((s *)0)->i)
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
 #define ALIGN(s, a) (((s)+a-1)&~(a-1))
 #define OFFSETOF(s, i) ((unsigned int)&((s *)0)->i)
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))
 #define ALIGN(s, a) (((s)+a-1)&~(a-1))

+#define UNALIGNED_PART(ptr, type) (((long) (ptr)) % sizeof(type))

 
 /* Some other macros */
 
 
 /* Some other macros */
 


@@ -44,16 +48,19 @@
 #define L_ERROR_R      'e'
 #define L_FATAL                '!'             /* die() */
 
 #define L_ERROR_R      'e'
 #define L_FATAL                '!'             /* die() */
 

-void log(unsigned int cat, const char *msg, ...) __attribute__((format(printf,2,3)));
+void log_msg(unsigned int cat, const char *msg, ...) __attribute__((format(printf,2,3)));
+#define log log_msg

 void die(byte *, ...) NONRET;
 void log_init(byte *);
 void log_file(byte *);
 void log_fork(void);
 
 #ifdef DEBUG
 void die(byte *, ...) NONRET;
 void log_init(byte *);
 void log_file(byte *);
 void log_fork(void);
 
 #ifdef DEBUG

-#define ASSERT(x) do { if (!(x)) die("Assertion `%s' failed at %s:%d", #x, __FILE__, __LINE__); } while(0)
+void assert_failed(char *assertion, char *file, int line) NONRET;
+#define ASSERT(x) do { if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); } while(0)

 #else
 #else

-#define ASSERT(x) do { } while(0)
+void assert_failed(void) NONRET;
+#define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed(); } while(0)

 #endif
 
 #ifdef LOCAL_DEBUG
 #endif
 
 #ifdef LOCAL_DEBUG


@@ -83,48 +90,20 @@ void log_fork(void);
  */
 #define xmalloc sh_xmalloc
 void *xmalloc(unsigned);
  */
 #define xmalloc sh_xmalloc
 void *xmalloc(unsigned);

-void *xmalloc_zero(unsigned);

 void *xrealloc(void *, unsigned);
 #define xfree(x) free(x)
 #endif
 
 void *xrealloc(void *, unsigned);
 #define xfree(x) free(x)
 #endif
 

+void *xmalloc_zero(unsigned);

 byte *stralloc(byte *);
 
 byte *stralloc(byte *);
 

-/* Objects */
-
-struct fastbuf;
-
-struct odes {                          /* Object description */
-  struct oattr *attrs;
-  struct mempool *pool, *local_pool;
-};
-
-struct oattr {                         /* Object attribute */
-  struct oattr *next, *same, *last_same;
-  byte attr;
-  byte val[1];
-};
-
-void obj_dump(struct odes *);
-struct odes *obj_new(struct mempool *);
-void obj_free(struct odes *);
-int obj_read(struct fastbuf *, struct odes *);
-void obj_write(struct fastbuf *, struct odes *);
-struct oattr *obj_find_attr(struct odes *, uns);
-struct oattr *obj_find_attr_last(struct odes *, uns);
-uns obj_del_attr(struct odes *, struct oattr *);
-byte *obj_find_aval(struct odes *, uns);
-struct oattr *obj_set_attr(struct odes *, uns, byte *);
-struct oattr *obj_set_attr_num(struct odes *, uns, uns);
-struct oattr *obj_add_attr(struct odes *, struct oattr *, uns, byte *);
-

 /* Content-Type pattern matching and filters */
 
 int match_ct_patt(byte *, byte *);
 
 /* log2.c */
 
 /* Content-Type pattern matching and filters */
 
 int match_ct_patt(byte *, byte *);
 
 /* log2.c */
 

-int log2(u32);
+int fls(u32);

 
 /* wordsplit.c */
 
 
 /* wordsplit.c */
 


@@ -171,6 +150,14 @@ uns random_max(uns);
 void *mmap_file(byte *name, unsigned *len, int writeable);
 void munmap_file(void *start, unsigned len);
 
 void *mmap_file(byte *name, unsigned *len, int writeable);
 void munmap_file(void *start, unsigned len);
 

+/* partmap.c */
+
+struct partmap;
+struct partmap *partmap_open(byte *name, int writeable);
+void *partmap_map(struct partmap *p, sh_off_t offset, uns size);
+void partmap_close(struct partmap *p);
+sh_off_t partmap_size(struct partmap *p);
+

 /* proctitle.c */
 
 void setproctitle_init(int argc, char **argv);
 /* proctitle.c */
 
 void setproctitle_init(int argc, char **argv);