X-Git-Url: https://git.distorted.org.uk/~mdw/dvddb/blobdiff_plain/75a5b9248f89fd40189035093b751a7bbcd0292d..b2a25885cb81761a2b33014a00f843e76f4ce83c:/report

diff --git a/report b/report
index c7baf00..7fb00b7 100755
--- a/report
+++ b/report
@@ -26,20 +26,17 @@ find(sub {
 
 my %set_path;
 my %set_id;
-my $st_set = $DB->prepare("SELECT id, name, ndisc FROM dvd_set");
-my $st_disc = $DB->prepare("SELECT disc, path FROM dvd_disc
-			    WHERE set_id = ?
-			    ORDER BY disc");
+my $st_set = $DB->prepare("SELECT id, name, n_disc FROM dvd_set");
+my $st_disc = $DB->prepare
+  ("SELECT disc, path FROM dvd_disc WHERE set_id = ? ORDER BY disc");
 $st_set->execute;
 
-SET: for (;;) {
-  my @r = $st_set->fetchrow_array; last SET unless @r;
+while (my @r = $st_set->fetchrow_array) {
   my ($id, $name, $ndisc) = @r;
   my @path;
 
   $st_disc->execute($id);
-  DISC: for (;;) {
-    my @r = $st_disc->fetchrow_array; last DISC unless @r;
+  while (my @r = $st_disc->fetchrow_array) {
     my ($disc, $path) = @r;
     $disc == @path or die "bad disc sequence for `$name'";
     push @path, $path;