Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c
- Timestamp:
- Feb 25, 2011, 9:26:54 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c
r1765 r2725 83 83 { 84 84 struct ext2_super_block *es = (struct ext2_super_block *) buf; 85 const char *label = 0;85 const char *label = NULL; 86 86 87 87 DBG(DEBUG_PROBE, printf("ext2_sb.compat = %08X:%08X:%08X\n", … … 169 169 struct vfat_super_block *vs; 170 170 char serno[10]; 171 const char *label = 0;171 const char *label = NULL; 172 172 int label_len = 0; 173 173 … … 202 202 struct msdos_super_block *ms = (struct msdos_super_block *) buf; 203 203 char serno[10]; 204 const char *label = 0;204 const char *label = NULL; 205 205 int label_len = 0; 206 206 … … 233 233 { 234 234 struct xfs_super_block *xs; 235 const char *label = 0;235 const char *label = NULL; 236 236 237 237 xs = (struct xfs_super_block *)buf; … … 251 251 struct reiserfs_super_block *rs = (struct reiserfs_super_block *) buf; 252 252 unsigned int blocksize; 253 const char *label = 0;253 const char *label = NULL; 254 254 255 255 blocksize = blkid_le16(rs->rs_blocksize); … … 278 278 { 279 279 struct jfs_super_block *js; 280 const char *label = 0;280 const char *label = NULL; 281 281 282 282 js = (struct jfs_super_block *)buf; … … 296 296 { 297 297 struct romfs_super_block *ros; 298 const char *label = 0;298 const char *label = NULL; 299 299 300 300 ros = (struct romfs_super_block *)buf; … … 313 313 { 314 314 struct cramfs_super_block *csb; 315 const char *label = 0;315 const char *label = NULL; 316 316 317 317 csb = (struct cramfs_super_block *)buf; … … 430 430 major = ocfsmajor(ovh); 431 431 if (major == 1) 432 blkid_set_tag(dev, "SEC_TYPE","ocfs1",sizeof("ocfs1"));432 blkid_set_tag(dev, "SEC_TYPE", "ocfs1", sizeof("ocfs1")); 433 433 else if (major >= 9) 434 blkid_set_tag(dev, "SEC_TYPE","ntocfs",sizeof("ntocfs"));434 blkid_set_tag(dev, "SEC_TYPE", "ntocfs", sizeof("ntocfs")); 435 435 436 436 blkid_set_tag(dev, "LABEL", (const char*)ovl.label, ocfslabellen(ovl)); … … 563 563 return NULL; 564 564 565 now = time( 0);565 now = time(NULL); 566 566 diff = now - dev->bid_time; 567 567 … … 660 660 if (dev && type) { 661 661 dev->bid_devno = st.st_rdev; 662 dev->bid_time = time( 0);662 dev->bid_time = time(NULL); 663 663 dev->bid_flags |= BLKID_BID_FL_VERIFIED; 664 664 cache->bic_flags |= BLKID_BIC_FL_CHANGED;
Note:
See TracChangeset
for help on using the changeset viewer.