summaryrefslogtreecommitdiff
path: root/mkfs.jffs2.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-10-01 13:10:30 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-10-02 17:12:27 +0300
commitd01e0dec1e2ab100ab4df22ff4dc66bf404866c9 (patch)
tree89dd8136165ab75921ce2c4118496a8c90ca6683 /mkfs.jffs2.c
parente2ddf154e1050faea5a24cf44345aec0d715a8c9 (diff)
mkfs.jffs2: convert to xalloc.h helpers
Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'mkfs.jffs2.c')
-rw-r--r--mkfs.jffs2.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c
index 85a8564..256eec4 100644
--- a/mkfs.jffs2.c
+++ b/mkfs.jffs2.c
@@ -381,7 +381,7 @@ static struct filesystem_entry *recursive_add_host_directory(
#define GETCWD_SIZE 0
#else
#define SCANF_PREFIX "511"
-#define SCANF_STRING(s) (s = malloc(512))
+#define SCANF_STRING(s) (s = xmalloc(512))
#define GETCWD_SIZE -1
inline int snprintf(char *str, size_t n, const char *fmt, ...)
{
@@ -1540,14 +1540,7 @@ void process_buffer(int inp_size) {
void parse_image(){
int ret;
- file_buffer = malloc(erase_block_size);
-
- if (!file_buffer) {
- perror("out of memory");
- close (in_fd);
- close (out_fd);
- exit(1);
- }
+ file_buffer = xmalloc(erase_block_size);
while ((ret = load_next_block())) {
process_buffer(ret);
@@ -1721,7 +1714,7 @@ int main(int argc, char **argv)
jffs2_compression_check_set(1);
break;
case 'y':
- compr_name = malloc(strlen(optarg));
+ compr_name = xmalloc(strlen(optarg));
sscanf(optarg,"%d:%s",&compr_prior,compr_name);
if ((compr_prior>=0)&&(compr_name)) {
if (jffs2_set_compressor_priority(compr_name, compr_prior))