[package] unvram: get rid of some memory leaks

[openwrt.git] / package / libipfix / extra / append-wprobe-ie.pl

diff --git a/package/libipfix/extra/append-wprobe-ie.pl b/package/libipfix/extra/append-wprobe-ie.pl
index e3a44f0..3a8db3f 100644 (file)
--- a/package/libipfix/extra/append-wprobe-ie.pl
+++ b/package/libipfix/extra/append-wprobe-ie.pl
@@ -1,9 +1,9 @@
 use strict;
 
 my @fields = (
 use strict;
 
 my @fields = (

-       [ "avg", "FLOAT", "Average" ],
-       [ "stdev", "FLOAT", "Standard deviation" ],
-       [ "n", "UINT", "Number of samples" ]
+       [ "_avg", "FLOAT", " - Average" ],
+       [ "_stdev", "FLOAT", " - Standard deviation" ],
+       [ "_n", "UINT", " - Number of samples" ]

 );
 
 my $file = $ARGV[0] or die "Syntax: $0 <file>\n";
 );
 
 my $file = $ARGV[0] or die "Syntax: $0 <file>\n";


@@ -16,17 +16,24 @@ while ($line = <IES>) {
 }
 close IES;
 while (<STDIN>) {
 }
 close IES;
 while (<STDIN>) {

-       /^(\w+),\s*(\w+),\s*(.+)$/ and do {
-               my $rfield = $1;
-               my $nfield = $2;
-               my $descr = $3;
-               foreach my $f (@fields) {
+       /^(%?)(\w+),\s*(\w+),\s*(.+)$/ and do {
+               my $counter = $1;
+               my $rfield = $2;
+               my $nfield = $3;
+               my $descr = $4;
+               my @f;
+               if ($counter) {
+                       @f = [ "", "UINT", "" ];
+               } else {
+                       @f = @fields;
+               }
+               foreach my $f (@f) {

                        my $nr = ++$last_ie;
                        my $n = $f->[0];
                        my $N = uc $n;
                        my $ftype = $f->[1];
                        my $fdesc = $f->[2];
                        my $nr = ++$last_ie;
                        my $n = $f->[0];
                        my $N = uc $n;
                        my $ftype = $f->[1];
                        my $fdesc = $f->[2];

-                       print "$nr, IPFIX_FT_WPROBE_$rfield\_$N, 4, IPFIX_CODING_$ftype, \"$nfield\_$n\", \"$descr - $fdesc\"\n";
+                       print "$nr, IPFIX_FT_WPROBE_$rfield$N, 4, IPFIX_CODING_$ftype, \"$nfield$n\", \"$descr$fdesc\"\n";

                }
        };
 }
                }
        };
 }