summaryrefslogtreecommitdiff
path: root/source3/lib/util_uuid.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-14 02:33:41 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-14 02:33:41 +0200
commita62c510d8b3f5e15bd48f71747c5f516eca570c7 (patch)
treeb80c82891626c83a0c86dfb52ae6c7050f28f97f /source3/lib/util_uuid.c
parent1f3e4f39c5219b8ca3564e0c2eb685d9e7fdb13e (diff)
downloadsamba-a62c510d8b3f5e15bd48f71747c5f516eca570c7.tar.gz
samba-a62c510d8b3f5e15bd48f71747c5f516eca570c7.tar.bz2
samba-a62c510d8b3f5e15bd48f71747c5f516eca570c7.zip
Use GUID_from_string.
Diffstat (limited to 'source3/lib/util_uuid.c')
-rw-r--r--source3/lib/util_uuid.c51
1 files changed, 0 insertions, 51 deletions
diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c
index 5d9a56cd23..7e67d791e3 100644
--- a/source3/lib/util_uuid.c
+++ b/source3/lib/util_uuid.c
@@ -20,12 +20,6 @@
#include "includes.h"
-/*
- * Offset between 15-Oct-1582 and 1-Jan-70
- */
-#define TIME_OFFSET_HIGH 0x01B21DD2
-#define TIME_OFFSET_LOW 0x13814000
-
void smb_uuid_pack(const struct GUID uu, UUID_FLAT *ptr)
{
SIVAL(ptr->info, 0, uu.time_low);
@@ -55,51 +49,6 @@ void smb_uuid_generate_random(struct GUID *uu)
uu->time_hi_and_version = (uu->time_hi_and_version & 0x0FFF) | 0x4000;
}
-bool smb_string_to_uuid(const char *in, struct GUID* uu)
-{
- bool ret = False;
- const char *ptr = in;
- char *end = (char *)in;
- int i;
- unsigned v1, v2;
-
- if (!in || !uu) goto out;
-
- uu->time_low = strtoul(ptr, &end, 16);
- if ((end - ptr) != 8 || *end != '-') goto out;
- ptr = (end + 1);
-
- uu->time_mid = strtoul(ptr, &end, 16);
- if ((end - ptr) != 4 || *end != '-') goto out;
- ptr = (end + 1);
-
- uu->time_hi_and_version = strtoul(ptr, &end, 16);
- if ((end - ptr) != 4 || *end != '-') goto out;
- ptr = (end + 1);
-
- if (sscanf(ptr, "%02x%02x", &v1, &v2) != 2) {
- goto out;
- }
- uu->clock_seq[0] = v1;
- uu->clock_seq[1] = v2;
- ptr += 4;
-
- if (*ptr != '-') goto out;
- ptr++;
-
- for (i = 0; i < 6; i++) {
- if (sscanf(ptr, "%02x", &v1) != 1) {
- goto out;
- }
- uu->node[i] = v1;
- ptr += 2;
- }
-
- ret = True;
-out:
- return ret;
-}
-
/*****************************************************************
Return the binary string representation of a GUID.
Caller must free.