From a84c3b381b9980def004ad7ae7ad5957ddd2d218 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Thu, 24 Oct 2013 11:23:26 +0200 Subject: [PATCH] throwing in some % --- xml-db/get.pl | 4 ++-- xml-db/xml-db.pl | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xml-db/get.pl b/xml-db/get.pl index 46e042e..13cbb5a 100755 --- a/xml-db/get.pl +++ b/xml-db/get.pl @@ -218,7 +218,7 @@ sub requestdata { } $o = trb_register_read_mem($netaddr,$obj->{address}+$offset,0,$size); next unless defined $o; - foreach my $k (keys $o) { + foreach my $k (keys %$o) { for(my $i = 0; $i < $size; $i++) { $data->{$obj->{address}+$offset+$i}->{$k} = $o->{$k}->[$i]; } @@ -236,7 +236,7 @@ sub requestdata { do { $o = trb_register_read($netaddr,$obj->{address}+$slice*$stepsize); next unless defined $o; - foreach my $k (keys $o) { + foreach my $k (keys %$o) { $data->{$obj->{address}+$slice*$stepsize}->{$k} = $o->{$k}; } } while(!$once && defined $obj->{repeat} && ++$slice < $obj->{repeat}); diff --git a/xml-db/xml-db.pl b/xml-db/xml-db.pl index 6fe5c67..b780706 100755 --- a/xml-db/xml-db.pl +++ b/xml-db/xml-db.pl @@ -88,7 +88,7 @@ sub Main { #print Dumper($db->{'JtagLastDataChanged'}); my $name = $doc->getDocumentElement->getAttribute('name'); if($dumpitem) { - foreach my $key (keys $db) { + foreach my $key (keys %$db) { next unless $key =~ /$dumpitem/; my $item = $db->{$key}; $item->{address} = sprintf("0x%04x",$item->{address}); @@ -164,7 +164,6 @@ sub MakeOrMergeDbItem { # always append the type, start with an empty one my $dbitem = shift || {type => ''}; $dbitem->{'type'} .= $n->nodeName; - # determine the absolute address, include node itself (not # necessarily a group) default address is 0, and we start always # from 0, overwriting a previously determined address -- 2.43.0