summaryrefslogtreecommitdiff
path: root/source3/lib/genparser_samba.c
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2003-10-30 18:13:25 +0000
committerJim McDonough <jmcd@samba.org>2003-10-30 18:13:25 +0000
commit2e65aa1b284f34d62f8b54ddb19d2d87d4379433 (patch)
treef266be547ac17ae231264b74d95ac7e2c142a5bf /source3/lib/genparser_samba.c
parentbff3e7feee2c9ef91a487df410327666c38602c1 (diff)
downloadsamba-2e65aa1b284f34d62f8b54ddb19d2d87d4379433.tar.gz
samba-2e65aa1b284f34d62f8b54ddb19d2d87d4379433.tar.bz2
samba-2e65aa1b284f34d62f8b54ddb19d2d87d4379433.zip
Last of the GUID->struct uuid changes.
GUID has been removed. If you are dealing with a flattened version of a [gu]uid, use UUID_FLAT. smb_pack_uuid and smb_unpack_uuid will switch between the two. I'm not sure exactly what the genparse stuff is doing here, so I just switched it to a UUID_FLAT (no functional change), but I suspect this may not be the right way to go. (This used to be commit 001e9d0e814109a26d598001b3c23dfdb04510ff)
Diffstat (limited to 'source3/lib/genparser_samba.c')
-rw-r--r--source3/lib/genparser_samba.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/genparser_samba.c b/source3/lib/genparser_samba.c
index 7eabf5a56e..8f469a46d6 100644
--- a/source3/lib/genparser_samba.c
+++ b/source3/lib/genparser_samba.c
@@ -63,7 +63,7 @@ int gen_parse_SEC_ACCESS(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
int gen_parse_GUID(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
{
- int info[GUID_SIZE];
+ int info[UUID_FLAT_SIZE];
int i;
char *sc;
char *p;
@@ -74,7 +74,7 @@ int gen_parse_GUID(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
sc = m;
memset(info, 0, sizeof(info));
- for (i = 0; i < GUID_SIZE; i++) {
+ for (i = 0; i < UUID_FLAT_SIZE; i++) {
p = strchr(sc, ',');
if (p != NULL) p = '\0';
info[i] = atoi(sc);
@@ -82,8 +82,8 @@ int gen_parse_GUID(TALLOC_CTX *mem_ctx, char *ptr, const char *str)
}
free(m);
- for (i = 0; i < GUID_SIZE; i++) {
- ((GUID *)ptr)->info[i] = info[i];
+ for (i = 0; i < UUID_FLAT_SIZE; i++) {
+ ((UUID_FLAT *)ptr)->info[i] = info[i];
}
return 0;
@@ -172,10 +172,10 @@ int gen_dump_GUID(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr,
{
int i, r;
- for (i = 0; i < (GUID_SIZE - 1); i++) {
- if (!(r = addshort(mem_ctx, p, "%d,", ((GUID *)ptr)->info[i]))) return r;
+ for (i = 0; i < (UUID_FLAT_SIZE - 1); i++) {
+ if (!(r = addshort(mem_ctx, p, "%d,", ((UUID_FLAT *)ptr)->info[i]))) return r;
}
- return addshort(mem_ctx, p, "%d", ((GUID *)ptr)->info[i]);
+ return addshort(mem_ctx, p, "%d", ((UUID_FLAT *)ptr)->info[i]);
}
int gen_dump_SEC_ACE(TALLOC_CTX *mem_ctx, struct parse_string *p, const char *ptr, unsigned indent)