[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/safe/tools decode_flid.pl, 1.1, 1.2

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/tools
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2453

Modified Files:
	decode_flid.pl 
Log Message:
fix for new format

Index: decode_flid.pl
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/tools/decode_flid.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** decode_flid.pl	12 Feb 2008 19:08:40 -0000	1.1
--- decode_flid.pl	20 Jun 2008 21:22:40 -0000	1.2
***************
*** 44,66 ****
  	}
  	if (hex($fields[0]) == hex($flidstr)) {
! 	    $found = 1;
  	    my $text = $fields[2];
! 	    my $check = $fields[3];
! 	    my $file = $fields[5];
! 	    my $line = $fields[6];
! 	    my $func = $fields[7];
  
! 	    print "\n$line\n\n";
  
  	    print "Deputy error message for flid $flidstr:\n\n";
  
! 	    printf "%s:%d: %s: Assertion failed in %s:\n  %s\n", 
! 	    $file, $line, $func, $check, $text;
! 	    
! 	    print "\n";
  	}
      }
      close INF;
  }
  
  if (!$found) {
--- 44,67 ----
  	}
  	if (hex($fields[0]) == hex($flidstr)) {
! 	    my $check = $fields[1];
  	    my $text = $fields[2];
! 	    my $loc = $fields[3];
! 	    my $func = $fields[4];
  
! 
! 	    $found = 1;
  
  	    print "Deputy error message for flid $flidstr:\n\n";
  
! 	    printf "%s: %s: Assertion failed in %s:\n  %s\n", 
! 	      $loc, $func, $check, $text;
  	}
      }
      close INF;
  }
+ else {
+     print "Usage: decode-flid.pl FLID flid-filename\n";
+     exit 2;
+ }
  
  if (!$found) {