--- uuid_cli.c 2004/01/19 12:15:05 1.13
+++ uuid_cli.c 2004/01/19 14:11:50 1.14
@@ -91,7 +91,7 @@
iterate = 0; /* not one at a time */
raw = 0; /* default is ASCII output */
decode = 0; /* default is to encode */
- version = UUID_VERSION1;
+ version = UUID_MAKE_V1;
while ((ch = getopt(argc, argv, "1n:rdmo:v:")) != -1) {
switch (ch) {
case '1':
@@ -117,16 +117,16 @@
error(1, "fopen: %s", strerror(errno));
break;
case 'm':
- version |= UUID_MCASTRND;
+ version |= UUID_MAKE_MC;
break;
case 'v':
i = strtol(optarg, &p, 10);
if (*p != '\0')
usage("invalid argument to option 'v'");
switch (i) {
- case 1: version = UUID_VERSION1; break;;
- case 3: version = UUID_VERSION3; break;;
- case 4: version = UUID_VERSION4; break;;
+ case 1: version = UUID_MAKE_V1; break;;
+ case 3: version = UUID_MAKE_V3; break;;
+ case 4: version = UUID_MAKE_V4; break;;
default:
usage("invalid version on option 'v'");
break;
@@ -161,9 +161,9 @@
}
else {
/* encoding */
- if ( (version == UUID_VERSION1 && argc != 0)
- || (version == UUID_VERSION3 && argc != 2)
- || (version == UUID_VERSION4 && argc != 0))
+ if ( (version == UUID_MAKE_V1 && argc != 0)
+ || (version == UUID_MAKE_V3 && argc != 2)
+ || (version == UUID_MAKE_V4 && argc != 0))
usage("invalid number of arguments");
if ((rc = uuid_create(&uuid)) != UUID_RC_OK)
error(1, "uuid_create: %s", uuid_error(rc));
@@ -179,7 +179,7 @@
if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK)
error(1, "uuid_load: %s", uuid_error(rc));
}
- if (version == UUID_VERSION3) {
+ if (version == UUID_MAKE_V3) {
if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK)
error(1, "uuid_create: %s", uuid_error(rc));
if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) {
|
