aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-03-05 14:10:54 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-03-05 14:10:54 +0100
commit4b1100edd8180efa2e81860ef2fadeebcb21f5fa (patch)
tree84ae15d899f04dc8fdc16172446eb8e76a834d67
parent44fbfa78ca6126d658ff48cef79e2f7d29fae6c8 (diff)
downloadbusybox-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>
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/devname.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/probe.c16
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/resolve.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/tag.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsck.c16
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/alloc.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/bmap.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/closefs.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ext_attr.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/finddev.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/imager.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/namei.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/fsck.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/mke2fs.c4
-rw-r--r--shell/ash.c2
19 files changed, 36 insertions, 36 deletions
diff --git a/e2fsprogs/old_e2fsprogs/blkid/devname.c b/e2fsprogs/old_e2fsprogs/blkid/devname.c
index 348e5d42e..fad92cb31 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/devname.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/devname.c
@@ -258,7 +258,7 @@ int blkid_probe_all(blkid_cache cache)
258{ 258{
259 FILE *proc; 259 FILE *proc;
260 char line[1024]; 260 char line[1024];
261 char ptname0[128], ptname1[128], *ptname = 0; 261 char ptname0[128], ptname1[128], *ptname = NULL;
262 char *ptnames[2]; 262 char *ptnames[2];
263 dev_t devs[2]; 263 dev_t devs[2];
264 int ma, mi; 264 int ma, mi;
diff --git a/e2fsprogs/old_e2fsprogs/blkid/probe.c b/e2fsprogs/old_e2fsprogs/blkid/probe.c
index 1f7188e6d..77bfc737d 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/probe.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/probe.c
@@ -82,7 +82,7 @@ static void set_uuid(blkid_dev dev, uuid_t uuid)
82static void get_ext2_info(blkid_dev dev, unsigned char *buf) 82static void get_ext2_info(blkid_dev dev, unsigned char *buf)
83{ 83{
84 struct ext2_super_block *es = (struct ext2_super_block *) buf; 84 struct ext2_super_block *es = (struct ext2_super_block *) buf;
85 const char *label = 0; 85 const char *label = NULL;
86 86
87 DBG(DEBUG_PROBE, printf("ext2_sb.compat = %08X:%08X:%08X\n", 87 DBG(DEBUG_PROBE, printf("ext2_sb.compat = %08X:%08X:%08X\n",
88 blkid_le32(es->s_feature_compat), 88 blkid_le32(es->s_feature_compat),
@@ -168,7 +168,7 @@ static int probe_vfat(int fd __BLKID_ATTR((unused)),
168{ 168{
169 struct vfat_super_block *vs; 169 struct vfat_super_block *vs;
170 char serno[10]; 170 char serno[10];
171 const char *label = 0; 171 const char *label = NULL;
172 int label_len = 0; 172 int label_len = 0;
173 173
174 vs = (struct vfat_super_block *)buf; 174 vs = (struct vfat_super_block *)buf;
@@ -201,7 +201,7 @@ static int probe_msdos(int fd __BLKID_ATTR((unused)),
201{ 201{
202 struct msdos_super_block *ms = (struct msdos_super_block *) buf; 202 struct msdos_super_block *ms = (struct msdos_super_block *) buf;
203 char serno[10]; 203 char serno[10];
204 const char *label = 0; 204 const char *label = NULL;
205 int label_len = 0; 205 int label_len = 0;
206 206
207 if (strncmp(ms->ms_label, "NO NAME", 7)) { 207 if (strncmp(ms->ms_label, "NO NAME", 7)) {
@@ -232,7 +232,7 @@ static int probe_xfs(int fd __BLKID_ATTR((unused)),
232 unsigned char *buf) 232 unsigned char *buf)
233{ 233{
234 struct xfs_super_block *xs; 234 struct xfs_super_block *xs;
235 const char *label = 0; 235 const char *label = NULL;
236 236
237 xs = (struct xfs_super_block *)buf; 237 xs = (struct xfs_super_block *)buf;
238 238
@@ -250,7 +250,7 @@ static int probe_reiserfs(int fd __BLKID_ATTR((unused)),
250{ 250{
251 struct reiserfs_super_block *rs = (struct reiserfs_super_block *) buf; 251 struct reiserfs_super_block *rs = (struct reiserfs_super_block *) buf;
252 unsigned int blocksize; 252 unsigned int blocksize;
253 const char *label = 0; 253 const char *label = NULL;
254 254
255 blocksize = blkid_le16(rs->rs_blocksize); 255 blocksize = blkid_le16(rs->rs_blocksize);
256 256
@@ -277,7 +277,7 @@ static int probe_jfs(int fd __BLKID_ATTR((unused)),
277 unsigned char *buf) 277 unsigned char *buf)
278{ 278{
279 struct jfs_super_block *js; 279 struct jfs_super_block *js;
280 const char *label = 0; 280 const char *label = NULL;
281 281
282 js = (struct jfs_super_block *)buf; 282 js = (struct jfs_super_block *)buf;
283 283
@@ -295,7 +295,7 @@ static int probe_romfs(int fd __BLKID_ATTR((unused)),
295 unsigned char *buf) 295 unsigned char *buf)
296{ 296{
297 struct romfs_super_block *ros; 297 struct romfs_super_block *ros;
298 const char *label = 0; 298 const char *label = NULL;
299 299
300 ros = (struct romfs_super_block *)buf; 300 ros = (struct romfs_super_block *)buf;
301 301
@@ -312,7 +312,7 @@ static int probe_cramfs(int fd __BLKID_ATTR((unused)),
312 unsigned char *buf) 312 unsigned char *buf)
313{ 313{
314 struct cramfs_super_block *csb; 314 struct cramfs_super_block *csb;
315 const char *label = 0; 315 const char *label = NULL;
316 316
317 csb = (struct cramfs_super_block *)buf; 317 csb = (struct cramfs_super_block *)buf;
318 318
diff --git a/e2fsprogs/old_e2fsprogs/blkid/resolve.c b/e2fsprogs/old_e2fsprogs/blkid/resolve.c
index 0f92158e2..295ca61bf 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/resolve.c
@@ -65,7 +65,7 @@ char *blkid_get_devname(blkid_cache cache, const char *token,
65{ 65{
66 blkid_dev dev; 66 blkid_dev dev;
67 blkid_cache c = cache; 67 blkid_cache c = cache;
68 char *t = 0, *v = 0; 68 char *t = NULL, *v = NULL;
69 char *ret = NULL; 69 char *ret = NULL;
70 70
71 if (!token) 71 if (!token)
diff --git a/e2fsprogs/old_e2fsprogs/blkid/tag.c b/e2fsprogs/old_e2fsprogs/blkid/tag.c
index c0a93df98..8337b46b6 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/tag.c
@@ -112,7 +112,7 @@ int blkid_set_tag(blkid_dev dev, const char *name,
112 const char *value, const int vlength) 112 const char *value, const int vlength)
113{ 113{
114 blkid_tag t = 0, head = 0; 114 blkid_tag t = 0, head = 0;
115 char *val = 0; 115 char *val = NULL;
116 116
117 if (!dev || !name) 117 if (!dev || !name)
118 return -BLKID_ERR_PARAM; 118 return -BLKID_ERR_PARAM;
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 7e0996956..7384bc453 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -1539,7 +1539,7 @@ static errcode_t e2fsck_get_journal(e2fsck_t ctx, journal_t **ret_journal)
1539 struct buffer_head *bh; 1539 struct buffer_head *bh;
1540 struct inode *j_inode = NULL; 1540 struct inode *j_inode = NULL;
1541 struct kdev_s *dev_fs = NULL, *dev_journal; 1541 struct kdev_s *dev_fs = NULL, *dev_journal;
1542 const char *journal_name = 0; 1542 const char *journal_name = NULL;
1543 journal_t *journal = NULL; 1543 journal_t *journal = NULL;
1544 errcode_t retval = 0; 1544 errcode_t retval = 0;
1545 io_manager io_ptr = 0; 1545 io_manager io_ptr = 0;
@@ -6009,7 +6009,7 @@ static int check_dir_block(ext2_filsys fs,
6009 struct dir_info *subdir, *dir; 6009 struct dir_info *subdir, *dir;
6010 struct dx_dir_info *dx_dir; 6010 struct dx_dir_info *dx_dir;
6011#ifdef ENABLE_HTREE 6011#ifdef ENABLE_HTREE
6012 struct dx_dirblock_info *dx_db = 0; 6012 struct dx_dirblock_info *dx_db = NULL;
6013#endif /* ENABLE_HTREE */ 6013#endif /* ENABLE_HTREE */
6014 struct ext2_dir_entry *dirent, *prev; 6014 struct ext2_dir_entry *dirent, *prev;
6015 ext2_dirhash_t hash; 6015 ext2_dirhash_t hash;
@@ -7524,7 +7524,7 @@ static void e2fsck_pass4(e2fsck_t ctx)
7524 struct ext2_inode inode; 7524 struct ext2_inode inode;
7525 struct problem_context pctx; 7525 struct problem_context pctx;
7526 __u16 link_count, link_counted; 7526 __u16 link_count, link_counted;
7527 char *buf = 0; 7527 char *buf = NULL;
7528 int group, maxgroup; 7528 int group, maxgroup;
7529 7529
7530 /* Pass 4 */ 7530 /* Pass 4 */
@@ -9670,7 +9670,7 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
9670{ 9670{
9671 ext2_filsys fs = ctx->fs; 9671 ext2_filsys fs = ctx->fs;
9672 const struct e2fsck_problem *ptr; 9672 const struct e2fsck_problem *ptr;
9673 struct latch_descr *ldesc = 0; 9673 struct latch_descr *ldesc = NULL;
9674 const char *message; 9674 const char *message;
9675 int def_yn, answer, ans; 9675 int def_yn, answer, ans;
9676 int print_answer = 0; 9676 int print_answer = 0;
@@ -10669,7 +10669,7 @@ static errcode_t calculate_tree(ext2_filsys fs,
10669 ext2_ino_t parent) 10669 ext2_ino_t parent)
10670{ 10670{
10671 struct ext2_dx_root_info *root_info; 10671 struct ext2_dx_root_info *root_info;
10672 struct ext2_dx_entry *root, *dx_ent = 0; 10672 struct ext2_dx_entry *root, *dx_ent = NULL;
10673 struct ext2_dx_countlimit *root_limit, *limit; 10673 struct ext2_dx_countlimit *root_limit, *limit;
10674 errcode_t retval; 10674 errcode_t retval;
10675 char * block_start; 10675 char * block_start;
@@ -10821,7 +10821,7 @@ static errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino)
10821 ext2_filsys fs = ctx->fs; 10821 ext2_filsys fs = ctx->fs;
10822 errcode_t retval; 10822 errcode_t retval;
10823 struct ext2_inode inode; 10823 struct ext2_inode inode;
10824 char *dir_buf = 0; 10824 char *dir_buf = NULL;
10825 struct fill_dir_struct fd; 10825 struct fill_dir_struct fd;
10826 struct out_dir outdir; 10826 struct out_dir outdir;
10827 10827
@@ -11559,7 +11559,7 @@ static void check_resize_inode(e2fsck_t ctx)
11559 struct problem_context pctx; 11559 struct problem_context pctx;
11560 int i, j, gdt_off, ind_off; 11560 int i, j, gdt_off, ind_off;
11561 blk_t blk, pblk, expect; 11561 blk_t blk, pblk, expect;
11562 __u32 *dind_buf = 0, *ind_buf; 11562 __u32 *dind_buf = NULL, *ind_buf;
11563 errcode_t retval; 11563 errcode_t retval;
11564 11564
11565 clear_problem_context(&pctx); 11565 clear_problem_context(&pctx);
@@ -12975,7 +12975,7 @@ static errcode_t PRS(int argc, char **argv, e2fsck_t *ret_ctx)
12975 e2fsck_t ctx; 12975 e2fsck_t ctx;
12976 errcode_t retval; 12976 errcode_t retval;
12977 struct sigaction sa; 12977 struct sigaction sa;
12978 char *extended_opts = 0; 12978 char *extended_opts = NULL;
12979 12979
12980 retval = e2fsck_allocate_context(&ctx); 12980 retval = e2fsck_allocate_context(&ctx);
12981 if (retval) 12981 if (retval)
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 */
116char *ext2fs_find_block_device(dev_t device) 116char *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 */
334errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags) 334errcode_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)
149static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) 149static 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;
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index c0964f79d..dc029b65a 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -1166,7 +1166,7 @@ static void signal_cancel(int sig FSCK_ATTR((unused)))
1166static void PRS(int argc, char **argv) 1166static void PRS(int argc, char **argv)
1167{ 1167{
1168 int i, j; 1168 int i, j;
1169 char *arg, *dev, *tmp = 0; 1169 char *arg, *dev, *tmp = NULL;
1170 char options[128]; 1170 char options[128];
1171 int opt = 0; 1171 int opt = 0;
1172 int opts_for_fsck = 0; 1172 int opts_for_fsck = 0;
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index 32f0329c3..520364550 100644
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -799,8 +799,8 @@ static int PRS(int argc, char **argv)
799 int show_version_only = 0; 799 int show_version_only = 0;
800 ext2_ino_t num_inodes = 0; 800 ext2_ino_t num_inodes = 0;
801 errcode_t retval; 801 errcode_t retval;
802 char * extended_opts = 0; 802 char * extended_opts = NULL;
803 const char * fs_type = 0; 803 const char * fs_type = NULL;
804 blk_t dev_size; 804 blk_t dev_size;
805 long sysval; 805 long sysval;
806 806
diff --git a/shell/ash.c b/shell/ash.c
index 03904bbf8..8ffe67cca 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2482,7 +2482,7 @@ static void hashcd(void);
2482static int 2482static int
2483docd(const char *dest, int flags) 2483docd(const char *dest, int flags)
2484{ 2484{
2485 const char *dir = 0; 2485 const char *dir = NULL;
2486 int err; 2486 int err;
2487 2487
2488 TRACE(("docd(\"%s\", %d) called\n", dest, flags)); 2488 TRACE(("docd(\"%s\", %d) called\n", dest, flags));