diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-03-08 07:03:27 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-03-08 07:03:27 +0000 |
commit | 874af85d5eb08b65476f406f6a1e7edc127ac210 (patch) | |
tree | 1cb4ee52f1592350dd9c4471b2a334957cc42b5e /e2fsprogs/blkid/read.c | |
parent | 0f2dd9f4eb9007bf44aa3f0cf30a35c36fbbd5b2 (diff) | |
download | busybox-w32-874af85d5eb08b65476f406f6a1e7edc127ac210.tar.gz busybox-w32-874af85d5eb08b65476f406f6a1e7edc127ac210.tar.bz2 busybox-w32-874af85d5eb08b65476f406f6a1e7edc127ac210.zip |
import most of e2fsprogs 1.38 updates
Diffstat (limited to 'e2fsprogs/blkid/read.c')
-rw-r--r-- | e2fsprogs/blkid/read.c | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c index 08a3162f3..5f7422b0c 100644 --- a/e2fsprogs/blkid/read.c +++ b/e2fsprogs/blkid/read.c | |||
@@ -33,6 +33,11 @@ | |||
33 | 33 | ||
34 | #include <stdlib.h> | 34 | #include <stdlib.h> |
35 | 35 | ||
36 | #ifdef TEST_PROGRAM | ||
37 | #define blkid_debug_dump_dev(dev) (debug_dump_dev(dev)) | ||
38 | static void debug_dump_dev(blkid_dev dev); | ||
39 | #endif | ||
40 | |||
36 | /* | 41 | /* |
37 | * File format: | 42 | * File format: |
38 | * | 43 | * |
@@ -355,7 +360,7 @@ static int blkid_parse_line(blkid_cache cache, blkid_dev *dev_p, char *cp) | |||
355 | blkid_free_dev(dev); | 360 | blkid_free_dev(dev); |
356 | } | 361 | } |
357 | 362 | ||
358 | DEB_DUMP_DEV(DEBUG_READ, dev); | 363 | DBG(DEBUG_READ, blkid_debug_dump_dev(dev)); |
359 | 364 | ||
360 | return ret; | 365 | return ret; |
361 | } | 366 | } |
@@ -433,6 +438,32 @@ errout: | |||
433 | } | 438 | } |
434 | 439 | ||
435 | #ifdef TEST_PROGRAM | 440 | #ifdef TEST_PROGRAM |
441 | static void debug_dump_dev(blkid_dev dev) | ||
442 | { | ||
443 | struct list_head *p; | ||
444 | |||
445 | if (!dev) { | ||
446 | printf(" dev: NULL\n"); | ||
447 | return; | ||
448 | } | ||
449 | |||
450 | printf(" dev: name = %s\n", dev->bid_name); | ||
451 | printf(" dev: DEVNO=\"0x%0llx\"\n", dev->bid_devno); | ||
452 | printf(" dev: TIME=\"%lu\"\n", dev->bid_time); | ||
453 | printf(" dev: PRI=\"%d\"\n", dev->bid_pri); | ||
454 | printf(" dev: flags = 0x%08X\n", dev->bid_flags); | ||
455 | |||
456 | list_for_each(p, &dev->bid_tags) { | ||
457 | blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); | ||
458 | if (tag) | ||
459 | printf(" tag: %s=\"%s\"\n", tag->bit_name, | ||
460 | tag->bit_val); | ||
461 | else | ||
462 | printf(" tag: NULL\n"); | ||
463 | } | ||
464 | printf("\n"); | ||
465 | } | ||
466 | |||
436 | int main(int argc, char**argv) | 467 | int main(int argc, char**argv) |
437 | { | 468 | { |
438 | blkid_cache cache = NULL; | 469 | blkid_cache cache = NULL; |