OSSP CVS Repository

ossp - Difference in ossp-pkg/uuid/uuid_cli.c versions 1.6 and 1.7
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/uuid/uuid_cli.c 1.6 -> 1.7

--- uuid_cli.c   2004/01/09 21:01:04     1.6
+++ uuid_cli.c   2004/01/10 10:49:00     1.7
@@ -145,7 +145,9 @@
     }
     else {
         /* encoding */
-        if (argc < 0 || ((version == UUID_VERSION3 && argc > 2) || argc > 1))
+        if (   (version == UUID_VERSION1 && argc != 0)
+            || (version == UUID_VERSION3 && argc != 2)
+            || (version == UUID_VERSION4 && argc != 0))
             usage("invalid number of arguments");
         if ((rc = uuid_create(&uuid)) != UUID_RC_OK)
             error(1, "uuid_create: %s", uuid_error(rc));
@@ -160,7 +162,7 @@
                     error(1, "uuid_nil: %s", uuid_error(rc));
             }
             if (version == UUID_VERSION3)
-                rc = uuid_generate(uuid, version, argv[0]);
+                rc = uuid_generate(uuid, version, argv[0], argv[1]);
             else
                 rc = uuid_generate(uuid, version);
             if (rc != UUID_RC_OK)

CVSTrac 2.0.1