/*
* The UCW Library -- Miscellaneous Functions
*
- * (c) 1997--2005 Martin Mares <mj@ucw.cz>
+ * (c) 1997--2006 Martin Mares <mj@ucw.cz>
* (c) 2005 Tomas Valla <tom@ucw.cz>
*
* This software may be freely distributed and used according to the terms
/* Tell libc we're going to use all extensions available */
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
/* Ugly structure handling macros */
#define ABS(x) ((x) < 0 ? -(x) : (x))
#define ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a)))
#define STRINGIFY(x) #x
+#define STRINGIFY_EXPANDED(x) STRINGIFY(x)
#define GLUE(x,y) x##y
#define GLUE_(x,y) x##_##y
#define COMPARE_LT(x,y) do { if ((x)<(y)) return 1; if ((x)>(y)) return 0; } while(0)
#define COMPARE_GT(x,y) COMPARE_LT(y,x)
+#define ROL(x, bits) (((x) << (bits)) | ((x) >> (sizeof(uns)*8 - (bits)))) /* Bitwise rotation of an uns to the left */
+
/* GCC Extensions */
#ifdef __GNUC__
extern char *log_title; /* NULL - print no title, default is log_progname */
extern char *log_filename; /* Expanded name of the current log file */
-extern int log_switch_nest; /* log_switch() nesting counter, increment to disable automatic switches */
+extern volatile int log_switch_nest; /* log_switch() nesting counter, increment to disable automatic switches */
extern int log_pid; /* 0 if shouldn't be logged */
+extern int log_precise_timings; /* Include microsecond timestamps in log messages */
extern void (*log_die_hook)(void);
struct tm;
extern void (*log_switch_hook)(struct tm *tm);
*/
void *xmalloc(unsigned);
void *xrealloc(void *, unsigned);
-#define sh_xfree(x) free(x)
+void xfree(void *);
#endif
void *xmalloc_zero(unsigned);
int match_ct_patt(byte *, byte *);
-/* log2.c */
-
-int fls(u32);
-
/* wordsplit.c */
int sepsplit(byte *str, byte sep, byte **rec, uns max);
int isprime(uns);
uns nextprime(uns);
+/* primetable.c */
+
+uns next_table_prime(uns x);
+uns prev_table_prime(uns x);
+
/* timer.c */
struct timeval;
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);