diff options
| author | Evan Huus <eapache@gmail.com> | 2013-12-23 21:30:44 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-12-23 21:30:44 +0000 |
| commit | 0fc3f9c05c9d38050bff86df78194f6c6d552d2c (patch) | |
| tree | 8f18249e4e5c42ad0b7ce7364616b0c34899d49b | |
| parent | e8057786921920130dbcaef548b0f366654694ff (diff) | |
| download | wireshark-0fc3f9c05c9d38050bff86df78194f6c6d552d2c.tar.gz | |
Designated initializers are not standard C90, just list all the '-1's without
their field names.
svn path=/trunk/; revision=54424
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 69 |
1 files changed, 13 insertions, 56 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 0b0372c8df..471b771353 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -638,62 +638,19 @@ ssl_dissect_hash_alg_list(ssl_common_dissect_t *hf, tvbuff_t *tvb, proto_tree *t extern void ssl_dissect_hnd_cert_url(ssl_common_dissect_t *hf, tvbuff_t *tvb, proto_tree *tree, guint32 offset); -#define SSL_COMMON_LIST_T(name) \ -ssl_common_dissect_t name = { \ - .hf = { \ - .hs_exts_len = -1, \ - .hs_ext_alpn_len = -1, \ - .hs_ext_alpn_list = -1, \ - .hs_ext_alpn_str = -1, \ - .hs_ext_alpn_str_len = -1, \ - .hs_ext_cert_status_request_extensions_len = -1, \ - .hs_ext_cert_status_request_len = -1, \ - .hs_ext_cert_status_responder_id_list_len = -1, \ - .hs_ext_cert_status_type = -1, \ - .hs_ext_cert_url_item = -1, \ - .hs_ext_cert_url_padding = -1, \ - .hs_ext_cert_url_sha1 = -1, \ - .hs_ext_cert_url_type = -1, \ - .hs_ext_cert_url_url = -1, \ - .hs_ext_cert_url_url_hash_list_len = -1, \ - .hs_ext_cert_url_url_len = -1, \ - .hs_ext_data = -1, \ - .hs_ext_ec_point_format = -1, \ - .hs_ext_ec_point_formats_len = -1, \ - .hs_ext_elliptic_curve = -1, \ - .hs_ext_elliptic_curves = -1, \ - .hs_ext_elliptic_curves_len = -1, \ - .hs_ext_heartbeat_mode = -1, \ - .hs_ext_len = -1, \ - .hs_ext_npn_str = -1, \ - .hs_ext_npn_str_len = -1, \ - .hs_ext_reneg_info_len = -1, \ - .hs_ext_server_name = -1, \ - .hs_ext_server_name_len = -1, \ - .hs_ext_server_name_list_len = -1, \ - .hs_ext_server_name_type = -1, \ - .hs_ext_type = -1, \ - .hs_sig_hash_alg = -1, \ - .hs_sig_hash_alg_len = -1, \ - .hs_sig_hash_algs = -1, \ - .hs_sig_hash_hash = -1, \ - .hs_sig_hash_sig = -1, \ - }, \ - .ett = { \ - .hs_ext = -1, \ - .hs_ext_alpn = -1, \ - .hs_ext_curves = -1, \ - .hs_ext_curves_point_formats = -1, \ - .hs_ext_npn = -1, \ - .hs_ext_reneg_info = -1, \ - .hs_ext_server_name = -1, \ - .hs_sig_hash_alg = -1, \ - .hs_sig_hash_algs = -1, \ - .urlhash = -1, \ - }, \ - .ei = { \ - .hs_ext_cert_status_undecoded = EI_INIT, \ - }, \ +#define SSL_COMMON_LIST_T(name) \ +ssl_common_dissect_t name = { \ + /* hf */ { \ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ + -1, -1, -1, -1, -1, \ + }, \ + /* ett */ { \ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ + }, \ + /* ei */ { \ + EI_INIT, \ + }, \ } #define SSL_COMMON_HF_LIST(name, prefix) \ |