throwing in some %

diff --git a/xml-db/get.pl b/xml-db/get.pl
index 46e042e4f1bc83146679f6f7a6055424404df53b..13cbb5a17fbcca909ccafc804a91061ffd39f94d 100755 (executable)
--- 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 6fe5c6734b8661657eaea93e9ebedc2a803ba60e..b7807063b9f9b14934e8c1a6837c4460516386bb 100755 (executable)
--- 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