Add a function to packet-giop.c that does what the code that

template_get_CDR_string (in wireshark_gen.py) did.  This eliminates another
whole pile of function-local variables in packet-parlay.c.

Unfortunately it doesn't seem to speed up compilation (or eliminate the
variable tracking size limit problem).  But it does eliminate a lot of
lines of code...

svn path=/trunk/; revision=43610

1 files changed, 1 insertions, 10 deletions

diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py
index ac6c53a101..58b0c6ec78 100755
--- a/tools/wireshark_gen.py
+++ b/tools/wireshark_gen.py
@@ -1035,8 +1035,6 @@ class wireshark_gen_C:
 
     def get_CDR_string(self,pn):
         self.st.out(self.template_get_CDR_string, varname=pn)
-        self.addvar(self.c_u_octet4)
-        self.addvar(self.c_seq)
 
     def get_CDR_wstring(self,pn):
         self.st.out(self.template_get_CDR_wstring, varname=pn)
@@ -1847,14 +1845,7 @@ if (tree) {
 }
 """
     template_get_CDR_string = """\
-u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary);
-if (tree) {
-   proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"@varname@ (%u) = %s",
-      u_octet4, (u_octet4 > 0) ? seq : \"\");
-}
-
-g_free(seq);          /*  free buffer  */
-seq = NULL;
+giop_add_CDR_string(tree, tvb, offset, stream_is_big_endian, boundary, "@varname@");
 """
     template_get_CDR_wstring = """\
 u_octet4 = get_CDR_wstring(tvb, &seq, offset, stream_is_big_endian, boundary, header);