X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flib.h;h=a7cf04170a071c9c4d5df8fb4498480f6f7fe4ee;hb=89b67b2c54822c7867d8a91a896386f632d2051e;hp=abd536d57773bf28e16ff0880fbe7ffe99bf853c;hpb=115aec7929c19d3276bdf7baa7917f95483cf417;p=libucw.git

diff --git a/lib/lib.h b/lib/lib.h
index abd536d5..a7cf0417 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -1,7 +1,7 @@
 /*
  *	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.
@@ -48,7 +48,8 @@
 #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 *);
@@ -56,7 +57,7 @@ void log_fork(void);
 
 #ifdef DEBUG
 void assert_failed(char *assertion, char *file, int line) NONRET;
-#define ASSERT(x) do { if (!(x)) assert_failed(#x, __FILE__, __LINE__); } while(0)
+#define ASSERT(x) do { if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); } while(0)
 #else
 void assert_failed(void) NONRET;
 #define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed(); } while(0)
@@ -102,7 +103,7 @@ int match_ct_patt(byte *, byte *);
 
 /* log2.c */
 
-int log2(u32);
+int fls(u32);
 
 /* wordsplit.c */
 
@@ -149,6 +150,14 @@ uns random_max(uns);
 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);