r25605: Last round of registry reformats (before this gets an obsession...).

Guenther
(This used to be commit ceb2ebfbf1eeb80bd34beadbba3a3c7a04da306a)

1 files changed, 55 insertions, 44 deletions

diff --git a/source4/lib/registry/tests/generic.c b/source4/lib/registry/tests/generic.c
index 549ed6282d..1b680f20b7 100644
--- a/source4/lib/registry/tests/generic.c
+++ b/source4/lib/registry/tests/generic.c
@@ -1,20 +1,20 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    local testing of registry library
 
    Copyright (C) Jelmer Vernooij 2005-2007
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -31,8 +31,10 @@ struct torture_suite *torture_registry_diff(TALLOC_CTX *mem_ctx);
 
 static bool test_str_regtype(struct torture_context *ctx)
 {
-	torture_assert_str_equal(ctx, str_regtype(1), "REG_SZ", "REG_SZ failed");
-	torture_assert_str_equal(ctx, str_regtype(4), "REG_DWORD", "REG_DWORD failed");
+	torture_assert_str_equal(ctx, str_regtype(1),
+				 "REG_SZ", "REG_SZ failed");
+	torture_assert_str_equal(ctx, str_regtype(4),
+				 "REG_DWORD", "REG_DWORD failed");
 
 	return true;
 }
@@ -42,18 +44,24 @@ static bool test_reg_val_data_string_dword(struct torture_context *ctx)
 {
 	uint32_t d = 0x20;
 	DATA_BLOB db = { (uint8_t *)&d, sizeof(d) };
-	torture_assert_str_equal(ctx, "0x20", 
-					reg_val_data_string(ctx, REG_DWORD, db), "dword failed");
+	torture_assert_str_equal(ctx, "0x20",
+				 reg_val_data_string(ctx, REG_DWORD, db),
+				 "dword failed");
 	return true;
 }
 
 static bool test_reg_val_data_string_sz(struct torture_context *ctx)
 {
 	DATA_BLOB db;
-	db.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16, "bla", 3, (void **)&db.data);
-	torture_assert_str_equal(ctx, "bla", reg_val_data_string(ctx, REG_SZ, db), "sz failed");
+	db.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16,
+					  "bla", 3, (void **)&db.data);
+	torture_assert_str_equal(ctx, "bla",
+				 reg_val_data_string(ctx, REG_SZ, db),
+				 "sz failed");
 	db.length = 4;
-	torture_assert_str_equal(ctx, "bl", reg_val_data_string(ctx, REG_SZ, db), "sz failed");
+	torture_assert_str_equal(ctx, "bl",
+				 reg_val_data_string(ctx, REG_SZ, db),
+				 "sz failed");
 	return true;
 }
 
@@ -61,9 +69,9 @@ static bool test_reg_val_data_string_binary(struct torture_context *ctx)
 {
 	uint8_t x[] = { 0x1, 0x2, 0x3, 0x4 };
 	DATA_BLOB db = { x, 4 };
-	torture_assert_str_equal(ctx, "01020304", 
-							 reg_val_data_string(ctx, REG_BINARY, db), 
-							 "binary failed");
+	torture_assert_str_equal(ctx, "01020304",
+				 reg_val_data_string(ctx, REG_BINARY, db),
+				 "binary failed");
 	return true;
 }
 
@@ -71,21 +79,22 @@ static bool test_reg_val_data_string_binary(struct torture_context *ctx)
 static bool test_reg_val_data_string_empty(struct torture_context *ctx)
 {
 	DATA_BLOB db = { NULL, 0 };
-	torture_assert_str_equal(ctx, "", 
-					reg_val_data_string(ctx, REG_BINARY, db), "empty failed");
+	torture_assert_str_equal(ctx, "",
+				 reg_val_data_string(ctx, REG_BINARY, db),
+				 "empty failed");
 	return true;
 }
 
 static bool test_reg_val_description(struct torture_context *ctx)
 {
 	DATA_BLOB data;
-	data.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16, 
-										"stationary traveller", 
-									    strlen("stationary traveller"), 
-										(void **)&data.data);
-	torture_assert_str_equal(ctx, "camel = REG_SZ : stationary traveller", 
-							 reg_val_description(ctx, "camel", REG_SZ, data),
-							 "reg_val_description failed");
+	data.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16,
+					    "stationary traveller",
+					    strlen("stationary traveller"),
+					    (void **)&data.data);
+	torture_assert_str_equal(ctx, "camel = REG_SZ : stationary traveller",
+				 reg_val_description(ctx, "camel", REG_SZ, data),
+				 "reg_val_description failed");
 	return true;
 }
 
@@ -93,33 +102,35 @@ static bool test_reg_val_description(struct torture_context *ctx)
 static bool test_reg_val_description_nullname(struct torture_context *ctx)
 {
 	DATA_BLOB data;
-	data.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16, "west berlin", 
-								strlen("west berlin"), (void **)&data.data);
-	torture_assert_str_equal(ctx, "<No Name> = REG_SZ : west berlin", 
-							 reg_val_description(ctx, NULL, REG_SZ, data),
-							 "description with null name failed");
+	data.length = convert_string_talloc(ctx, CH_UNIX, CH_UTF16,
+					    "west berlin",
+					    strlen("west berlin"),
+					    (void **)&data.data);
+	torture_assert_str_equal(ctx, "<No Name> = REG_SZ : west berlin",
+				 reg_val_description(ctx, NULL, REG_SZ, data),
+				 "description with null name failed");
 	return true;
 }
 
 
 
-struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx) 
+struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, 
-													   "REGISTRY");
-	torture_suite_add_simple_test(suite, "str_regtype", test_str_regtype);
-	torture_suite_add_simple_test(suite, "reg_val_data_string dword", 
-								  test_reg_val_data_string_dword);
-	torture_suite_add_simple_test(suite, "reg_val_data_string sz", 
-								  test_reg_val_data_string_sz);
-	torture_suite_add_simple_test(suite, "reg_val_data_string binary", 
-								  test_reg_val_data_string_binary);
-	torture_suite_add_simple_test(suite, "reg_val_data_string empty", 
-								  test_reg_val_data_string_empty);
-	torture_suite_add_simple_test(suite, "reg_val_description", 
-								  test_reg_val_description);
-	torture_suite_add_simple_test(suite, "reg_val_description null", 
-								  test_reg_val_description_nullname);
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "REGISTRY");
+	torture_suite_add_simple_test(suite, "str_regtype",
+				      test_str_regtype);
+	torture_suite_add_simple_test(suite, "reg_val_data_string dword",
+				      test_reg_val_data_string_dword);
+	torture_suite_add_simple_test(suite, "reg_val_data_string sz",
+				      test_reg_val_data_string_sz);
+	torture_suite_add_simple_test(suite, "reg_val_data_string binary",
+				      test_reg_val_data_string_binary);
+	torture_suite_add_simple_test(suite, "reg_val_data_string empty",
+				      test_reg_val_data_string_empty);
+	torture_suite_add_simple_test(suite, "reg_val_description",
+				      test_reg_val_description);
+	torture_suite_add_simple_test(suite, "reg_val_description null",
+				      test_reg_val_description_nullname);
 
 	torture_suite_add_suite(suite, torture_registry_hive(mem_ctx));
 	torture_suite_add_suite(suite, torture_registry_registry(mem_ctx));