From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 12 Dec 2010 02:07:14 +0000 (+0000)
Subject: layout/data2safety: use new $desc variable for error reporting - no serious functiona... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=309b48dd3f1f1947c7f854008439b302d100f585;p=trains.git

layout/data2safety: use new $desc variable for error reporting - no serious functional change intended other than possible improvements to error messages
---

diff --git a/layout/data2safety b/layout/data2safety
index 31f0b14..4e29d12 100755
--- a/layout/data2safety
+++ b/layout/data2safety
@@ -340,7 +340,7 @@ sub line_endwiring () {
 	$featr= $segr->{Feats}{$feat};
 	if (exists $featr->{Fixed}) {
 	    if ($pos != $featr->{Fixed}) {
-		ditch("fixed-elsewise $seg/$subspec");
+		ditch("fixed-elsewise $desc");
 		return;
 	    }
 	} else {
@@ -353,11 +353,11 @@ sub line_endwiring () {
     for $feat (keys %{ $segr->{Feats} }) {
 	$featr= $segr->{Feats}{$feat};
 	next if exists $featr->{Fixed};
-	mistake("wiring $seg/$feat not covered by $seg/$subspec"),next
+	mistake("wiring $seg/$feat not covered by $desc"),next
 	    if !exists $featposwant{$feat};
 	$combpos += $featposwant{$feat} * $featr->{Weight};
     }
-    mistake("duplicate topology subseg for $seg/$subspec")
+    mistake("duplicate topology subseg for $desc")
 	if defined $segs{$seg}{Dist}[$combpos];
     $segs{$seg}{Dist}[$combpos]= $dist;
     $endposr= $segr->{Ends}[$combpos];