From Albert Chin:

Fix some C++ comments in C source files and fixes some non-constant initializations.

svn path=/trunk/; revision=18521

2 files changed, 34 insertions, 12 deletions

diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 7bb5fe43c1..2a6cb131d6 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -1151,11 +1151,14 @@ static h248_msg_t* h248_msg(packet_info* pinfo, int o) {
 	
     if (keep_persistent_data) {
 		se_tree_key_t key[] = {
-			{1,&(framenum)},
-			{1,&offset},
+			{1,NULL},
+			{1,NULL},
 			{0,NULL},
 		};
 
+	key[0].key = &(framenum);
+	key[1].key = &offset;
+
         if (( m = se_tree_lookup32_array(msgs,key) )) {
             m->commited = TRUE;
 			return m;
@@ -1224,12 +1227,16 @@ static h248_trx_t* h248_trx(h248_msg_t* m ,guint32 t_id , h248_trx_type_t type)
 
         } else {
 			se_tree_key_t key[] = {
-				{1,&(m->hi_addr)},
-				{1,&(m->lo_addr)},
-				{1,&(t_id)},
+				{1,NULL},
+				{1,NULL},
+				{1,NULL},
 				{0,NULL}
 			};
 			
+            key[0].key = &(m->hi_addr);
+            key[1].key = &(m->lo_addr);
+            key[2].key = &(t_id);
+
             trxmsg = se_alloc(sizeof(h248_trx_msg_t));
             t = se_tree_lookup32_array(trxs,key);
 
@@ -1288,19 +1295,27 @@ static h248_ctx_t* h248_ctx(h248_msg_t* m, h248_trx_t* t, guint32 c_id) {
 
     if (keep_persistent_data) {
 		se_tree_key_t ctx_key[] = {
-		{1,&(m->hi_addr)},
-		{1,&(m->lo_addr)},
-		{1,&(c_id)},
+		{1,NULL},
+		{1,NULL},
+		{1,NULL},
 		{0,NULL}
 		};
 		
 		se_tree_key_t trx_key[] = {
-		{1,&(m->hi_addr)},
-		{1,&(m->lo_addr)},
-		{1,&(t->id)},
+		{1,NULL},
+		{1,NULL},
+		{1,NULL},
 		{0,NULL}
 		};
 		
+        ctx_key[0].key = &(m->hi_addr);
+        ctx_key[1].key = &(m->lo_addr);
+        ctx_key[2].key = &(c_id);
+
+        trx_key[0].key = &(m->hi_addr);
+        trx_key[1].key = &(m->lo_addr);
+        trx_key[2].key = &(t->id);
+
         if (m->commited) {
             if (( context = se_tree_lookup32_array(ctxs_by_trx,trx_key) )) {
                 return context;
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index b0b013bf1b..d398cfc0b4 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -39,9 +39,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "packet-rnsap.h"
 #include "packet-ber.h"
 #include "packet-per.h"
+#include "packet-rnsap.h"
+#include "packet-umts_rrc.h"
 
 #define PNAME  "UTRAN Iur interface Radio Network Subsystem Application Part"
 #define PSNAME "RNSAP"
@@ -554,6 +555,7 @@ static int proto_rnsap = -1;
 
 static int hf_rnsap_pdu_length = -1;
 static int hf_rnsap_IE_length = -1;
+static int hf_rnsap_L3_DL_DCCH_Message_PDU = -1;
 
 #include "packet-rnsap-hf.c"
 
@@ -2313,6 +2315,11 @@ void proto_register_rnsap(void) {
 	{ &hf_rnsap_IE_length,
 		{ "IE Length", "rnsap.ie_length", FT_UINT32, BASE_DEC,
 		NULL, 0, "Number of octets in the IE", HFILL }},
+    { &hf_rnsap_L3_DL_DCCH_Message_PDU,
+      { "DL-DCCH-Message", "rnsap.DL_DCCH_Message",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "DL-DCCH-Message", HFILL }},
+
 #include "packet-rnsap-hfarr.c"
   };