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/blkid | |
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/blkid')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/devname.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/probe.c | 16 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/resolve.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/tag.c | 2 |
4 files changed, 11 insertions, 11 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) | |||
82 | static void get_ext2_info(blkid_dev dev, unsigned char *buf) | 82 | static 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; |