--- uuid.c 2004/01/19 13:55:18 1.42
+++ uuid.c 2004/01/19 14:11:49 1.43
@@ -838,7 +838,7 @@
* GENERATE NODE
*/
- if ((mode & UUID_MCASTRND) || (uuid->mac[0] & BM_OCTET(1,0,0,0,0,0,0,0))) {
+ if ((mode & UUID_MAKE_MC) || (uuid->mac[0] & BM_OCTET(1,0,0,0,0,0,0,0))) {
/* generate random IEEE 802 local multicast MAC address */
prng_data(uuid->prng, (void *)&(uuid->obj.node), sizeof(uuid->obj.node));
uuid->obj.node[0] |= IEEE_MAC_MCBIT_ENC;
@@ -979,11 +979,11 @@
/* dispatch into version dependent generation functions */
va_start(ap, mode);
- if (mode & UUID_VERSION1)
+ if (mode & UUID_MAKE_V1)
rc = uuid_make_v1(uuid, mode, ap);
- else if (mode & UUID_VERSION3)
+ else if (mode & UUID_MAKE_V3)
rc = uuid_make_v3(uuid, mode, ap);
- else if (mode & UUID_VERSION4)
+ else if (mode & UUID_MAKE_V4)
rc = uuid_make_v4(uuid, mode, ap);
else
rc = UUID_RC_ARG;
@@ -1002,6 +1002,8 @@
case UUID_RC_ARG: str = "invalid argument"; break;
case UUID_RC_MEM: str = "out of memory"; break;
case UUID_RC_SYS: str = "system error"; break;
+ case UUID_RC_INT: str = "internal error"; break;
+ case UUID_RC_IMP: str = "not implemented"; break;
default: str = NULL; break;
}
return str;
|
