diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-05 14:10:54 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-05 14:10:54 +0100 |
commit | 4b1100edd8180efa2e81860ef2fadeebcb21f5fa (patch) | |
tree | 84ae15d899f04dc8fdc16172446eb8e76a834d67 /e2fsprogs/old_e2fsprogs/ext2fs | |
parent | 44fbfa78ca6126d658ff48cef79e2f7d29fae6c8 (diff) | |
download | busybox-w32-4b1100edd8180efa2e81860ef2fadeebcb21f5fa.tar.gz busybox-w32-4b1100edd8180efa2e81860ef2fadeebcb21f5fa.tar.bz2 busybox-w32-4b1100edd8180efa2e81860ef2fadeebcb21f5fa.zip |
*: use NULL for null pointers
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'e2fsprogs/old_e2fsprogs/ext2fs')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/alloc.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/bmap.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/closefs.c | 4 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/ext_attr.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/finddev.c | 4 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/imager.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/namei.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c b/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c index 590f23a7e..5021d72c9 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c | |||
@@ -109,7 +109,7 @@ errcode_t ext2fs_alloc_block(ext2_filsys fs, blk_t goal, | |||
109 | { | 109 | { |
110 | errcode_t retval; | 110 | errcode_t retval; |
111 | blk_t block; | 111 | blk_t block; |
112 | char *buf = 0; | 112 | char *buf = NULL; |
113 | 113 | ||
114 | if (!block_buf) { | 114 | if (!block_buf) { |
115 | retval = ext2fs_get_mem(fs->blocksize, &buf); | 115 | retval = ext2fs_get_mem(fs->blocksize, &buf); |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c b/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c index b22fe3dbf..b2d0279d8 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c | |||
@@ -136,7 +136,7 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode, | |||
136 | struct ext2_inode inode_buf; | 136 | struct ext2_inode inode_buf; |
137 | blk_t addr_per_block; | 137 | blk_t addr_per_block; |
138 | blk_t b; | 138 | blk_t b; |
139 | char *buf = 0; | 139 | char *buf = NULL; |
140 | errcode_t retval = 0; | 140 | errcode_t retval = 0; |
141 | int blocks_alloc = 0, inode_dirty = 0; | 141 | int blocks_alloc = 0, inode_dirty = 0; |
142 | 142 | ||
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c b/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c index 008d5f36e..7ba7f22e2 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c | |||
@@ -206,8 +206,8 @@ errcode_t ext2fs_flush(ext2_filsys fs) | |||
206 | blk_t group_block; | 206 | blk_t group_block; |
207 | errcode_t retval; | 207 | errcode_t retval; |
208 | unsigned long fs_state; | 208 | unsigned long fs_state; |
209 | struct ext2_super_block *super_shadow = 0; | 209 | struct ext2_super_block *super_shadow = NULL; |
210 | struct ext2_group_desc *group_shadow = 0; | 210 | struct ext2_group_desc *group_shadow = NULL; |
211 | char *group_ptr; | 211 | char *group_ptr; |
212 | int old_desc_blocks; | 212 | int old_desc_blocks; |
213 | #if BB_BIG_ENDIAN | 213 | #if BB_BIG_ENDIAN |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c b/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c index 5d3f6a1bc..f651338e3 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c | |||
@@ -80,7 +80,7 @@ errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block, | |||
80 | int do_swap = 0; | 80 | int do_swap = 0; |
81 | errcode_t retval; | 81 | errcode_t retval; |
82 | char *p, *end; | 82 | char *p, *end; |
83 | char *buf = 0; | 83 | char *buf = NULL; |
84 | struct ext2_dir_entry *dirent; | 84 | struct ext2_dir_entry *dirent; |
85 | 85 | ||
86 | if ((fs->flags & EXT2_FLAG_SWAP_BYTES) || | 86 | if ((fs->flags & EXT2_FLAG_SWAP_BYTES) || |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext_attr.c b/e2fsprogs/old_e2fsprogs/ext2fs/ext_attr.c index 7ee41f234..a2ba12d45 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/ext_attr.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext_attr.c | |||
@@ -68,7 +68,7 @@ errcode_t ext2fs_adjust_ea_refcount(ext2_filsys fs, blk_t blk, | |||
68 | { | 68 | { |
69 | errcode_t retval; | 69 | errcode_t retval; |
70 | struct ext2_ext_attr_header *header; | 70 | struct ext2_ext_attr_header *header; |
71 | char *buf = 0; | 71 | char *buf = NULL; |
72 | 72 | ||
73 | if ((blk >= fs->super->s_blocks_count) || | 73 | if ((blk >= fs->super->s_blocks_count) || |
74 | (blk < fs->super->s_first_data_block)) | 74 | (blk < fs->super->s_first_data_block)) |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/finddev.c b/e2fsprogs/old_e2fsprogs/ext2fs/finddev.c index 5e2cce940..e9e83fd7a 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/finddev.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/finddev.c | |||
@@ -115,9 +115,9 @@ success: | |||
115 | */ | 115 | */ |
116 | char *ext2fs_find_block_device(dev_t device) | 116 | char *ext2fs_find_block_device(dev_t device) |
117 | { | 117 | { |
118 | struct dir_list *list = 0, *new_list = 0; | 118 | struct dir_list *list = NULL, *new_list = NULL; |
119 | struct dir_list *current; | 119 | struct dir_list *current; |
120 | char *ret_path = 0; | 120 | char *ret_path = NULL; |
121 | 121 | ||
122 | /* | 122 | /* |
123 | * Add the starting directories to search... | 123 | * Add the starting directories to search... |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/imager.c b/e2fsprogs/old_e2fsprogs/ext2fs/imager.c index e82321efa..0f9cfcfaf 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/imager.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/imager.c | |||
@@ -333,7 +333,7 @@ errout: | |||
333 | */ | 333 | */ |
334 | errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags) | 334 | errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags) |
335 | { | 335 | { |
336 | char *ptr, *buf = 0; | 336 | char *ptr, *buf = NULL; |
337 | int size; | 337 | int size; |
338 | ssize_t actual; | 338 | ssize_t actual; |
339 | errcode_t retval; | 339 | errcode_t retval; |
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c b/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c index b63c5d7a6..93f47b06f 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c | |||
@@ -39,7 +39,7 @@ errcode_t ext2fs_mkdir(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t inum, | |||
39 | ext2_ino_t ino = inum; | 39 | ext2_ino_t ino = inum; |
40 | ext2_ino_t scratch_ino; | 40 | ext2_ino_t scratch_ino; |
41 | blk_t blk; | 41 | blk_t blk; |
42 | char *block = 0; | 42 | char *block = NULL; |
43 | 43 | ||
44 | EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); | 44 | EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); |
45 | 45 | ||
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c b/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c index af47aee18..db1c8bff3 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c | |||
@@ -95,7 +95,7 @@ static errcode_t write_journal_file(ext2_filsys fs, char *filename, | |||
95 | blk_t size, int flags) | 95 | blk_t size, int flags) |
96 | { | 96 | { |
97 | errcode_t retval; | 97 | errcode_t retval; |
98 | char *buf = 0; | 98 | char *buf = NULL; |
99 | int fd, ret_size; | 99 | int fd, ret_size; |
100 | blk_t i; | 100 | blk_t i; |
101 | 101 | ||
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/namei.c b/e2fsprogs/old_e2fsprogs/ext2fs/namei.c index 4d4e3788c..14d48fb72 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/namei.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/namei.c | |||
@@ -30,7 +30,7 @@ static errcode_t follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t dir, | |||
30 | char *buf, ext2_ino_t *res_inode) | 30 | char *buf, ext2_ino_t *res_inode) |
31 | { | 31 | { |
32 | char *pathname; | 32 | char *pathname; |
33 | char *buffer = 0; | 33 | char *buffer = NULL; |
34 | errcode_t retval; | 34 | errcode_t retval; |
35 | struct ext2_inode ei; | 35 | struct ext2_inode ei; |
36 | 36 | ||
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c b/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c index a5782db95..0ae0a8234 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c | |||
@@ -149,7 +149,7 @@ errcode_t ext2fs_write_block_bitmap (ext2_filsys fs) | |||
149 | static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) | 149 | static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) |
150 | { | 150 | { |
151 | dgrp_t i; | 151 | dgrp_t i; |
152 | char *block_bitmap = 0, *inode_bitmap = 0; | 152 | char *block_bitmap = NULL, *inode_bitmap = NULL; |
153 | char *buf; | 153 | char *buf; |
154 | errcode_t retval; | 154 | errcode_t retval; |
155 | int block_nbytes = (int) EXT2_BLOCKS_PER_GROUP(fs->super) / 8; | 155 | int block_nbytes = (int) EXT2_BLOCKS_PER_GROUP(fs->super) / 8; |