[Crosstoolchain-logs] [device-tree-compiler] 335/357: dtc: Cleanup srcpos_string()

[Hector Oron]

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

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

commit e1fee329e2a74141fc6872a5c4307d078c4ba553
Author: David Gibson <david at gibson.dropbear.id.au>
Date:   Tue Dec 8 14:24:42 2009 +1100

    dtc: Cleanup srcpos_string()
    
    There are several small problems with the current srcpos_string().
    
    	- The code unnecessarily uses a temp buffer and two rounds of
    	  *printf(); a single asprintf() will suffice.
    
    	- With previous changes, pos->file->name can never be NULL,
              and the name field for a srcfile bound to stdin is already
              set to something sensible.
    
    	- On allocation failure in asprintf() it returns a bogus
              result, instead of causing a fatal error like every other
              failed allocation.
    
    	- The format for representing file/line/column is gratuitously
              different from the file/line format we used to use, and the
              format used by gcc and bison.
    
    This patch addresses all of these.  There remains the problem that
    asprintf() is not portable, but that can wait until another patch.
    
    Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
 srcpos.c | 45 ++++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/srcpos.c b/srcpos.c
index ca322bb..59ecbce 100644
--- a/srcpos.c
+++ b/srcpos.c
@@ -182,41 +182,28 @@ srcpos_dump(srcpos *pos)
 char *
 srcpos_string(srcpos *pos)
 {
-	const char *fname;
-	char col_buf[100];
+	const char *fname = "<no-file>";
 	char *pos_str;
+	int rc;
 
-	if (!pos) {
-		fname = "<no-file>";
-	} else if (pos->file->name) {
+	if (pos)
 		fname = pos->file->name;
-		if (strcmp(fname, "-") == 0)
-			fname = "stdin";
-	} else {
-		fname = "<no-file>";
-	}
 
-	if (pos->first_line == pos->last_line) {
-		if (pos->first_column == pos->last_column) {
-			snprintf(col_buf, sizeof(col_buf),
-				 "%d:%d",
-				 pos->first_line, pos->first_column);
-		} else {
-			snprintf(col_buf, sizeof(col_buf),
-				 "%d:%d-%d",
-				 pos->first_line,
-				 pos->first_column, pos->last_column);
-		}
 
-	} else {
-		snprintf(col_buf, sizeof(col_buf),
-			 "%d:%d - %d:%d",
-			 pos->first_line, pos->first_column,
-			 pos->last_line, pos->last_column);
-	}
+	if (pos->first_line != pos->last_line)
+		rc = asprintf(&pos_str, "%s:%d.%d-%d.%d", fname,
+			      pos->first_line, pos->first_column,
+			      pos->last_line, pos->last_column);
+	else if (pos->first_column != pos->last_column)
+		rc = asprintf(&pos_str, "%s:%d.%d-%d", fname,
+			      pos->first_line, pos->first_column,
+			      pos->last_column);
+	else
+		rc = asprintf(&pos_str, "%s:%d.%d", fname,
+			      pos->first_line, pos->first_column);
 
-	if (asprintf(&pos_str, "%s %s", fname, col_buf) == -1)
-		return "<unknown source position?";
+	if (rc == -1)
+		die("Couldn't allocate in srcpos string");
 
 	return pos_str;
 }

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