mirror of https://github.com/OpenIPC/firmware.git
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
diff -drupN a/scripts/dtc/srcpos.c b/scripts/dtc/srcpos.c
|
|
--- a/scripts/dtc/srcpos.c 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/scripts/dtc/srcpos.c 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -246,46 +246,27 @@ srcpos_copy(struct srcpos *pos)
|
|
return pos_new;
|
|
}
|
|
|
|
-
|
|
-
|
|
-void
|
|
-srcpos_dump(struct srcpos *pos)
|
|
-{
|
|
- printf("file : \"%s\"\n",
|
|
- pos->file ? (char *) pos->file : "<no file>");
|
|
- printf("first_line : %d\n", pos->first_line);
|
|
- printf("first_column: %d\n", pos->first_column);
|
|
- printf("last_line : %d\n", pos->last_line);
|
|
- printf("last_column : %d\n", pos->last_column);
|
|
- printf("file : %s\n", pos->file->name);
|
|
-}
|
|
-
|
|
-
|
|
char *
|
|
srcpos_string(struct srcpos *pos)
|
|
{
|
|
const char *fname = "<no-file>";
|
|
char *pos_str;
|
|
- int rc;
|
|
|
|
if (pos)
|
|
fname = pos->file->name;
|
|
|
|
|
|
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);
|
|
+ xasprintf(&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);
|
|
+ xasprintf(&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 (rc == -1)
|
|
- die("Couldn't allocate in srcpos string");
|
|
+ xasprintf(&pos_str, "%s:%d.%d", fname,
|
|
+ pos->first_line, pos->first_column);
|
|
|
|
return pos_str;
|
|
}
|