OSSP CVS Repository

ossp - Check-in [3705]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 3705
Date: 2004-Jan-09 10:06:25 (local)
2004-Jan-09 09:06:25 (UTC)
User:rse
Branch:
Comment: use 'nil' instead of 'null' because the standards name the special zeroed UUID 'nil'
Tickets:
Inspections:
Files:
ossp-pkg/uuid/uuid.c      1.3 -> 1.4     3 inserted, 3 deleted
ossp-pkg/uuid/uuid.h      1.3 -> 1.4     1 inserted, 1 deleted

ossp-pkg/uuid/uuid.c 1.3 -> 1.4

--- uuid.c       2004/01/08 21:31:47     1.3
+++ uuid.c       2004/01/09 09:06:25     1.4
@@ -157,11 +157,11 @@
         return UUID_RC_OK;
     }
     if (a == NULL) {
-        *result = ((uuid_isnull(b, &r), r) ? 0 : -1);
+        *result = ((uuid_isnil(b, &r), r) ? 0 : -1);
         return UUID_RC_OK;
     }
     if (b == NULL) {
-        *result = ((uuid_isnull(a, &r), r) ? 0 : 1);
+        *result = ((uuid_isnil(a, &r), r) ? 0 : 1);
         return UUID_RC_OK;
     }
 
@@ -196,7 +196,7 @@
     return UUID_RC_OK;
 }
 
-uuid_rc_t uuid_isnull(uuid_t *uuid, int *result)
+uuid_rc_t uuid_isnil(uuid_t *uuid, int *result)
 {
     if (uuid == NULL || result == NULL)
         return UUID_RC_ARG;


ossp-pkg/uuid/uuid.h 1.3 -> 1.4

--- uuid.h       2004/01/08 21:31:47     1.3
+++ uuid.h       2004/01/09 09:06:25     1.4
@@ -98,7 +98,7 @@
 
 /* UUID comparison */
 extern uuid_rc_t  uuid_compare  (uuid_t  *uuid, uuid_t *uuid2, int *result);
-extern uuid_rc_t  uuid_isnull   (uuid_t  *uuid,                int *result);
+extern uuid_rc_t  uuid_isnil    (uuid_t  *uuid,                int *result);
 
 /* UUID generation */
 extern uuid_rc_t  uuid_generate (uuid_t  *uuid, unsigned int mode, ...);

CVSTrac 2.0.1