summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorWilco Baan Hofman <wilco@baanhofman.nl>2010-03-28 16:46:53 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-03-29 18:44:00 +0200
commit16427efb749d63b5a54b2b260ea8ac565f63a9e7 (patch)
treef9108072aea9f2a5777b948f966b8a01a43f63ab /source4/lib
parentb1c70d49c9f8e99997fe3c9228e92db5e6ad3ad4 (diff)
downloadsamba-16427efb749d63b5a54b2b260ea8ac565f63a9e7.tar.gz
samba-16427efb749d63b5a54b2b260ea8ac565f63a9e7.tar.bz2
samba-16427efb749d63b5a54b2b260ea8ac565f63a9e7.zip
Revert "s4:registry - util.c - move the "REG_NONE" case in the conversion functions on top of the switch"
This reverts commit 4e6c0e1f6f37a7e04d10dbf7abbf626f52232aaf. Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/registry/util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c
index 2b96797adc..e6cd8de640 100644
--- a/source4/lib/registry/util.c
+++ b/source4/lib/registry/util.c
@@ -69,9 +69,6 @@ _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx,
return talloc_strdup(mem_ctx, "");
switch (type) {
- case REG_NONE:
- /* "NULL" is the right return value */
- break;
case REG_EXPAND_SZ:
case REG_SZ:
if (data.length % 2 == 0) {
@@ -100,6 +97,9 @@ _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx,
BVAL(data.data, 0));
}
break;
+ case REG_NONE:
+ /* "NULL" is the right return value */
+ break;
case REG_MULTI_SZ:
/* FIXME: We don't support this yet */
break;
@@ -147,9 +147,6 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx,
/* Convert data appropriately */
switch (*type) {
- case REG_NONE:
- ZERO_STRUCTP(data);
- break;
case REG_SZ:
case REG_EXPAND_SZ:
return convert_string_talloc_convenience(mem_ctx,
@@ -178,6 +175,9 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx,
SBVAL(data->data, 0, tmp);
}
break;
+ case REG_NONE:
+ ZERO_STRUCTP(data);
+ break;
case REG_MULTI_SZ:
/* FIXME: We don't support this yet */
return false;