[Crosstoolchain-logs] [device-tree-compiler] 239/357: Convert malloc() uses to xmalloc().
Hector Oron
zumbi at moszumanska.debian.org
Thu Dec 8 17:06:18 UTC 2016
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 42107f8bba994f718594dd670a937861d40f425d
Author: Scott Wood <scottwood at freescale.com>
Date: Mon Jan 7 14:27:36 2008 -0600
Convert malloc() uses to xmalloc().
Signed-off-by: Scott Wood <scottwood at freescale.com>
---
dtc-lexer.l | 6 +-----
srcpos.c | 12 +++---------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/dtc-lexer.l b/dtc-lexer.l
index bfb996e..f2836a8 100644
--- a/dtc-lexer.l
+++ b/dtc-lexer.l
@@ -273,11 +273,7 @@ int push_input_file(const char *filename)
exit(1);
}
- incl_file = malloc(sizeof(struct incl_file));
- if (!incl_file) {
- yyerror("Can not allocate include file space.");
- return 0;
- }
+ incl_file = xmalloc(sizeof(struct incl_file));
/*
* Save current context.
diff --git a/srcpos.c b/srcpos.c
index 7a0c47e..7d0f0a7 100644
--- a/srcpos.c
+++ b/srcpos.c
@@ -33,9 +33,7 @@ static int dtc_open_one(struct dtc_file *file,
char *fullname;
if (search) {
- fullname = malloc(strlen(search) + strlen(fname) + 2);
- if (!fullname)
- die("Out of memory\n");
+ fullname = xmalloc(strlen(search) + strlen(fname) + 2);
strcpy(fullname, search);
strcat(fullname, "/");
@@ -63,15 +61,11 @@ struct dtc_file *dtc_open_file(const char *fname,
struct dtc_file *file;
const char *slash;
- file = malloc(sizeof(struct dtc_file));
- if (!file)
- die("Out of memory\n");
+ file = xmalloc(sizeof(struct dtc_file));
slash = strrchr(fname, '/');
if (slash) {
- char *dir = malloc(slash - fname + 1);
- if (!dir)
- die("Out of memory\n");
+ char *dir = xmalloc(slash - fname + 1);
memcpy(dir, fname, slash - fname);
dir[slash - fname] = 0;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git
More information about the Crosstoolchain-logs
mailing list