diff options
Diffstat (limited to 'e2fsprogs/blkid')
| -rw-r--r-- | e2fsprogs/blkid/blkid.h | 4 | ||||
| -rw-r--r-- | e2fsprogs/blkid/dev.c | 6 | ||||
| -rw-r--r-- | e2fsprogs/blkid/probe.c | 10 | ||||
| -rw-r--r-- | e2fsprogs/blkid/read.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/blkid/tag.c | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/e2fsprogs/blkid/blkid.h b/e2fsprogs/blkid/blkid.h index 54721b221..4fa9f6fdf 100644 --- a/e2fsprogs/blkid/blkid.h +++ b/e2fsprogs/blkid/blkid.h @@ -56,7 +56,7 @@ extern int blkid_get_cache(blkid_cache *cache, const char *filename); extern const char *blkid_dev_devname(blkid_dev dev); extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache); -extern int blkid_dev_set_search(blkid_dev_iterate iter, +extern int blkid_dev_set_search(blkid_dev_iterate iter, char *search_type, char *search_value); extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev); extern void blkid_dev_iterate_end(blkid_dev_iterate iterate); @@ -90,7 +90,7 @@ extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev); extern int blkid_tag_next(blkid_tag_iterate iterate, const char **type, const char **value); extern void blkid_tag_iterate_end(blkid_tag_iterate iterate); -extern int blkid_dev_has_tag(blkid_dev dev, const char *type, +extern int blkid_dev_has_tag(blkid_dev dev, const char *type, const char *value); extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache, const char *type, diff --git a/e2fsprogs/blkid/dev.c b/e2fsprogs/blkid/dev.c index 6d99504af..c2b756c81 100644 --- a/e2fsprogs/blkid/dev.c +++ b/e2fsprogs/blkid/dev.c @@ -76,8 +76,8 @@ void blkid_debug_dump_dev(blkid_dev dev) list_for_each(p, &dev->bid_tags) { blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); - if (tag) - printf(" tag: %s=\"%s\"\n", tag->bit_name, + if (tag) + printf(" tag: %s=\"%s\"\n", tag->bit_name, tag->bit_val); else printf(" tag: NULL\n"); @@ -177,7 +177,7 @@ int main(int argc, char **argv) case 'm': blkid_debug_mask = strtoul (optarg, &tmp, 0); if (*tmp) { - fprintf(stderr, "Invalid debug mask: %d\n", + fprintf(stderr, "Invalid debug mask: %d\n", optarg); exit(1); } diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c index 211569779..a2165efee 100644 --- a/e2fsprogs/blkid/probe.c +++ b/e2fsprogs/blkid/probe.c @@ -99,7 +99,7 @@ static void get_ext2_info(blkid_dev dev, unsigned char *buf) static int probe_ext3(int fd __BLKID_ATTR((unused)), blkid_cache cache __BLKID_ATTR((unused)), blkid_dev dev, - const struct blkid_magic *id __BLKID_ATTR((unused)), + const struct blkid_magic *id __BLKID_ATTR((unused)), unsigned char *buf) { struct ext2_super_block *es; @@ -126,7 +126,7 @@ static int probe_ext3(int fd __BLKID_ATTR((unused)), static int probe_ext2(int fd __BLKID_ATTR((unused)), blkid_cache cache __BLKID_ATTR((unused)), blkid_dev dev, - const struct blkid_magic *id __BLKID_ATTR((unused)), + const struct blkid_magic *id __BLKID_ATTR((unused)), unsigned char *buf) { struct ext2_super_block *es; @@ -305,10 +305,10 @@ static int probe_romfs(int fd __BLKID_ATTR((unused)), return 0; } -static int probe_cramfs(int fd __BLKID_ATTR((unused)), - blkid_cache cache __BLKID_ATTR((unused)), +static int probe_cramfs(int fd __BLKID_ATTR((unused)), + blkid_cache cache __BLKID_ATTR((unused)), blkid_dev dev, - const struct blkid_magic *id __BLKID_ATTR((unused)), + const struct blkid_magic *id __BLKID_ATTR((unused)), unsigned char *buf) { struct cramfs_super_block *csb; diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c index e954c6d94..624c907f3 100644 --- a/e2fsprogs/blkid/read.c +++ b/e2fsprogs/blkid/read.c @@ -432,7 +432,7 @@ static void debug_dump_dev(blkid_dev dev) list_for_each(p, &dev->bid_tags) { blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); if (tag) - printf(" tag: %s=\"%s\"\n", tag->bit_name, + printf(" tag: %s=\"%s\"\n", tag->bit_name, tag->bit_val); else printf(" tag: NULL\n"); diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c index ff10b28e2..09712bab7 100644 --- a/e2fsprogs/blkid/tag.c +++ b/e2fsprogs/blkid/tag.c @@ -355,7 +355,7 @@ extern int optind; void usage(char *prog) { fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device " - "[type value]\n", + "[type value]\n", prog); fprintf(stderr, "\tList all tags for a device and exit\n", prog); exit(1); @@ -383,7 +383,7 @@ int main(int argc, char **argv) case 'm': blkid_debug_mask = strtoul (optarg, &tmp, 0); if (*tmp) { - fprintf(stderr, "Invalid debug mask: %d\n", + fprintf(stderr, "Invalid debug mask: %d\n", optarg); exit(1); } @@ -414,7 +414,7 @@ int main(int argc, char **argv) if (search_type) { found = blkid_dev_has_tag(dev, search_type, search_value); printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev), - search_type, search_value ? search_value : "NULL", + search_type, search_value ? search_value : "NULL", found ? "FOUND" : "NOT FOUND"); return(!found); } |