WORD_TYPES_HIDDEN shouldn't be considered META by default.

[libucw.git] / lib / lib.h

diff --git a/lib/lib.h b/lib/lib.h
index 0fe45010f2419ad4ba3b03ae74ac030444d2845d..e2bc3ef434cf34a166175ba2e085eeab6393b160 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -24,6 +24,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 UNALIGNED_PART(ptr, type) (((long) (ptr)) % sizeof(type))
 
 /* Some other macros */
 
@@ -33,20 +34,6 @@
 #define ABS(x) ((x) < 0 ? -(x) : (x))
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a)))
 
-/* Temporary Files */
-
-#define TMP_DIR "tmp"
-#define TMP_DIR_LEN 3
-
-struct tempfile {
-  int fh;
-  byte name[32];
-};
-
-void open_temp(struct tempfile *, byte *);
-void delete_temp(struct tempfile *);
-u32 temprand(uns);
-
 /* Logging */
 
 #define L_DEBUG                'D'             /* Debugging messages */
@@ -97,11 +84,11 @@ void log_fork(void);
  */
 #define xmalloc sh_xmalloc
 void *xmalloc(unsigned);
-void *xmalloc_zero(unsigned);
 void *xrealloc(void *, unsigned);
 #define xfree(x) free(x)
 #endif
 
+void *xmalloc_zero(unsigned);
 byte *stralloc(byte *);
 
 /* Objects */
@@ -131,6 +118,8 @@ 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 *);
+struct oattr *obj_prepend_attr(struct odes *, uns, byte *);
+struct oattr *obj_insert_attr(struct odes *o, struct oattr *first, struct oattr *after, byte *v);
 
 /* Content-Type pattern matching and filters */
 
@@ -171,7 +160,7 @@ uns get_timer(void);
 
 typedef struct regex regex;
 
-regex *rx_compile(byte *r);
+regex *rx_compile(byte *r, int icase);
 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);
@@ -190,4 +179,8 @@ void munmap_file(void *start, unsigned len);
 void setproctitle_init(int argc, char **argv);
 void setproctitle(char *msg, ...) __attribute__((format(printf,1,2)));
 
+/* randomkey.c */
+
+void randomkey(byte *buf, uns size);
+
 #endif