OSSP CVS Repository

Check-in Number:	4377
Date:	2004-Jan-19 10:26:55 (local) 2004-Jan-19 09:26:55 (UTC)
User:	rse
Branch:
Comment:	use meta-API also internally to be consistent
Tickets:
Inspections:
Files:	ossp-pkg/uuid/uuid.c      1.38 -> 1.39     4 inserted, 4 deleted

---

ossp-pkg/uuid/uuid.c 1.38 -> 1.39

--- uuid.c 2004/01/19 09:17:27 1.38 +++ uuid.c 2004/01/19 09:26:55 1.39 @@ -641,7 +641,7 @@ /* pack UUID into binary representation */ tmp_ptr = (void *)&tmp_bin; tmp_len = sizeof(tmp_bin); - if ((rc = uuid_export_bin(uuid, &tmp_ptr, &tmp_len)) != UUID_RC_OK) + if ((rc = uuid_export(uuid, UUID_FMT_BIN, &tmp_ptr, &tmp_len)) != UUID_RC_OK) return rc; /* mask out version and variant parts */ @@ -918,10 +918,10 @@ /* custom namespace via UUID string representation */ if ((rc = uuid_create(&uuid_object)) != UUID_RC_OK) return rc; - if ((rc = uuid_import_str(uuid_object, ns, strlen(ns))) != UUID_RC_OK) + if ((rc = uuid_import(uuid_object, UUID_FMT_STR, ns, strlen(ns))) != UUID_RC_OK) return rc; uuid_octets = (void *)&(uuid_object->obj); - uuid_export_bin(uuid_object, &uuid_octets, NULL); + uuid_export(uuid_object, UUID_FMT_BIN, &uuid_octets, NULL); md5_update(uuid->md5, uuid_octets, UUID_LEN_BIN); uuid_destroy(uuid_object); } @@ -951,7 +951,7 @@ /* fulfill requirement of standard and convert UUID data into local/host byte order (this uses fact that uuid_import_bin() is able to operate in-place!) */ - uuid_import_bin(uuid, (void *)&(uuid->obj), UUID_LEN_BIN); + uuid_import(uuid, UUID_FMT_BIN, (void *)&(uuid->obj), UUID_LEN_BIN); /* brand UUID with version and variant */ uuid_brand(uuid, 3);