summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;