summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-09-10 19:28:07 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-09-10 20:20:26 +0200
commit55598c4746f51f4a607c7b11e43ad56dcee22d87 (patch)
tree84d279284add2f87d4f193ce7a1dcbcb638fe939
parent4fc1319db9b27f97da94e6b15a93b7c10d60fa17 (diff)
downloadsamba-55598c4746f51f4a607c7b11e43ad56dcee22d87.tar.gz
samba-55598c4746f51f4a607c7b11e43ad56dcee22d87.tar.bz2
samba-55598c4746f51f4a607c7b11e43ad56dcee22d87.zip
s4:torture/rpc/winreg.c - hopefully this attempt fixes Solaris "cc" on the buildfarm
The Solaris "cc" incompatiblity on this codepart seems to be harder to fix than it looks like.
-rw-r--r--source4/torture/rpc/winreg.c37
1 files changed, 10 insertions, 27 deletions
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index c2dd8b1e3e..9cca02def6 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2412,65 +2412,48 @@ static const struct {
const char *error_message;
} multiple_values_tests[] = {
{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = NULL,
- .values[2] = NULL,
+ .values = { VALUE_CURRENT_VERSION, NULL, NULL },
.num_values = 1,
.existing_value = true,
.error_message = NULL
},{
- .values[0] = VALUE_SYSTEM_ROOT,
- .values[1] = NULL,
- .values[2] = NULL,
+ .values = { VALUE_SYSTEM_ROOT, NULL, NULL },
.num_values = 1,
.existing_value = true,
.error_message = NULL
},{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = VALUE_SYSTEM_ROOT,
- .values[2] = NULL,
+ .values = { VALUE_CURRENT_VERSION, VALUE_SYSTEM_ROOT, NULL },
.num_values = 2,
.existing_value = true,
.error_message = NULL
},{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = VALUE_SYSTEM_ROOT,
- .values[2] = VALUE_CURRENT_VERSION,
+ .values = { VALUE_CURRENT_VERSION, VALUE_SYSTEM_ROOT,
+ VALUE_CURRENT_VERSION },
.num_values = 3,
.existing_value = true,
.error_message = NULL
},{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = NULL,
- .values[2] = VALUE_SYSTEM_ROOT,
+ .values = { VALUE_CURRENT_VERSION, NULL, VALUE_SYSTEM_ROOT },
.num_values = 3,
.existing_value = false,
.error_message = NULL
},{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = "",
- .values[2] = VALUE_SYSTEM_ROOT,
+ .values = { VALUE_CURRENT_VERSION, "", VALUE_SYSTEM_ROOT },
.num_values = 3,
.existing_value = false,
.error_message = NULL
},{
- .values[0] = "IDoNotExist",
- .values[1] = NULL,
- .values[2] = NULL,
+ .values = { "IDoNotExist", NULL, NULL },
.num_values = 1,
.existing_value = false,
.error_message = NULL
},{
- .values[0] = "IDoNotExist",
- .values[1] = VALUE_CURRENT_VERSION,
- .values[2] = NULL,
+ .values = { "IDoNotExist", VALUE_CURRENT_VERSION, NULL },
.num_values = 2,
.existing_value = false,
.error_message = NULL
},{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = "IDoNotExist",
- .values[2] = NULL,
+ .values = { VALUE_CURRENT_VERSION, "IDoNotExist", NULL },
.num_values = 2,
.existing_value = false,
.error_message = NULL