--- uuid.h 2004/01/09 09:06:25 1.4
+++ uuid.h 2004/01/09 11:28:56 1.5
@@ -69,7 +69,7 @@
/* encoding octet stream lengths */
#define UUID_LEN_BIN (128 / 8 /*bytes*/)
-#define UUID_LEN_STR (128 / 4 /*nibbles*/ + 4 /*hyphens*/ + 1 /*nul*/)
+#define UUID_LEN_STR (128 / 4 /*nibbles*/ + 4 /*hyphens*/)
/* return codes */
typedef enum {
@@ -94,24 +94,22 @@
/* object handling */
extern uuid_rc_t uuid_create (uuid_t **uuid);
extern uuid_rc_t uuid_destroy (uuid_t *uuid);
-extern uuid_rc_t uuid_null (uuid_t *uuid);
+extern uuid_rc_t uuid_nil (uuid_t *uuid);
/* UUID comparison */
extern uuid_rc_t uuid_compare (uuid_t *uuid, uuid_t *uuid2, int *result);
extern uuid_rc_t uuid_isnil (uuid_t *uuid, int *result);
-/* UUID generation */
-extern uuid_rc_t uuid_generate (uuid_t *uuid, unsigned int mode, ...);
+/* binary representation handling */
+extern uuid_rc_t uuid_unpack (uuid_t *uuid, const void *buf);
+extern uuid_rc_t uuid_pack (uuid_t *uuid, void **buf);
/* string representation handling */
extern uuid_rc_t uuid_parse (uuid_t *uuid, const char *str);
-extern uuid_rc_t uuid_format (uuid_t *uuid, char **str);
+extern uuid_rc_t uuid_unparse (uuid_t *uuid, char **str);
-/* binary representation handling */
-extern uuid_rc_t uuid_read (uuid_t *uuid, const void *buf);
-extern uuid_rc_t uuid_write (uuid_t *uuid, void **buf);
-
-/* UUID dumping */
+/* UUID generation and dumping */
+extern uuid_rc_t uuid_generate (uuid_t *uuid, unsigned int mode, ...);
extern uuid_rc_t uuid_dump (uuid_t *uuid, char **str);
/* error handling */
|
