[Crosstoolchain-logs] [device-tree-compiler] 114/198: Die on failed /incbin/ seeks

[Hector Oron]

This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch upstream/1.4.x
in repository device-tree-compiler.

commit 6a15eb2350426d285130e4c9d84c0bdb6575547a
Author: David Gibson <david at gibson.dropbear.id.au>
Date:   Sat Jan 4 10:04:19 2014 +1100

    Die on failed /incbin/ seeks
    
    Failing to open an input file, with /include/ or /incbin/ is treated as
    immediately fatal inside srcfile_relative_open().  However, filing to
    seek() to the requested offset in an /incbin/ is not.  This is a bit oddly
    inconsistent, and leaves us with a strange case that's awkward to deal with
    down the line.
    
    So, get rid of it and have failed seeks on an /incbin/ be immediately
    fatal.
    
    Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
 dtc-parser.y | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dtc-parser.y b/dtc-parser.y
index efe81dd..bed857e 100644
--- a/dtc-parser.y
+++ b/dtc-parser.y
@@ -226,10 +226,9 @@ propdata:
 
 			if ($6 != 0)
 				if (fseek(f, $6, SEEK_SET) != 0)
-					print_error("Couldn't seek to offset %llu in \"%s\": %s",
-						     (unsigned long long)$6,
-						     $4.val,
-						     strerror(errno));
+					die("Couldn't seek to offset %llu in \"%s\": %s",
+					    (unsigned long long)$6, $4.val,
+					    strerror(errno));
 
 			d = data_copy_file(f, $8);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git