Index: ossp-pkg/uuid/uuid.c
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.c,v
rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.c,v' 2>/dev/null
--- uuid.c	2004/01/09 11:32:06	1.6
+++ uuid.c	2004/01/09 16:11:40	1.7
@@ -370,7 +370,7 @@
     return UUID_RC_OK;
 }
 
-uuid_rc_t uuid_unparse(uuid_t *uuid, char **str)
+uuid_rc_t uuid_format(uuid_t *uuid, char **str)
 {
     uuid_t uuid_tmp;
 
Index: ossp-pkg/uuid/uuid.h
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.h,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.h,v' 2>/dev/null
--- uuid.h	2004/01/09 11:28:56	1.5
+++ uuid.h	2004/01/09 16:11:40	1.6
@@ -106,7 +106,7 @@
 
 /* string representation handling */
 extern uuid_rc_t  uuid_parse    (uuid_t  *uuid, const char  *str);
-extern uuid_rc_t  uuid_unparse  (uuid_t  *uuid,       char **str);
+extern uuid_rc_t  uuid_format   (uuid_t  *uuid,       char **str);
 
 /* UUID generation and dumping */
 extern uuid_rc_t  uuid_generate (uuid_t  *uuid, unsigned int mode, ...);
Index: ossp-pkg/uuid/uuid_cli.c
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_cli.c,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_cli.c,v' 2>/dev/null
--- uuid_cli.c	2004/01/09 11:28:56	1.4
+++ uuid_cli.c	2004/01/09 16:11:40	1.5
@@ -167,16 +167,16 @@
                 error(1, "uuid_generate: %s", uuid_error(rc));
             if (ascii) {
                 cp = NULL;
-                if ((rc = uuid_unparse(uuid, &cp)) != UUID_RC_OK)
+                if ((rc = uuid_format(uuid, &cp)) != UUID_RC_OK)
                     error(1, "uuid_unparse: %s", uuid_error(rc));
                 fprintf(fp, "%s\n", cp);
                 free(cp);
             }
             else {
                 vp = NULL;
-                if ((rc = uuid_unpack(uuid, &vp)) != UUID_RC_OK)
+                if ((rc = uuid_pack(uuid, &vp)) != UUID_RC_OK)
                     error(1, "uuid_unpack: %s", uuid_error(rc));
-                fwrite(vp, UUID_LEN_BIN, 1, fp);
+                fwrite(vp, UUID_LEN_BIN, 1, vp);
                 free(vp);
             }
         }