From: Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Date: Sun, 29 Nov 2009 13:55:20 +0000 (+0100)
Subject: lib/registry/util.c - Reorder the registry datatypes of the conversion functions
X-Git-Tag: samba-4.0.0alpha9~40
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=51bedf939568717424edd7732e1e315faa333849;hp=df1d42fc1b5fd27a8969819212f51a74b310d909

lib/registry/util.c - Reorder the registry datatypes of the conversion functions

This is absolutely cosmetic and makes the code easier to comprehend.
---

diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c
index 9409a8f4bc9..f9ea2a19343 100644
--- a/source4/lib/registry/util.c
+++ b/source4/lib/registry/util.c
@@ -82,10 +82,14 @@ _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx,
 						      *(int *)data.data);
 			}
 			break;
+		case REG_NONE:
+			/* "NULL" is the right return value */
+			break;
 		case REG_MULTI_SZ:
-			/* FIXME */
+			/* FIXME: We don't support this yet */
 			break;
 		default:
+			/* Other datatypes aren't supported -> return "NULL" */
 			break;
 	}
 
@@ -137,23 +141,22 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx,
 							  (void **)&data->data,
 							  &data->length, false);
 			break;
-
+		case REG_BINARY:
+			*data = strhex_to_data_blob(mem_ctx, data_str);
+			break;
 		case REG_DWORD: {
 			uint32_t tmp = strtol(data_str, NULL, 0);
 			*data = data_blob_talloc(mem_ctx, &tmp, 4);
 			}
 			break;
-
 		case REG_NONE:
 			ZERO_STRUCTP(data);
 			break;
-
-		case REG_BINARY:
-			*data = strhex_to_data_blob(mem_ctx, data_str);
-			break;
-
+		case REG_MULTI_SZ:
+			/* FIXME: We don't support this yet */
+			return false;
 		default:
-			/* FIXME */
+			/* Other datatypes aren't supported -> return no success */
 			return false;
 	}
 	return true;