tools: Initialize static proto values

Update tools to not initialize static proto values to -1.
This will update dissectors for asterix, ncp2222 and x11.

1 files changed, 562 insertions, 562 deletions

diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index f14d0c5c7c..1eb7aa3280 100755
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -324,7 +324,7 @@ class PTVCBitfield(PTVC):
 
     def Code(self):
         ett_name = self.ETTName()
-        x = "static int %s = -1;\n" % (ett_name,)
+        x = "static int %s;\n" % (ett_name,)
 
         x = x + "static const ptvc_record ptvc_%s[] = {\n" % (self.Name())
         for ptvc_rec in self.list:
@@ -884,7 +884,7 @@ class struct(PTVC, Type):
 
     def Code(self):
         ett_name = self.ETTName()
-        x = "static int %s = -1;\n" % (ett_name,)
+        x = "static int %s;\n" % (ett_name,)
         x = x + "static const ptvc_record ptvc_%s[] = {\n" % (self.name,)
         for ptvc_rec in self.list:
             x = x +  "    %s,\n" % (ptvc_rec.Code())
@@ -5957,565 +5957,565 @@ static int ptvc_struct_int_storage;
 #define NREV    0x00000004
 #define NFLAGS  0x00000008
 
-static int hf_ncp_number_of_data_streams_long = -1;
-static int hf_ncp_func = -1;
-static int hf_ncp_length = -1;
-static int hf_ncp_subfunc = -1;
-static int hf_ncp_group = -1;
-static int hf_ncp_fragment_handle = -1;
-static int hf_ncp_completion_code = -1;
-static int hf_ncp_connection_status = -1;
-static int hf_ncp_req_frame_num = -1;
-static int hf_ncp_req_frame_time = -1;
-static int hf_ncp_fragment_size = -1;
-static int hf_ncp_message_size = -1;
-static int hf_ncp_nds_flag = -1;
-static int hf_ncp_nds_verb = -1;
-static int hf_ping_version = -1;
-/* static int hf_nds_version = -1; */
-/* static int hf_nds_flags = -1; */
-static int hf_nds_reply_depth = -1;
-static int hf_nds_reply_rev = -1;
-static int hf_nds_reply_flags = -1;
-static int hf_nds_p1type = -1;
-static int hf_nds_uint32value = -1;
-static int hf_nds_bit1 = -1;
-static int hf_nds_bit2 = -1;
-static int hf_nds_bit3 = -1;
-static int hf_nds_bit4 = -1;
-static int hf_nds_bit5 = -1;
-static int hf_nds_bit6 = -1;
-static int hf_nds_bit7 = -1;
-static int hf_nds_bit8 = -1;
-static int hf_nds_bit9 = -1;
-static int hf_nds_bit10 = -1;
-static int hf_nds_bit11 = -1;
-static int hf_nds_bit12 = -1;
-static int hf_nds_bit13 = -1;
-static int hf_nds_bit14 = -1;
-static int hf_nds_bit15 = -1;
-static int hf_nds_bit16 = -1;
-static int hf_outflags = -1;
-static int hf_bit1outflags = -1;
-static int hf_bit2outflags = -1;
-static int hf_bit3outflags = -1;
-static int hf_bit4outflags = -1;
-static int hf_bit5outflags = -1;
-static int hf_bit6outflags = -1;
-static int hf_bit7outflags = -1;
-static int hf_bit8outflags = -1;
-static int hf_bit9outflags = -1;
-static int hf_bit10outflags = -1;
-static int hf_bit11outflags = -1;
-static int hf_bit12outflags = -1;
-static int hf_bit13outflags = -1;
-static int hf_bit14outflags = -1;
-static int hf_bit15outflags = -1;
-static int hf_bit16outflags = -1;
-static int hf_bit1nflags = -1;
-static int hf_bit2nflags = -1;
-static int hf_bit3nflags = -1;
-static int hf_bit4nflags = -1;
-static int hf_bit5nflags = -1;
-static int hf_bit6nflags = -1;
-static int hf_bit7nflags = -1;
-static int hf_bit8nflags = -1;
-static int hf_bit9nflags = -1;
-static int hf_bit10nflags = -1;
-static int hf_bit11nflags = -1;
-static int hf_bit12nflags = -1;
-static int hf_bit13nflags = -1;
-static int hf_bit14nflags = -1;
-static int hf_bit15nflags = -1;
-static int hf_bit16nflags = -1;
-static int hf_bit1rflags = -1;
-static int hf_bit2rflags = -1;
-static int hf_bit3rflags = -1;
-static int hf_bit4rflags = -1;
-static int hf_bit5rflags = -1;
-static int hf_bit6rflags = -1;
-static int hf_bit7rflags = -1;
-static int hf_bit8rflags = -1;
-static int hf_bit9rflags = -1;
-static int hf_bit10rflags = -1;
-static int hf_bit11rflags = -1;
-static int hf_bit12rflags = -1;
-static int hf_bit13rflags = -1;
-static int hf_bit14rflags = -1;
-static int hf_bit15rflags = -1;
-static int hf_bit16rflags = -1;
-static int hf_cflags = -1;
-static int hf_bit1cflags = -1;
-static int hf_bit2cflags = -1;
-static int hf_bit3cflags = -1;
-static int hf_bit4cflags = -1;
-static int hf_bit5cflags = -1;
-static int hf_bit6cflags = -1;
-static int hf_bit7cflags = -1;
-static int hf_bit8cflags = -1;
-static int hf_bit9cflags = -1;
-static int hf_bit10cflags = -1;
-static int hf_bit11cflags = -1;
-static int hf_bit12cflags = -1;
-static int hf_bit13cflags = -1;
-static int hf_bit14cflags = -1;
-static int hf_bit15cflags = -1;
-static int hf_bit16cflags = -1;
-static int hf_bit1acflags = -1;
-static int hf_bit2acflags = -1;
-static int hf_bit3acflags = -1;
-static int hf_bit4acflags = -1;
-static int hf_bit5acflags = -1;
-static int hf_bit6acflags = -1;
-static int hf_bit7acflags = -1;
-static int hf_bit8acflags = -1;
-static int hf_bit9acflags = -1;
-static int hf_bit10acflags = -1;
-static int hf_bit11acflags = -1;
-static int hf_bit12acflags = -1;
-static int hf_bit13acflags = -1;
-static int hf_bit14acflags = -1;
-static int hf_bit15acflags = -1;
-static int hf_bit16acflags = -1;
-static int hf_vflags = -1;
-static int hf_bit1vflags = -1;
-static int hf_bit2vflags = -1;
-static int hf_bit3vflags = -1;
-static int hf_bit4vflags = -1;
-static int hf_bit5vflags = -1;
-static int hf_bit6vflags = -1;
-static int hf_bit7vflags = -1;
-static int hf_bit8vflags = -1;
-static int hf_bit9vflags = -1;
-static int hf_bit10vflags = -1;
-static int hf_bit11vflags = -1;
-static int hf_bit12vflags = -1;
-static int hf_bit13vflags = -1;
-static int hf_bit14vflags = -1;
-static int hf_bit15vflags = -1;
-static int hf_bit16vflags = -1;
-static int hf_eflags = -1;
-static int hf_bit1eflags = -1;
-static int hf_bit2eflags = -1;
-static int hf_bit3eflags = -1;
-static int hf_bit4eflags = -1;
-static int hf_bit5eflags = -1;
-static int hf_bit6eflags = -1;
-static int hf_bit7eflags = -1;
-static int hf_bit8eflags = -1;
-static int hf_bit9eflags = -1;
-static int hf_bit10eflags = -1;
-static int hf_bit11eflags = -1;
-static int hf_bit12eflags = -1;
-static int hf_bit13eflags = -1;
-static int hf_bit14eflags = -1;
-static int hf_bit15eflags = -1;
-static int hf_bit16eflags = -1;
-static int hf_infoflagsl = -1;
-static int hf_retinfoflagsl = -1;
-static int hf_bit1infoflagsl = -1;
-static int hf_bit2infoflagsl = -1;
-static int hf_bit3infoflagsl = -1;
-static int hf_bit4infoflagsl = -1;
-static int hf_bit5infoflagsl = -1;
-static int hf_bit6infoflagsl = -1;
-static int hf_bit7infoflagsl = -1;
-static int hf_bit8infoflagsl = -1;
-static int hf_bit9infoflagsl = -1;
-static int hf_bit10infoflagsl = -1;
-static int hf_bit11infoflagsl = -1;
-static int hf_bit12infoflagsl = -1;
-static int hf_bit13infoflagsl = -1;
-static int hf_bit14infoflagsl = -1;
-static int hf_bit15infoflagsl = -1;
-static int hf_bit16infoflagsl = -1;
-static int hf_infoflagsh = -1;
-static int hf_bit1infoflagsh = -1;
-static int hf_bit2infoflagsh = -1;
-static int hf_bit3infoflagsh = -1;
-static int hf_bit4infoflagsh = -1;
-static int hf_bit5infoflagsh = -1;
-static int hf_bit6infoflagsh = -1;
-static int hf_bit7infoflagsh = -1;
-static int hf_bit8infoflagsh = -1;
-static int hf_bit9infoflagsh = -1;
-static int hf_bit10infoflagsh = -1;
-static int hf_bit11infoflagsh = -1;
-static int hf_bit12infoflagsh = -1;
-static int hf_bit13infoflagsh = -1;
-static int hf_bit14infoflagsh = -1;
-static int hf_bit15infoflagsh = -1;
-static int hf_bit16infoflagsh = -1;
-static int hf_retinfoflagsh = -1;
-static int hf_bit1retinfoflagsh = -1;
-static int hf_bit2retinfoflagsh = -1;
-static int hf_bit3retinfoflagsh = -1;
-static int hf_bit4retinfoflagsh = -1;
-static int hf_bit5retinfoflagsh = -1;
-static int hf_bit6retinfoflagsh = -1;
-static int hf_bit7retinfoflagsh = -1;
-static int hf_bit8retinfoflagsh = -1;
-static int hf_bit9retinfoflagsh = -1;
-static int hf_bit10retinfoflagsh = -1;
-static int hf_bit11retinfoflagsh = -1;
-static int hf_bit12retinfoflagsh = -1;
-static int hf_bit13retinfoflagsh = -1;
-static int hf_bit14retinfoflagsh = -1;
-static int hf_bit15retinfoflagsh = -1;
-static int hf_bit16retinfoflagsh = -1;
-static int hf_bit1lflags = -1;
-static int hf_bit2lflags = -1;
-static int hf_bit3lflags = -1;
-static int hf_bit4lflags = -1;
-static int hf_bit5lflags = -1;
-static int hf_bit6lflags = -1;
-static int hf_bit7lflags = -1;
-static int hf_bit8lflags = -1;
-static int hf_bit9lflags = -1;
-static int hf_bit10lflags = -1;
-static int hf_bit11lflags = -1;
-static int hf_bit12lflags = -1;
-static int hf_bit13lflags = -1;
-static int hf_bit14lflags = -1;
-static int hf_bit15lflags = -1;
-static int hf_bit16lflags = -1;
-static int hf_l1flagsl = -1;
-static int hf_l1flagsh = -1;
-static int hf_bit1l1flagsl = -1;
-static int hf_bit2l1flagsl = -1;
-static int hf_bit3l1flagsl = -1;
-static int hf_bit4l1flagsl = -1;
-static int hf_bit5l1flagsl = -1;
-static int hf_bit6l1flagsl = -1;
-static int hf_bit7l1flagsl = -1;
-static int hf_bit8l1flagsl = -1;
-static int hf_bit9l1flagsl = -1;
-static int hf_bit10l1flagsl = -1;
-static int hf_bit11l1flagsl = -1;
-static int hf_bit12l1flagsl = -1;
-static int hf_bit13l1flagsl = -1;
-static int hf_bit14l1flagsl = -1;
-static int hf_bit15l1flagsl = -1;
-static int hf_bit16l1flagsl = -1;
-static int hf_bit1l1flagsh = -1;
-static int hf_bit2l1flagsh = -1;
-static int hf_bit3l1flagsh = -1;
-static int hf_bit4l1flagsh = -1;
-static int hf_bit5l1flagsh = -1;
-static int hf_bit6l1flagsh = -1;
-static int hf_bit7l1flagsh = -1;
-static int hf_bit8l1flagsh = -1;
-static int hf_bit9l1flagsh = -1;
-static int hf_bit10l1flagsh = -1;
-static int hf_bit11l1flagsh = -1;
-static int hf_bit12l1flagsh = -1;
-static int hf_bit13l1flagsh = -1;
-static int hf_bit14l1flagsh = -1;
-static int hf_bit15l1flagsh = -1;
-static int hf_bit16l1flagsh = -1;
-static int hf_nds_tree_name = -1;
-static int hf_nds_reply_error = -1;
-static int hf_nds_net = -1;
-static int hf_nds_node = -1;
-static int hf_nds_socket = -1;
-static int hf_add_ref_ip = -1;
-static int hf_add_ref_udp = -1;
-static int hf_add_ref_tcp = -1;
-static int hf_referral_record = -1;
-static int hf_referral_addcount = -1;
-static int hf_nds_port = -1;
-static int hf_mv_string = -1;
-static int hf_nds_syntax = -1;
-static int hf_value_string = -1;
-static int hf_nds_buffer_size = -1;
-static int hf_nds_ver = -1;
-static int hf_nds_nflags = -1;
-static int hf_nds_scope = -1;
-static int hf_nds_name = -1;
-static int hf_nds_comm_trans = -1;
-static int hf_nds_tree_trans = -1;
-static int hf_nds_iteration = -1;
-static int hf_nds_eid = -1;
-static int hf_nds_info_type = -1;
-static int hf_nds_all_attr = -1;
-static int hf_nds_req_flags = -1;
-static int hf_nds_attr = -1;
-static int hf_nds_crc = -1;
-static int hf_nds_referrals = -1;
-static int hf_nds_result_flags = -1;
-static int hf_nds_tag_string = -1;
-static int hf_value_bytes = -1;
-static int hf_replica_type = -1;
-static int hf_replica_state = -1;
-static int hf_replica_number = -1;
-static int hf_min_nds_ver = -1;
-static int hf_nds_ver_include = -1;
-static int hf_nds_ver_exclude = -1;
-/* static int hf_nds_es = -1; */
-static int hf_es_type = -1;
-/* static int hf_delim_string = -1; */
-static int hf_rdn_string = -1;
-static int hf_nds_revent = -1;
-static int hf_nds_rnum = -1;
-static int hf_nds_name_type = -1;
-static int hf_nds_rflags = -1;
-static int hf_nds_eflags = -1;
-static int hf_nds_depth = -1;
-static int hf_nds_class_def_type = -1;
-static int hf_nds_classes = -1;
-static int hf_nds_return_all_classes = -1;
-static int hf_nds_stream_flags = -1;
-static int hf_nds_stream_name = -1;
-static int hf_nds_file_handle = -1;
-static int hf_nds_file_size = -1;
-static int hf_nds_dn_output_type = -1;
-static int hf_nds_nested_output_type = -1;
-static int hf_nds_output_delimiter = -1;
-static int hf_nds_output_entry_specifier = -1;
-static int hf_es_value = -1;
-static int hf_es_rdn_count = -1;
-static int hf_nds_replica_num = -1;
-static int hf_nds_event_num = -1;
-static int hf_es_seconds = -1;
-static int hf_nds_compare_results = -1;
-static int hf_nds_parent = -1;
-static int hf_nds_name_filter = -1;
-static int hf_nds_class_filter = -1;
-static int hf_nds_time_filter = -1;
-static int hf_nds_partition_root_id = -1;
-static int hf_nds_replicas = -1;
-static int hf_nds_purge = -1;
-static int hf_nds_local_partition = -1;
-static int hf_partition_busy = -1;
-static int hf_nds_number_of_changes = -1;
-static int hf_sub_count = -1;
-static int hf_nds_revision = -1;
-static int hf_nds_base_class = -1;
-static int hf_nds_relative_dn = -1;
-/* static int hf_nds_root_dn = -1; */
-/* static int hf_nds_parent_dn = -1; */
-static int hf_deref_base = -1;
-/* static int hf_nds_entry_info = -1; */
-static int hf_nds_base = -1;
-static int hf_nds_privileges = -1;
-static int hf_nds_vflags = -1;
-static int hf_nds_value_len = -1;
-static int hf_nds_cflags = -1;
-static int hf_nds_acflags = -1;
-static int hf_nds_asn1 = -1;
-static int hf_nds_upper = -1;
-static int hf_nds_lower = -1;
-static int hf_nds_trustee_dn = -1;
-static int hf_nds_attribute_dn = -1;
-static int hf_nds_acl_add = -1;
-static int hf_nds_acl_del = -1;
-static int hf_nds_att_add = -1;
-static int hf_nds_att_del = -1;
-static int hf_nds_keep = -1;
-static int hf_nds_new_rdn = -1;
-static int hf_nds_time_delay = -1;
-static int hf_nds_root_name = -1;
-static int hf_nds_new_part_id = -1;
-static int hf_nds_child_part_id = -1;
-static int hf_nds_master_part_id = -1;
-static int hf_nds_target_name = -1;
-static int hf_nds_super = -1;
-static int hf_pingflags2 = -1;
-static int hf_bit1pingflags2 = -1;
-static int hf_bit2pingflags2 = -1;
-static int hf_bit3pingflags2 = -1;
-static int hf_bit4pingflags2 = -1;
-static int hf_bit5pingflags2 = -1;
-static int hf_bit6pingflags2 = -1;
-static int hf_bit7pingflags2 = -1;
-static int hf_bit8pingflags2 = -1;
-static int hf_bit9pingflags2 = -1;
-static int hf_bit10pingflags2 = -1;
-static int hf_bit11pingflags2 = -1;
-static int hf_bit12pingflags2 = -1;
-static int hf_bit13pingflags2 = -1;
-static int hf_bit14pingflags2 = -1;
-static int hf_bit15pingflags2 = -1;
-static int hf_bit16pingflags2 = -1;
-static int hf_pingflags1 = -1;
-static int hf_bit1pingflags1 = -1;
-static int hf_bit2pingflags1 = -1;
-static int hf_bit3pingflags1 = -1;
-static int hf_bit4pingflags1 = -1;
-static int hf_bit5pingflags1 = -1;
-static int hf_bit6pingflags1 = -1;
-static int hf_bit7pingflags1 = -1;
-static int hf_bit8pingflags1 = -1;
-static int hf_bit9pingflags1 = -1;
-static int hf_bit10pingflags1 = -1;
-static int hf_bit11pingflags1 = -1;
-static int hf_bit12pingflags1 = -1;
-static int hf_bit13pingflags1 = -1;
-static int hf_bit14pingflags1 = -1;
-static int hf_bit15pingflags1 = -1;
-static int hf_bit16pingflags1 = -1;
-static int hf_pingpflags1 = -1;
-static int hf_bit1pingpflags1 = -1;
-static int hf_bit2pingpflags1 = -1;
-static int hf_bit3pingpflags1 = -1;
-static int hf_bit4pingpflags1 = -1;
-static int hf_bit5pingpflags1 = -1;
-static int hf_bit6pingpflags1 = -1;
-static int hf_bit7pingpflags1 = -1;
-static int hf_bit8pingpflags1 = -1;
-static int hf_bit9pingpflags1 = -1;
-static int hf_bit10pingpflags1 = -1;
-static int hf_bit11pingpflags1 = -1;
-static int hf_bit12pingpflags1 = -1;
-static int hf_bit13pingpflags1 = -1;
-static int hf_bit14pingpflags1 = -1;
-static int hf_bit15pingpflags1 = -1;
-static int hf_bit16pingpflags1 = -1;
-static int hf_pingvflags1 = -1;
-static int hf_bit1pingvflags1 = -1;
-static int hf_bit2pingvflags1 = -1;
-static int hf_bit3pingvflags1 = -1;
-static int hf_bit4pingvflags1 = -1;
-static int hf_bit5pingvflags1 = -1;
-static int hf_bit6pingvflags1 = -1;
-static int hf_bit7pingvflags1 = -1;
-static int hf_bit8pingvflags1 = -1;
-static int hf_bit9pingvflags1 = -1;
-static int hf_bit10pingvflags1 = -1;
-static int hf_bit11pingvflags1 = -1;
-static int hf_bit12pingvflags1 = -1;
-static int hf_bit13pingvflags1 = -1;
-static int hf_bit14pingvflags1 = -1;
-static int hf_bit15pingvflags1 = -1;
-static int hf_bit16pingvflags1 = -1;
-static int hf_nds_letter_ver = -1;
-static int hf_nds_os_majver = -1;
-static int hf_nds_os_minver = -1;
-static int hf_nds_lic_flags = -1;
-static int hf_nds_ds_time = -1;
-static int hf_nds_ping_version = -1;
-static int hf_nds_search_scope = -1;
-static int hf_nds_num_objects = -1;
-static int hf_siflags = -1;
-static int hf_bit1siflags = -1;
-static int hf_bit2siflags = -1;
-static int hf_bit3siflags = -1;
-static int hf_bit4siflags = -1;
-static int hf_bit5siflags = -1;
-static int hf_bit6siflags = -1;
-static int hf_bit7siflags = -1;
-static int hf_bit8siflags = -1;
-static int hf_bit9siflags = -1;
-static int hf_bit10siflags = -1;
-static int hf_bit11siflags = -1;
-static int hf_bit12siflags = -1;
-static int hf_bit13siflags = -1;
-static int hf_bit14siflags = -1;
-static int hf_bit15siflags = -1;
-static int hf_bit16siflags = -1;
-static int hf_nds_segments = -1;
-static int hf_nds_segment = -1;
-static int hf_nds_segment_overlap = -1;
-static int hf_nds_segment_overlap_conflict = -1;
-static int hf_nds_segment_multiple_tails = -1;
-static int hf_nds_segment_too_long_segment = -1;
-static int hf_nds_segment_error = -1;
-static int hf_nds_segment_count = -1;
-static int hf_nds_reassembled_length = -1;
-static int hf_nds_verb2b_req_flags = -1;
-static int hf_ncp_ip_address = -1;
-static int hf_ncp_copyright = -1;
-static int hf_ndsprot1flag = -1;
-static int hf_ndsprot2flag = -1;
-static int hf_ndsprot3flag = -1;
-static int hf_ndsprot4flag = -1;
-static int hf_ndsprot5flag = -1;
-static int hf_ndsprot6flag = -1;
-static int hf_ndsprot7flag = -1;
-static int hf_ndsprot8flag = -1;
-static int hf_ndsprot9flag = -1;
-static int hf_ndsprot10flag = -1;
-static int hf_ndsprot11flag = -1;
-static int hf_ndsprot12flag = -1;
-static int hf_ndsprot13flag = -1;
-static int hf_ndsprot14flag = -1;
-static int hf_ndsprot15flag = -1;
-static int hf_ndsprot16flag = -1;
-static int hf_nds_svr_dst_name = -1;
-static int hf_nds_tune_mark = -1;
-/* static int hf_nds_create_time = -1; */
-static int hf_srvr_param_number = -1;
-static int hf_srvr_param_boolean = -1;
-static int hf_srvr_param_string = -1;
-static int hf_nds_svr_time = -1;
-static int hf_nds_crt_time = -1;
-static int hf_nds_number_of_items = -1;
-static int hf_nds_compare_attributes = -1;
-static int hf_nds_read_attribute = -1;
-static int hf_nds_write_add_delete_attribute = -1;
-static int hf_nds_add_delete_self = -1;
-static int hf_nds_privilege_not_defined = -1;
-static int hf_nds_supervisor = -1;
-static int hf_nds_inheritance_control = -1;
-static int hf_nds_browse_entry = -1;
-static int hf_nds_add_entry = -1;
-static int hf_nds_delete_entry = -1;
-static int hf_nds_rename_entry = -1;
-static int hf_nds_supervisor_entry = -1;
-static int hf_nds_entry_privilege_not_defined = -1;
-static int hf_nds_iterator = -1;
-static int hf_ncp_nds_iterverb = -1;
-static int hf_iter_completion_code = -1;
-/* static int hf_nds_iterobj = -1; */
-static int hf_iter_verb_completion_code = -1;
-static int hf_iter_ans = -1;
-static int hf_positionable = -1;
-static int hf_num_skipped = -1;
-static int hf_num_to_skip = -1;
-static int hf_timelimit = -1;
-static int hf_iter_index = -1;
-static int hf_num_to_get = -1;
-/* static int hf_ret_info_type = -1; */
-static int hf_data_size = -1;
-static int hf_this_count = -1;
-static int hf_max_entries = -1;
-static int hf_move_position = -1;
-static int hf_iter_copy = -1;
-static int hf_iter_position = -1;
-static int hf_iter_search = -1;
-static int hf_iter_other = -1;
-static int hf_nds_oid = -1;
-static int hf_ncp_bytes_actually_trans_64 = -1;
-static int hf_sap_name = -1;
-static int hf_os_name = -1;
-static int hf_vendor_name = -1;
-static int hf_hardware_name = -1;
-static int hf_no_request_record_found = -1;
-static int hf_search_modifier = -1;
-static int hf_search_pattern = -1;
-static int hf_nds_acl_protected_attribute = -1;
-static int hf_nds_acl_subject = -1;
-static int hf_nds_acl_privileges = -1;
-
-static expert_field ei_ncp_file_rights_change = EI_INIT;
-static expert_field ei_ncp_completion_code = EI_INIT;
-static expert_field ei_nds_reply_error = EI_INIT;
-static expert_field ei_ncp_destroy_connection = EI_INIT;
-static expert_field ei_nds_iteration = EI_INIT;
-static expert_field ei_ncp_eid = EI_INIT;
-static expert_field ei_ncp_file_handle = EI_INIT;
-static expert_field ei_ncp_connection_destroyed = EI_INIT;
-static expert_field ei_ncp_no_request_record_found = EI_INIT;
-static expert_field ei_ncp_file_rights = EI_INIT;
-static expert_field ei_iter_verb_completion_code = EI_INIT;
-static expert_field ei_ncp_connection_request = EI_INIT;
-static expert_field ei_ncp_connection_status = EI_INIT;
-static expert_field ei_ncp_op_lock_handle = EI_INIT;
-static expert_field ei_ncp_effective_rights = EI_INIT;
-static expert_field ei_ncp_server = EI_INIT;
-static expert_field ei_ncp_invalid_offset = EI_INIT;
-static expert_field ei_ncp_address_type = EI_INIT;
-static expert_field ei_ncp_value_too_large = EI_INIT;
+static int hf_ncp_number_of_data_streams_long;
+static int hf_ncp_func;
+static int hf_ncp_length;
+static int hf_ncp_subfunc;
+static int hf_ncp_group;
+static int hf_ncp_fragment_handle;
+static int hf_ncp_completion_code;
+static int hf_ncp_connection_status;
+static int hf_ncp_req_frame_num;
+static int hf_ncp_req_frame_time;
+static int hf_ncp_fragment_size;
+static int hf_ncp_message_size;
+static int hf_ncp_nds_flag;
+static int hf_ncp_nds_verb;
+static int hf_ping_version;
+/* static int hf_nds_version; */
+/* static int hf_nds_flags; */
+static int hf_nds_reply_depth;
+static int hf_nds_reply_rev;
+static int hf_nds_reply_flags;
+static int hf_nds_p1type;
+static int hf_nds_uint32value;
+static int hf_nds_bit1;
+static int hf_nds_bit2;
+static int hf_nds_bit3;
+static int hf_nds_bit4;
+static int hf_nds_bit5;
+static int hf_nds_bit6;
+static int hf_nds_bit7;
+static int hf_nds_bit8;
+static int hf_nds_bit9;
+static int hf_nds_bit10;
+static int hf_nds_bit11;
+static int hf_nds_bit12;
+static int hf_nds_bit13;
+static int hf_nds_bit14;
+static int hf_nds_bit15;
+static int hf_nds_bit16;
+static int hf_outflags;
+static int hf_bit1outflags;
+static int hf_bit2outflags;
+static int hf_bit3outflags;
+static int hf_bit4outflags;
+static int hf_bit5outflags;
+static int hf_bit6outflags;
+static int hf_bit7outflags;
+static int hf_bit8outflags;
+static int hf_bit9outflags;
+static int hf_bit10outflags;
+static int hf_bit11outflags;
+static int hf_bit12outflags;
+static int hf_bit13outflags;
+static int hf_bit14outflags;
+static int hf_bit15outflags;
+static int hf_bit16outflags;
+static int hf_bit1nflags;
+static int hf_bit2nflags;
+static int hf_bit3nflags;
+static int hf_bit4nflags;
+static int hf_bit5nflags;
+static int hf_bit6nflags;
+static int hf_bit7nflags;
+static int hf_bit8nflags;
+static int hf_bit9nflags;
+static int hf_bit10nflags;
+static int hf_bit11nflags;
+static int hf_bit12nflags;
+static int hf_bit13nflags;
+static int hf_bit14nflags;
+static int hf_bit15nflags;
+static int hf_bit16nflags;
+static int hf_bit1rflags;
+static int hf_bit2rflags;
+static int hf_bit3rflags;
+static int hf_bit4rflags;
+static int hf_bit5rflags;
+static int hf_bit6rflags;
+static int hf_bit7rflags;
+static int hf_bit8rflags;
+static int hf_bit9rflags;
+static int hf_bit10rflags;
+static int hf_bit11rflags;
+static int hf_bit12rflags;
+static int hf_bit13rflags;
+static int hf_bit14rflags;
+static int hf_bit15rflags;
+static int hf_bit16rflags;
+static int hf_cflags;
+static int hf_bit1cflags;
+static int hf_bit2cflags;
+static int hf_bit3cflags;
+static int hf_bit4cflags;
+static int hf_bit5cflags;
+static int hf_bit6cflags;
+static int hf_bit7cflags;
+static int hf_bit8cflags;
+static int hf_bit9cflags;
+static int hf_bit10cflags;
+static int hf_bit11cflags;
+static int hf_bit12cflags;
+static int hf_bit13cflags;
+static int hf_bit14cflags;
+static int hf_bit15cflags;
+static int hf_bit16cflags;
+static int hf_bit1acflags;
+static int hf_bit2acflags;
+static int hf_bit3acflags;
+static int hf_bit4acflags;
+static int hf_bit5acflags;
+static int hf_bit6acflags;
+static int hf_bit7acflags;
+static int hf_bit8acflags;
+static int hf_bit9acflags;
+static int hf_bit10acflags;
+static int hf_bit11acflags;
+static int hf_bit12acflags;
+static int hf_bit13acflags;
+static int hf_bit14acflags;
+static int hf_bit15acflags;
+static int hf_bit16acflags;
+static int hf_vflags;
+static int hf_bit1vflags;
+static int hf_bit2vflags;
+static int hf_bit3vflags;
+static int hf_bit4vflags;
+static int hf_bit5vflags;
+static int hf_bit6vflags;
+static int hf_bit7vflags;
+static int hf_bit8vflags;
+static int hf_bit9vflags;
+static int hf_bit10vflags;
+static int hf_bit11vflags;
+static int hf_bit12vflags;
+static int hf_bit13vflags;
+static int hf_bit14vflags;
+static int hf_bit15vflags;
+static int hf_bit16vflags;
+static int hf_eflags;
+static int hf_bit1eflags;
+static int hf_bit2eflags;
+static int hf_bit3eflags;
+static int hf_bit4eflags;
+static int hf_bit5eflags;
+static int hf_bit6eflags;
+static int hf_bit7eflags;
+static int hf_bit8eflags;
+static int hf_bit9eflags;
+static int hf_bit10eflags;
+static int hf_bit11eflags;
+static int hf_bit12eflags;
+static int hf_bit13eflags;
+static int hf_bit14eflags;
+static int hf_bit15eflags;
+static int hf_bit16eflags;
+static int hf_infoflagsl;
+static int hf_retinfoflagsl;
+static int hf_bit1infoflagsl;
+static int hf_bit2infoflagsl;
+static int hf_bit3infoflagsl;
+static int hf_bit4infoflagsl;
+static int hf_bit5infoflagsl;
+static int hf_bit6infoflagsl;
+static int hf_bit7infoflagsl;
+static int hf_bit8infoflagsl;
+static int hf_bit9infoflagsl;
+static int hf_bit10infoflagsl;
+static int hf_bit11infoflagsl;
+static int hf_bit12infoflagsl;
+static int hf_bit13infoflagsl;
+static int hf_bit14infoflagsl;
+static int hf_bit15infoflagsl;
+static int hf_bit16infoflagsl;
+static int hf_infoflagsh;
+static int hf_bit1infoflagsh;
+static int hf_bit2infoflagsh;
+static int hf_bit3infoflagsh;
+static int hf_bit4infoflagsh;
+static int hf_bit5infoflagsh;
+static int hf_bit6infoflagsh;
+static int hf_bit7infoflagsh;
+static int hf_bit8infoflagsh;
+static int hf_bit9infoflagsh;
+static int hf_bit10infoflagsh;
+static int hf_bit11infoflagsh;
+static int hf_bit12infoflagsh;
+static int hf_bit13infoflagsh;
+static int hf_bit14infoflagsh;
+static int hf_bit15infoflagsh;
+static int hf_bit16infoflagsh;
+static int hf_retinfoflagsh;
+static int hf_bit1retinfoflagsh;
+static int hf_bit2retinfoflagsh;
+static int hf_bit3retinfoflagsh;
+static int hf_bit4retinfoflagsh;
+static int hf_bit5retinfoflagsh;
+static int hf_bit6retinfoflagsh;
+static int hf_bit7retinfoflagsh;
+static int hf_bit8retinfoflagsh;
+static int hf_bit9retinfoflagsh;
+static int hf_bit10retinfoflagsh;
+static int hf_bit11retinfoflagsh;
+static int hf_bit12retinfoflagsh;
+static int hf_bit13retinfoflagsh;
+static int hf_bit14retinfoflagsh;
+static int hf_bit15retinfoflagsh;
+static int hf_bit16retinfoflagsh;
+static int hf_bit1lflags;
+static int hf_bit2lflags;
+static int hf_bit3lflags;
+static int hf_bit4lflags;
+static int hf_bit5lflags;
+static int hf_bit6lflags;
+static int hf_bit7lflags;
+static int hf_bit8lflags;
+static int hf_bit9lflags;
+static int hf_bit10lflags;
+static int hf_bit11lflags;
+static int hf_bit12lflags;
+static int hf_bit13lflags;
+static int hf_bit14lflags;
+static int hf_bit15lflags;
+static int hf_bit16lflags;
+static int hf_l1flagsl;
+static int hf_l1flagsh;
+static int hf_bit1l1flagsl;
+static int hf_bit2l1flagsl;
+static int hf_bit3l1flagsl;
+static int hf_bit4l1flagsl;
+static int hf_bit5l1flagsl;
+static int hf_bit6l1flagsl;
+static int hf_bit7l1flagsl;
+static int hf_bit8l1flagsl;
+static int hf_bit9l1flagsl;
+static int hf_bit10l1flagsl;
+static int hf_bit11l1flagsl;
+static int hf_bit12l1flagsl;
+static int hf_bit13l1flagsl;
+static int hf_bit14l1flagsl;
+static int hf_bit15l1flagsl;
+static int hf_bit16l1flagsl;
+static int hf_bit1l1flagsh;
+static int hf_bit2l1flagsh;
+static int hf_bit3l1flagsh;
+static int hf_bit4l1flagsh;
+static int hf_bit5l1flagsh;
+static int hf_bit6l1flagsh;
+static int hf_bit7l1flagsh;
+static int hf_bit8l1flagsh;
+static int hf_bit9l1flagsh;
+static int hf_bit10l1flagsh;
+static int hf_bit11l1flagsh;
+static int hf_bit12l1flagsh;
+static int hf_bit13l1flagsh;
+static int hf_bit14l1flagsh;
+static int hf_bit15l1flagsh;
+static int hf_bit16l1flagsh;
+static int hf_nds_tree_name;
+static int hf_nds_reply_error;
+static int hf_nds_net;
+static int hf_nds_node;
+static int hf_nds_socket;
+static int hf_add_ref_ip;
+static int hf_add_ref_udp;
+static int hf_add_ref_tcp;
+static int hf_referral_record;
+static int hf_referral_addcount;
+static int hf_nds_port;
+static int hf_mv_string;
+static int hf_nds_syntax;
+static int hf_value_string;
+static int hf_nds_buffer_size;
+static int hf_nds_ver;
+static int hf_nds_nflags;
+static int hf_nds_scope;
+static int hf_nds_name;
+static int hf_nds_comm_trans;
+static int hf_nds_tree_trans;
+static int hf_nds_iteration;
+static int hf_nds_eid;
+static int hf_nds_info_type;
+static int hf_nds_all_attr;
+static int hf_nds_req_flags;
+static int hf_nds_attr;
+static int hf_nds_crc;
+static int hf_nds_referrals;
+static int hf_nds_result_flags;
+static int hf_nds_tag_string;
+static int hf_value_bytes;
+static int hf_replica_type;
+static int hf_replica_state;
+static int hf_replica_number;
+static int hf_min_nds_ver;
+static int hf_nds_ver_include;
+static int hf_nds_ver_exclude;
+/* static int hf_nds_es; */
+static int hf_es_type;
+/* static int hf_delim_string; */
+static int hf_rdn_string;
+static int hf_nds_revent;
+static int hf_nds_rnum;
+static int hf_nds_name_type;
+static int hf_nds_rflags;
+static int hf_nds_eflags;
+static int hf_nds_depth;
+static int hf_nds_class_def_type;
+static int hf_nds_classes;
+static int hf_nds_return_all_classes;
+static int hf_nds_stream_flags;
+static int hf_nds_stream_name;
+static int hf_nds_file_handle;
+static int hf_nds_file_size;
+static int hf_nds_dn_output_type;
+static int hf_nds_nested_output_type;
+static int hf_nds_output_delimiter;
+static int hf_nds_output_entry_specifier;
+static int hf_es_value;
+static int hf_es_rdn_count;
+static int hf_nds_replica_num;
+static int hf_nds_event_num;
+static int hf_es_seconds;
+static int hf_nds_compare_results;
+static int hf_nds_parent;
+static int hf_nds_name_filter;
+static int hf_nds_class_filter;
+static int hf_nds_time_filter;
+static int hf_nds_partition_root_id;
+static int hf_nds_replicas;
+static int hf_nds_purge;
+static int hf_nds_local_partition;
+static int hf_partition_busy;
+static int hf_nds_number_of_changes;
+static int hf_sub_count;
+static int hf_nds_revision;
+static int hf_nds_base_class;
+static int hf_nds_relative_dn;
+/* static int hf_nds_root_dn; */
+/* static int hf_nds_parent_dn; */
+static int hf_deref_base;
+/* static int hf_nds_entry_info; */
+static int hf_nds_base;
+static int hf_nds_privileges;
+static int hf_nds_vflags;
+static int hf_nds_value_len;
+static int hf_nds_cflags;
+static int hf_nds_acflags;
+static int hf_nds_asn1;
+static int hf_nds_upper;
+static int hf_nds_lower;
+static int hf_nds_trustee_dn;
+static int hf_nds_attribute_dn;
+static int hf_nds_acl_add;
+static int hf_nds_acl_del;
+static int hf_nds_att_add;
+static int hf_nds_att_del;
+static int hf_nds_keep;
+static int hf_nds_new_rdn;
+static int hf_nds_time_delay;
+static int hf_nds_root_name;
+static int hf_nds_new_part_id;
+static int hf_nds_child_part_id;
+static int hf_nds_master_part_id;
+static int hf_nds_target_name;
+static int hf_nds_super;
+static int hf_pingflags2;
+static int hf_bit1pingflags2;
+static int hf_bit2pingflags2;
+static int hf_bit3pingflags2;
+static int hf_bit4pingflags2;
+static int hf_bit5pingflags2;
+static int hf_bit6pingflags2;
+static int hf_bit7pingflags2;
+static int hf_bit8pingflags2;
+static int hf_bit9pingflags2;
+static int hf_bit10pingflags2;
+static int hf_bit11pingflags2;
+static int hf_bit12pingflags2;
+static int hf_bit13pingflags2;
+static int hf_bit14pingflags2;
+static int hf_bit15pingflags2;
+static int hf_bit16pingflags2;
+static int hf_pingflags1;
+static int hf_bit1pingflags1;
+static int hf_bit2pingflags1;
+static int hf_bit3pingflags1;
+static int hf_bit4pingflags1;
+static int hf_bit5pingflags1;
+static int hf_bit6pingflags1;
+static int hf_bit7pingflags1;
+static int hf_bit8pingflags1;
+static int hf_bit9pingflags1;
+static int hf_bit10pingflags1;
+static int hf_bit11pingflags1;
+static int hf_bit12pingflags1;
+static int hf_bit13pingflags1;
+static int hf_bit14pingflags1;
+static int hf_bit15pingflags1;
+static int hf_bit16pingflags1;
+static int hf_pingpflags1;
+static int hf_bit1pingpflags1;
+static int hf_bit2pingpflags1;
+static int hf_bit3pingpflags1;
+static int hf_bit4pingpflags1;
+static int hf_bit5pingpflags1;
+static int hf_bit6pingpflags1;
+static int hf_bit7pingpflags1;
+static int hf_bit8pingpflags1;
+static int hf_bit9pingpflags1;
+static int hf_bit10pingpflags1;
+static int hf_bit11pingpflags1;
+static int hf_bit12pingpflags1;
+static int hf_bit13pingpflags1;
+static int hf_bit14pingpflags1;
+static int hf_bit15pingpflags1;
+static int hf_bit16pingpflags1;
+static int hf_pingvflags1;
+static int hf_bit1pingvflags1;
+static int hf_bit2pingvflags1;
+static int hf_bit3pingvflags1;
+static int hf_bit4pingvflags1;
+static int hf_bit5pingvflags1;
+static int hf_bit6pingvflags1;
+static int hf_bit7pingvflags1;
+static int hf_bit8pingvflags1;
+static int hf_bit9pingvflags1;
+static int hf_bit10pingvflags1;
+static int hf_bit11pingvflags1;
+static int hf_bit12pingvflags1;
+static int hf_bit13pingvflags1;
+static int hf_bit14pingvflags1;
+static int hf_bit15pingvflags1;
+static int hf_bit16pingvflags1;
+static int hf_nds_letter_ver;
+static int hf_nds_os_majver;
+static int hf_nds_os_minver;
+static int hf_nds_lic_flags;
+static int hf_nds_ds_time;
+static int hf_nds_ping_version;
+static int hf_nds_search_scope;
+static int hf_nds_num_objects;
+static int hf_siflags;
+static int hf_bit1siflags;
+static int hf_bit2siflags;
+static int hf_bit3siflags;
+static int hf_bit4siflags;
+static int hf_bit5siflags;
+static int hf_bit6siflags;
+static int hf_bit7siflags;
+static int hf_bit8siflags;
+static int hf_bit9siflags;
+static int hf_bit10siflags;
+static int hf_bit11siflags;
+static int hf_bit12siflags;
+static int hf_bit13siflags;
+static int hf_bit14siflags;
+static int hf_bit15siflags;
+static int hf_bit16siflags;
+static int hf_nds_segments;
+static int hf_nds_segment;
+static int hf_nds_segment_overlap;
+static int hf_nds_segment_overlap_conflict;
+static int hf_nds_segment_multiple_tails;
+static int hf_nds_segment_too_long_segment;
+static int hf_nds_segment_error;
+static int hf_nds_segment_count;
+static int hf_nds_reassembled_length;
+static int hf_nds_verb2b_req_flags;
+static int hf_ncp_ip_address;
+static int hf_ncp_copyright;
+static int hf_ndsprot1flag;
+static int hf_ndsprot2flag;
+static int hf_ndsprot3flag;
+static int hf_ndsprot4flag;
+static int hf_ndsprot5flag;
+static int hf_ndsprot6flag;
+static int hf_ndsprot7flag;
+static int hf_ndsprot8flag;
+static int hf_ndsprot9flag;
+static int hf_ndsprot10flag;
+static int hf_ndsprot11flag;
+static int hf_ndsprot12flag;
+static int hf_ndsprot13flag;
+static int hf_ndsprot14flag;
+static int hf_ndsprot15flag;
+static int hf_ndsprot16flag;
+static int hf_nds_svr_dst_name;
+static int hf_nds_tune_mark;
+/* static int hf_nds_create_time; */
+static int hf_srvr_param_number;
+static int hf_srvr_param_boolean;
+static int hf_srvr_param_string;
+static int hf_nds_svr_time;
+static int hf_nds_crt_time;
+static int hf_nds_number_of_items;
+static int hf_nds_compare_attributes;
+static int hf_nds_read_attribute;
+static int hf_nds_write_add_delete_attribute;
+static int hf_nds_add_delete_self;
+static int hf_nds_privilege_not_defined;
+static int hf_nds_supervisor;
+static int hf_nds_inheritance_control;
+static int hf_nds_browse_entry;
+static int hf_nds_add_entry;
+static int hf_nds_delete_entry;
+static int hf_nds_rename_entry;
+static int hf_nds_supervisor_entry;
+static int hf_nds_entry_privilege_not_defined;
+static int hf_nds_iterator;
+static int hf_ncp_nds_iterverb;
+static int hf_iter_completion_code;
+/* static int hf_nds_iterobj; */
+static int hf_iter_verb_completion_code;
+static int hf_iter_ans;
+static int hf_positionable;
+static int hf_num_skipped;
+static int hf_num_to_skip;
+static int hf_timelimit;
+static int hf_iter_index;
+static int hf_num_to_get;
+/* static int hf_ret_info_type; */
+static int hf_data_size;
+static int hf_this_count;
+static int hf_max_entries;
+static int hf_move_position;
+static int hf_iter_copy;
+static int hf_iter_position;
+static int hf_iter_search;
+static int hf_iter_other;
+static int hf_nds_oid;
+static int hf_ncp_bytes_actually_trans_64;
+static int hf_sap_name;
+static int hf_os_name;
+static int hf_vendor_name;
+static int hf_hardware_name;
+static int hf_no_request_record_found;
+static int hf_search_modifier;
+static int hf_search_pattern;
+static int hf_nds_acl_protected_attribute;
+static int hf_nds_acl_subject;
+static int hf_nds_acl_privileges;
+
+static expert_field ei_ncp_file_rights_change;
+static expert_field ei_ncp_completion_code;
+static expert_field ei_nds_reply_error;
+static expert_field ei_ncp_destroy_connection;
+static expert_field ei_nds_iteration;
+static expert_field ei_ncp_eid;
+static expert_field ei_ncp_file_handle;
+static expert_field ei_ncp_connection_destroyed;
+static expert_field ei_ncp_no_request_record_found;
+static expert_field ei_ncp_file_rights;
+static expert_field ei_iter_verb_completion_code;
+static expert_field ei_ncp_connection_request;
+static expert_field ei_ncp_connection_status;
+static expert_field ei_ncp_op_lock_handle;
+static expert_field ei_ncp_effective_rights;
+static expert_field ei_ncp_server;
+static expert_field ei_ncp_invalid_offset;
+static expert_field ei_ncp_address_type;
+static expert_field ei_ncp_value_too_large;
 """)
 
     # Look at all packet types in the packets collection, and cull information
@@ -6553,7 +6553,7 @@ static expert_field ei_ncp_value_too_large = EI_INIT;
     sorted_vars = list(variables_used_hash.values())
     sorted_vars.sort()
     for var in sorted_vars:
-        print("static int " + var.HFName() + " = -1;")
+        print("static int " + var.HFName() + ";")
 
 
     # Print the value_string's