From 25bb947bdbbd1405a5a9b20c7c7bea222f4d358b Mon Sep 17 00:00:00 2001
From: Michael Mann <mmann78@netscape.net>
Date: Mon, 9 Sep 2013 02:19:27 +0000
Subject: Have conversion tools use the "new" expert_add_info_format.

svn path=/trunk/; revision=51857
---
 tools/convert_expert_add_info_format.pl | 7 ++++---
 tools/convert_proto_tree_add_text.pl    | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/convert_expert_add_info_format.pl b/tools/convert_expert_add_info_format.pl
index b54d2ff446..fccde630f7 100755
--- a/tools/convert_expert_add_info_format.pl
+++ b/tools/convert_expert_add_info_format.pl
@@ -2,7 +2,7 @@
 #
 # Copyright 2013 Michael Mann (see AUTHORS file)
 #
-# A program to help convert expert_add_info_format calls into filterable "items" that
+# A program to help convert the "old" expert_add_info_format API calls into filterable "items" that
 # use the other expert API calls.  The program requires 2 passes.  "Pass 1" (generate) collects 
 # the eligible expert_add_info_format calls and outputs the necessary data into a delimited
 # file.  "Pass 2" (fix-all) takes the data from the delimited file and replaces the
@@ -20,7 +20,7 @@
 #
 # convert proto_tree_add_text_call enumerations:
 # 1  - expert_add_info
-# 2  - expert_add_info_format_text
+# 2  - expert_add_info_format
 # 3  - proto_tree_add_expert
 # 4  - proto_tree_add_expert_format
 #
@@ -276,6 +276,7 @@ sub generate_eis {
 
 		#XXX - conditional?
 		$expert_item[5] =~ s/\"\s*\)\s*;$//;
+		$expert_item[5] =~ s/\"$//;
 
 		#params
 		$expert_item[12] = "";
@@ -343,7 +344,7 @@ sub patsub {
 		$item_str = sprintf("expert_add_info(%s, %s, &%s);",
 						 $expert_list[$_[0]][7], $expert_list[$_[0]][8], $expert_list[$_[0]][2]);
 	} elsif ($expert_list[$_[0]][0] eq "2") {
-		$item_str = sprintf("expert_add_info_format_text(%s, %s, &%s, \"%s\"",
+		$item_str = sprintf("expert_add_info_format(%s, %s, &%s, \"%s\"",
 						 $expert_list[$_[0]][7], $expert_list[$_[0]][8],
 						 $expert_list[$_[0]][2], $expert_list[$_[0]][5]);
 		if (($#{$expert_list[$_[0]]}+1 > 12 ) && ($expert_list[$_[0]][12] ne "")) {
diff --git a/tools/convert_proto_tree_add_text.pl b/tools/convert_proto_tree_add_text.pl
index 6d7f35e394..f1f20396eb 100755
--- a/tools/convert_proto_tree_add_text.pl
+++ b/tools/convert_proto_tree_add_text.pl
@@ -24,7 +24,7 @@
 # 0  - no conversions
 # 1  - proto_tree_add_item
 # 10 - expert_add_info
-# 11 - expert_add_info_format_text
+# 11 - expert_add_info_format
 # 12 - proto_tree_add_expert
 # 13 - proto_tree_add_expert_format
 #
@@ -555,7 +555,7 @@ sub patsub {
 		$item_str = sprintf("expert_add_info(pinfo, %s, &%s);",
 						 $proto_tree_list[$_[0]][2], $proto_tree_list[$_[0]][3]);
 	} elsif ($proto_tree_list[$_[0]][0] eq "11") {
-		$item_str = sprintf("expert_add_info_format_text(pinfo, %s, &%s, \"%s\"",
+		$item_str = sprintf("expert_add_info_format(pinfo, %s, &%s, \"%s\"",
 						 $proto_tree_list[$_[0]][2], $proto_tree_list[$_[0]][3],
 						 $proto_tree_list[$_[0]][8]);
 		if ($proto_tree_list[$_[0]][11] ne "") {
-- 
cgit v1.2.3