s4:torture: Use C99 initializers for level in smb2 dir test

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c
index 7da104b1ac4cfae04e4e75c9acbc679052287a02..eed70718021bd2ac139891a250f28668b5d40ec1 100644 (file)
--- a/source4/torture/smb2/dir.c
+++ b/source4/torture/smb2/dir.c
@@ -312,35 +312,59 @@ static struct {
        NTSTATUS status;
        union smb_search_data data;
 } levels[] = {
-       {"SMB2_FIND_DIRECTORY_INFO",
-        SMB2_FIND_DIRECTORY_INFO, RAW_SEARCH_DATA_DIRECTORY_INFO,
-        offsetof(union smb_search_data, directory_info.name.s),
-        offsetof(union smb_search_data, directory_info.file_index),
+       {
+               .name              = "SMB2_FIND_DIRECTORY_INFO",
+               .level             = SMB2_FIND_DIRECTORY_INFO,
+               .data_level        = RAW_SEARCH_DATA_DIRECTORY_INFO,
+               .name_offset       = offsetof(union smb_search_data,
+                                             directory_info.name.s),
+               .resume_key_offset = offsetof(union smb_search_data,
+                                             directory_info.file_index),
        },
-       {"SMB2_FIND_FULL_DIRECTORY_INFO",
-        SMB2_FIND_FULL_DIRECTORY_INFO, RAW_SEARCH_DATA_FULL_DIRECTORY_INFO,
-        offsetof(union smb_search_data, full_directory_info.name.s),
-        offsetof(union smb_search_data, full_directory_info.file_index),
+       {
+               .name              = "SMB2_FIND_FULL_DIRECTORY_INFO",
+               .level             = SMB2_FIND_FULL_DIRECTORY_INFO,
+               .data_level        = RAW_SEARCH_DATA_FULL_DIRECTORY_INFO,
+               .name_offset       = offsetof(union smb_search_data,
+                                             full_directory_info.name.s),
+               .resume_key_offset = offsetof(union smb_search_data,
+                                             full_directory_info.file_index),
        },
-       {"SMB2_FIND_NAME_INFO",
-        SMB2_FIND_NAME_INFO, RAW_SEARCH_DATA_NAME_INFO,
-        offsetof(union smb_search_data, name_info.name.s),
-        offsetof(union smb_search_data, name_info.file_index),
+       {
+               .name              = "SMB2_FIND_NAME_INFO",
+               .level             = SMB2_FIND_NAME_INFO,
+               .data_level        = RAW_SEARCH_DATA_NAME_INFO,
+               .name_offset       = offsetof(union smb_search_data,
+                                             name_info.name.s),
+               .resume_key_offset = offsetof(union smb_search_data,
+                                             name_info.file_index),
        },
-       {"SMB2_FIND_BOTH_DIRECTORY_INFO",
-        SMB2_FIND_BOTH_DIRECTORY_INFO, RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
-        offsetof(union smb_search_data, both_directory_info.name.s),
-        offsetof(union smb_search_data, both_directory_info.file_index),
+       {
+               .name              = "SMB2_FIND_BOTH_DIRECTORY_INFO",
+               .level             = SMB2_FIND_BOTH_DIRECTORY_INFO,
+               .data_level        = RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
+               .name_offset       = offsetof(union smb_search_data,
+                                             both_directory_info.name.s),
+               .resume_key_offset = offsetof(union smb_search_data,
+                                             both_directory_info.file_index),
        },
-       {"SMB2_FIND_ID_FULL_DIRECTORY_INFO",
-        SMB2_FIND_ID_FULL_DIRECTORY_INFO, RAW_SEARCH_DATA_ID_FULL_DIRECTORY_INFO,
-        offsetof(union smb_search_data, id_full_directory_info.name.s),
-        offsetof(union smb_search_data, id_full_directory_info.file_index),
+       {
+               .name              = "SMB2_FIND_ID_FULL_DIRECTORY_INFO",
+               .level             = SMB2_FIND_ID_FULL_DIRECTORY_INFO,
+               .data_level        = RAW_SEARCH_DATA_ID_FULL_DIRECTORY_INFO,
+               .name_offset       = offsetof(union smb_search_data,
+                                             id_full_directory_info.name.s),
+               .resume_key_offset = offsetof(union smb_search_data,
+                                             id_full_directory_info.file_index),
        },
-       {"SMB2_FIND_ID_BOTH_DIRECTORY_INFO",
-        SMB2_FIND_ID_BOTH_DIRECTORY_INFO, RAW_SEARCH_DATA_ID_BOTH_DIRECTORY_INFO,
-        offsetof(union smb_search_data, id_both_directory_info.name.s),
-        offsetof(union smb_search_data, id_both_directory_info.file_index),
+       {
+               .name              = "SMB2_FIND_ID_BOTH_DIRECTORY_INFO",
+               .level             = SMB2_FIND_ID_BOTH_DIRECTORY_INFO,
+               .data_level        = RAW_SEARCH_DATA_ID_BOTH_DIRECTORY_INFO,
+               .name_offset       = offsetof(union smb_search_data,
+                                             id_both_directory_info.name.s),
+               .resume_key_offset = offsetof(union smb_search_data,
+                                             id_both_directory_info.file_index),
        }
 };