The `randomkey' module has been removed.

[libucw.git] / ucw / lib.h

diff --git a/ucw/lib.h b/ucw/lib.h
index 79843c0e9a65da364a719f5d82ee4945c97e8118..ec984888d2287d8ac42a9765da1b9e0c24c35a41 100644 (file)
--- a/ucw/lib.h
+++ b/ucw/lib.h
@@ -20,7 +20,7 @@
 
 #define CHECK_PTR_TYPE(x, type) ((x)-(type)(x) + (type)(x))            /** Check that a pointer @x is of type @type. Fail compilation if not. **/
 #define PTR_TO(s, i) &((s*)0)->i                                       /** Return OFFSETOF() in form of a pointer. **/
-#define OFFSETOF(s, i) ((unsigned int) (uintptr_t) PTR_TO(s, i))       /** Offset of item @i from the start of structure @s **/
+#define OFFSETOF(s, i) ((uns)offsetof(s, i))                           /** Offset of item @i from the start of structure @s **/
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))         /** Given a pointer @p to item @i of structure @s, return a pointer to the start of the struct. **/
 
 /** Align an integer @s to the nearest higher multiple of @a (which should be a power of two) **/
@@ -159,11 +159,11 @@ void assert_failed_noinfo(void) NONRET;
 #define xrealloc ucw_xrealloc
 #define xfree ucw_xfree
 
-void *xmalloc(uns) LIKE_MALLOC;                        /** Allocate memory and die() if there is none. **/
-void *xrealloc(void *, uns);                   /** Reallocate memory and die() if there is none. **/
+void *xmalloc(size_t) LIKE_MALLOC;             /** Allocate memory and die() if there is none. **/
+void *xrealloc(void *, size_t);                        /** Reallocate memory and die() if there is none. **/
 void xfree(void *);                            /** Free memory allocated by xmalloc() or xrealloc(). **/
 
-void *xmalloc_zero(uns) LIKE_MALLOC;           /** Allocate memory and fill it by zeroes. **/
+void *xmalloc_zero(size_t) LIKE_MALLOC;                /** Allocate memory and fill it by zeroes. **/
 char *xstrdup(const char *) LIKE_MALLOC;       /** Make a xmalloc()'ed copy of a string. Returns NULL for NULL string. **/
 
 /*** === Trivial timers (timer.c) ***/
@@ -192,10 +192,6 @@ void setproctitle_init(int argc, char **argv);
 void setproctitle(const char *msg, ...) FORMAT_CHECK(printf,1,2);
 char *getproctitle(void);
 
-/* randomkey.c */
-
-void randomkey(byte *buf, uns size);
-
 /* exitstatus.c */
 
 #define EXIT_STATUS_MSG_SIZE 32