diff options
| author | Karel Zak | 2015-02-23 15:45:41 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-02-24 10:24:15 +0100 |
| commit | af17d349fcbb6f42dcac66d13c44e8697410e6de (patch) | |
| tree | 38fd3ddc765fab0943db4421aa84a2ec3b3cb3cd /libblkid/src/blkidP.h | |
| parent | libblkid: make probing data structures more dynamic (diff) | |
| download | kernel-qcow2-util-linux-af17d349fcbb6f42dcac66d13c44e8697410e6de.tar.gz kernel-qcow2-util-linux-af17d349fcbb6f42dcac66d13c44e8697410e6de.tar.xz kernel-qcow2-util-linux-af17d349fcbb6f42dcac66d13c44e8697410e6de.zip | |
libblkid: cleanup names, don't copy probing results
* cleanup function and variable names (s/vals/values/)
* in "safe probe" mode libblkid copies probing result from the first
attempt, this is unnecessary, with values list we can just move
values to another list rather than copy all.
* add new debug messages
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/blkidP.h')
| -rw-r--r-- | libblkid/src/blkidP.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h index 4d440800e..8060bcc45 100644 --- a/libblkid/src/blkidP.h +++ b/libblkid/src/blkidP.h @@ -198,7 +198,7 @@ struct blkid_struct_probe struct blkid_chain chains[BLKID_NCHAINS]; /* array of chains */ struct blkid_chain *cur_chain; /* current chain */ - struct list_head vals; /* results */ + struct list_head values; /* results */ struct blkid_struct_probe *parent; /* for clones */ struct blkid_struct_probe *disk_probe; /* whole-disk probing */ @@ -417,9 +417,9 @@ extern int blkid_probe_is_covered_by_pt(blkid_probe pr, blkid_loff_t offset, blkid_loff_t size) __attribute__((warn_unused_result)); -extern void blkid_probe_chain_reset_vals(blkid_probe pr, struct blkid_chain *chn) +extern void blkid_probe_chain_reset_values(blkid_probe pr, struct blkid_chain *chn) __attribute__((nonnull)); -extern int blkid_probe_chain_copy_vals(blkid_probe pr, +extern int blkid_probe_chain_save_values(blkid_probe pr, struct blkid_chain *chn, struct list_head *vals) __attribute__((nonnull)); @@ -429,13 +429,15 @@ extern struct blkid_prval *blkid_probe_assign_value(blkid_probe pr, __attribute__((nonnull)) __attribute__((warn_unused_result)); -extern void blkid_probe_free_val(struct blkid_prval *v); +extern void blkid_probe_free_value(struct blkid_prval *v); -extern void blkid_probe_append_vals(blkid_probe pr, +extern void blkid_probe_append_values_list(blkid_probe pr, struct list_head *vals) __attribute__((nonnull)); +extern void blkid_probe_free_values_list(struct list_head *vals); + extern struct blkid_chain *blkid_probe_get_chain(blkid_probe pr) __attribute__((nonnull)) __attribute__((warn_unused_result)); |