diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-09 02:19:27 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-09 02:19:27 +0000 |
| commit | 25bb947bdbbd1405a5a9b20c7c7bea222f4d358b (patch) | |
| tree | 4c48b669a80b17dc0adb8139f16ca264b7c7f779 /tools/convert_expert_add_info_format.pl | |
| parent | 829c1ed25ec2734d9c6fec6d8cbcc2b6e69ff6f1 (diff) | |
Have conversion tools use the "new" expert_add_info_format.
svn path=/trunk/; revision=51857
Diffstat (limited to 'tools/convert_expert_add_info_format.pl')
| -rwxr-xr-x | tools/convert_expert_add_info_format.pl | 7 |
1 files changed, 4 insertions, 3 deletions
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 "")) { |