Squelch warnings about uninitialized structure members.

svn path=/trunk/; revision=23261

1 files changed, 80 insertions, 77 deletions

diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c
index c09966fbcb..603fc6aa84 100644
--- a/asn1/h460/packet-h460-template.c
+++ b/asn1/h460/packet-h460-template.c
@@ -93,6 +93,9 @@ typedef struct _h460_feature_t {
   dissector_handle_t content_hnd;
 } h460_feature_t;
 
+/* Fill in the items after content_pdu */
+#define FFILL	NULL, NULL, NULL, NULL, NULL
+
 /* options */
 #define GD 0x01  /* present in H.225 GenericData */
 #define FD 0x02  /* present in H.225 FeatureDescriptor */
@@ -101,103 +104,103 @@ typedef struct _h460_feature_t {
 
 static h460_feature_t h460_feature_tab[] = {
   /* H.460.3 */
-  { GD|FD,  "2",   "Number Portability", NULL },
-  { GD|FD,  "2/1", "NumberPortabilityData", dissect_h460_2_NumberPortabilityInfo_PDU },
+  { GD|FD,  "2",   "Number Portability", NULL, FFILL },
+  { GD|FD,  "2/1", "NumberPortabilityData", dissect_h460_2_NumberPortabilityInfo_PDU, FFILL },
   /* H.460.3 */
-  { GD|FD,  "3",   "Circuit Status", NULL },
-  { GD|FD,  "3/1", "Circuit Status Map", dissect_h460_3_CircuitStatus_PDU },
+  { GD|FD,  "3",   "Circuit Status", NULL, FFILL },
+  { GD|FD,  "3/1", "Circuit Status Map", dissect_h460_3_CircuitStatus_PDU, FFILL },
   /* H.460.4 */
-  { GD|FD,  "4",   "CallPriorityDesignation", NULL },
-  { GD|FD,  "4/1", "CallPriorityRequest", dissect_h460_4_CallPriorityInfo_PDU },
-  { GD|FD,  "4/2", "CallPriorityConfirm", dissect_h460_4_CallPriorityInfo_PDU },
-  { GD|FD,  "4/3", "Country/InternationalNetworkCallOriginationRequest", dissect_h460_4_CountryInternationalNetworkCallOriginationIdentification_PDU },
-  { GD|FD,  "4/4", "Country/InternationalNetworkCallOriginationConfirm", dissect_h460_4_CountryInternationalNetworkCallOriginationIdentification_PDU },
+  { GD|FD,  "4",   "CallPriorityDesignation", NULL, FFILL },
+  { GD|FD,  "4/1", "CallPriorityRequest", dissect_h460_4_CallPriorityInfo_PDU, FFILL },
+  { GD|FD,  "4/2", "CallPriorityConfirm", dissect_h460_4_CallPriorityInfo_PDU, FFILL },
+  { GD|FD,  "4/3", "Country/InternationalNetworkCallOriginationRequest", dissect_h460_4_CountryInternationalNetworkCallOriginationIdentification_PDU, FFILL },
+  { GD|FD,  "4/4", "Country/InternationalNetworkCallOriginationConfirm", dissect_h460_4_CountryInternationalNetworkCallOriginationIdentification_PDU, FFILL },
   /* H.460.5 */
-  { GD|FD,  "5",   "DuplicateIEs", NULL },
-  { GD|FD,  "5/1", "IEsString", dissect_ies },
+  { GD|FD,  "5",   "DuplicateIEs", NULL, FFILL },
+  { GD|FD,  "5/1", "IEsString", dissect_ies, FFILL },
   /* H.460.6 */
-  { GD|FD,  "6",   "Extended Fast Connect", NULL },
-  { GD|FD,  "6/1", "EFC Proposal", NULL },
-  { GD|FD,  "6/2", "EFC Close All Media Channels", NULL },
-  { GD|FD,  "6/3", "EFC Request New Proposals", NULL },
-  { GD|FD,  "6/4", "EFC Require Symmetric Operation", NULL },
+  { GD|FD,  "6",   "Extended Fast Connect", NULL, FFILL },
+  { GD|FD,  "6/1", "EFC Proposal", NULL, FFILL },
+  { GD|FD,  "6/2", "EFC Close All Media Channels", NULL, FFILL },
+  { GD|FD,  "6/3", "EFC Request New Proposals", NULL, FFILL },
+  { GD|FD,  "6/4", "EFC Require Symmetric Operation", NULL, FFILL },
   /* H.460.7 */
-  { GD|FD,  "7",   "Digit Maps", NULL },
-  {    FD,  "7/1", "Digit Maps Length", NULL },
-  {    FD,  "7/2", "Digit Map Length for Overlapped Sending", NULL },
-  {    FD,  "7/3", "HTTP Digit Maps Download Capability", NULL },
-  { GD   ,  "7/1", "Start Timer", NULL },
-  { GD   ,  "7/2", "Short Timer", NULL },
-  { GD   ,  "7/3", "Long Timer", NULL },
-  { GD   ,  "7/4", "Digit Map String", NULL },
-  { GD   ,  "7/5",   "ToN Associated Digit Map", NULL },
-  { GD   ,  "7/5/1", "Type of Number", NULL },
-  { GD   ,  "7/5/2", "Digit Map Strings for ToN", NULL },
-  { GD   ,  "7/6", "Digit Map URL", NULL },
+  { GD|FD,  "7",   "Digit Maps", NULL, FFILL },
+  {    FD,  "7/1", "Digit Maps Length", NULL, FFILL },
+  {    FD,  "7/2", "Digit Map Length for Overlapped Sending", NULL, FFILL },
+  {    FD,  "7/3", "HTTP Digit Maps Download Capability", NULL, FFILL },
+  { GD   ,  "7/1", "Start Timer", NULL, FFILL },
+  { GD   ,  "7/2", "Short Timer", NULL, FFILL },
+  { GD   ,  "7/3", "Long Timer", NULL, FFILL },
+  { GD   ,  "7/4", "Digit Map String", NULL, FFILL },
+  { GD   ,  "7/5",   "ToN Associated Digit Map", NULL, FFILL },
+  { GD   ,  "7/5/1", "Type of Number", NULL, FFILL },
+  { GD   ,  "7/5/2", "Digit Map Strings for ToN", NULL, FFILL },
+  { GD   ,  "7/6", "Digit Map URL", NULL, FFILL },
   /* H.460.8 */
-  { GD|FD,  "8",   "Querying for Alternate Routes", NULL },
-  { GD|FD,  "8/1", "Query Count", NULL },
-  { GD|FD,  "8/2", "Call Termination Cause", NULL },
+  { GD|FD,  "8",   "Querying for Alternate Routes", NULL, FFILL },
+  { GD|FD,  "8/1", "Query Count", NULL, FFILL },
+  { GD|FD,  "8/2", "Call Termination Cause", NULL, FFILL },
   /* H.460.9 */
-  { GD|FD,  "9",   "QoS-monitoring Reporting", NULL },
-  { GD|FD,  "9/1", "qosMonitoringFinalOnly", NULL },
-  { GD|FD,  "9/2", "qosMonitoringReportData", dissect_h460_9_QosMonitoringReportData_PDU },
-  { GD|FD,  "9/3", "qosMonitoringExtendedRTPMetrics", dissect_h460_9_ExtendedRTPMetrics_PDU },
+  { GD|FD,  "9",   "QoS-monitoring Reporting", NULL, FFILL },
+  { GD|FD,  "9/1", "qosMonitoringFinalOnly", NULL, FFILL },
+  { GD|FD,  "9/2", "qosMonitoringReportData", dissect_h460_9_QosMonitoringReportData_PDU, FFILL },
+  { GD|FD,  "9/3", "qosMonitoringExtendedRTPMetrics", dissect_h460_9_ExtendedRTPMetrics_PDU, FFILL },
   /* H.460.10 */
-  { GD|FD, "10",   "Call Party Category", NULL },
-  { GD|FD, "10/1", "Call party category info", dissect_h460_10_CallPartyCategoryInfo_PDU },
+  { GD|FD, "10",   "Call Party Category", NULL, FFILL },
+  { GD|FD, "10/1", "Call party category info", dissect_h460_10_CallPartyCategoryInfo_PDU, FFILL },
   /* H.460.11 */
-  { GD|FD, "11",   "Delayed Call Establishment", NULL },
-  { GD|FD, "11/1", "Delay Point Indicator", NULL },
-  { GD|FD, "11/2", "Implicit DCE Release", NULL },
-  { GD|FD, "11/3", "Delay Point Reached", NULL },
-  { GD|FD, "11/4", "DCE Release", NULL },
+  { GD|FD, "11",   "Delayed Call Establishment", NULL, FFILL },
+  { GD|FD, "11/1", "Delay Point Indicator", NULL, FFILL },
+  { GD|FD, "11/2", "Implicit DCE Release", NULL, FFILL },
+  { GD|FD, "11/3", "Delay Point Reached", NULL, FFILL },
+  { GD|FD, "11/4", "DCE Release", NULL, FFILL },
   /* H.460.12 */
-  { GD|FD, "12",   "Glare Control Indicator", NULL },
-  { GD|FD, "12/1", "Glare Control Indicator Parameter", NULL },
+  { GD|FD, "12",   "Glare Control Indicator", NULL, FFILL },
+  { GD|FD, "12/1", "Glare Control Indicator Parameter", NULL, FFILL },
   /* H.460.13 */
-  { GD|FD, "13",   "Called User Release Control", NULL },
-  { GD|FD, "13/1", "Called User Release Control", NULL },
+  { GD|FD, "13",   "Called User Release Control", NULL, FFILL },
+  { GD|FD, "13/1", "Called User Release Control", NULL, FFILL },
   /* H.460.14 */
-  { GD|FD, "14",   "Multi-Level Precedence and Preemption", NULL },
-  { GD|FD, "14/1", "MLPP Information", dissect_h460_14_MLPPInfo_PDU },
+  { GD|FD, "14",   "Multi-Level Precedence and Preemption", NULL, FFILL },
+  { GD|FD, "14/1", "MLPP Information", dissect_h460_14_MLPPInfo_PDU, FFILL },
   /* H.460.15 */
-  { GD|FD, "15",   "Call signalling transport channel suspension and redirection", NULL },
-  { GD|FD, "15/1", "Signalling channel suspend and redirect", dissect_h460_15_SignallingChannelData_PDU },
+  { GD|FD, "15",   "Call signalling transport channel suspension and redirection", NULL, FFILL },
+  { GD|FD, "15/1", "Signalling channel suspend and redirect", dissect_h460_15_SignallingChannelData_PDU, FFILL },
   /* H.460.16 */
-  { GD|FD, "16",   "Multiple-message Release Sequence", NULL },
-  { GD|FD, "16/1", "MMRS use required", NULL },
-  { GD|FD, "16/2", "MMRS procedure", NULL },
-  { GD|FD, "16/3", "MMRS additional IEs", dissect_ies },
+  { GD|FD, "16",   "Multiple-message Release Sequence", NULL, FFILL },
+  { GD|FD, "16/1", "MMRS use required", NULL, FFILL },
+  { GD|FD, "16/2", "MMRS procedure", NULL, FFILL },
+  { GD|FD, "16/3", "MMRS additional IEs", dissect_ies, FFILL },
   /* H.460.17 */
-  { GD|FD, "17",   "RAS over H.225.0", NULL },
-  { GD|FD, "17/1", "RAS message", dissect_ras },
+  { GD|FD, "17",   "RAS over H.225.0", NULL, FFILL },
+  { GD|FD, "17/1", "RAS message", dissect_ras, FFILL },
   /* H.460.18 */
-  { GD|FD|GM, "18",   "Signalling Traversal", NULL },
-  { GD|FD   , "18/1", "IncomingCallIndication", dissect_h460_18_IncomingCallIndication_PDU },
-  { GD|FD   , "18/2", "LRQKeepAliveData", dissect_h460_18_LRQKeepAliveData_PDU },
-  {       GM, "18-1",   "connectionCorrelation", NULL },
-  {       GM, "18-1/1", "callIdentifier", NULL },
-  {       GM, "18-1/2", "answerCall", NULL },
+  { GD|FD|GM, "18",   "Signalling Traversal", NULL, FFILL },
+  { GD|FD   , "18/1", "IncomingCallIndication", dissect_h460_18_IncomingCallIndication_PDU, FFILL },
+  { GD|FD   , "18/2", "LRQKeepAliveData", dissect_h460_18_LRQKeepAliveData_PDU, FFILL },
+  {       GM, "18-1",   "connectionCorrelation", NULL, FFILL },
+  {       GM, "18-1/1", "callIdentifier", NULL, FFILL },
+  {       GM, "18-1/2", "answerCall", NULL, FFILL },
   /* H.460.19 */
-  { GD|FD|GI, "19", "mediaNATFWTraversal", NULL },
-  { GD|FD   , "19/1", "supportTransmitMultiplexedMedia", NULL },
-  { GD|FD   , "19/2", "mediaTraversalServer", NULL },
-  {       GI, "19/1", "Traversal Parameters", dissect_h460_19_TraversalParameters_PDU },
+  { GD|FD|GI, "19", "mediaNATFWTraversal", NULL, FFILL },
+  { GD|FD   , "19/1", "supportTransmitMultiplexedMedia", NULL, FFILL },
+  { GD|FD   , "19/2", "mediaTraversalServer", NULL, FFILL },
+  {       GI, "19/1", "Traversal Parameters", dissect_h460_19_TraversalParameters_PDU, FFILL },
   /* H.460.20 */
-  { GD|FD, "20",   "LocationSourceAddress", NULL },
-  { GD|FD, "20/1", "LocationSourceAddress", dissect_h225_ExtendedAliasAddress_PDU },
+  { GD|FD, "20",   "LocationSourceAddress", NULL, FFILL },
+  { GD|FD, "20/1", "LocationSourceAddress", dissect_h225_ExtendedAliasAddress_PDU, FFILL },
   /* H.460.21 */
-  { GD|FD, "21",   "Message Broadcast", NULL },
-  { GD|FD, "21/1", "MessageBroadcastParameter", dissect_h460_21_CapabilityAdvertisement_PDU },
+  { GD|FD, "21",   "Message Broadcast", NULL, FFILL },
+  { GD|FD, "21/1", "MessageBroadcastParameter", dissect_h460_21_CapabilityAdvertisement_PDU, FFILL },
   /* H.460.22 */
-  { GD|FD, "22",     "securityProtocolNegotiation", NULL },
-  { GD|FD, "22/1",   "tlsSecurityProtocol", NULL },
-  { GD|FD, "22/1/1", "priority", NULL },
-  { GD|FD, "22/1/2", "connectionAddress", NULL },
-  { GD|FD, "22/2",   "ipsecSecurityProtocol", NULL },
-  { GD|FD, "22/2/1", "priority", NULL },
-  { 0, NULL, NULL, NULL },
+  { GD|FD, "22",     "securityProtocolNegotiation", NULL, FFILL },
+  { GD|FD, "22/1",   "tlsSecurityProtocol", NULL, FFILL },
+  { GD|FD, "22/1/1", "priority", NULL, FFILL },
+  { GD|FD, "22/1/2", "connectionAddress", NULL, FFILL },
+  { GD|FD, "22/2",   "ipsecSecurityProtocol", NULL, FFILL },
+  { GD|FD, "22/2/1", "priority", NULL, FFILL },
+  { 0, NULL, NULL, NULL, FFILL },
 };                                 
 
 static h460_feature_t *find_ftr(const gchar *key) {