diff options
| author | Karel Zak | 2011-05-13 12:48:57 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-05-16 20:22:52 +0200 |
| commit | ccdf9fda902256ba71c073050d99e57cb1ff953f (patch) | |
| tree | a6919b5e85bc936f297ffdbba82b28893e3f8904 /shlibs/blkid/src/probe.c | |
| parent | libblkid: cleanup flags (diff) | |
| download | kernel-qcow2-util-linux-ccdf9fda902256ba71c073050d99e57cb1ff953f.tar.gz kernel-qcow2-util-linux-ccdf9fda902256ba71c073050d99e57cb1ff953f.tar.xz kernel-qcow2-util-linux-ccdf9fda902256ba71c073050d99e57cb1ff953f.zip | |
libblkid: cleanup prober initialization
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/blkid/src/probe.c')
| -rw-r--r-- | shlibs/blkid/src/probe.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c index 54af59333..7cece7ef2 100644 --- a/shlibs/blkid/src/probe.c +++ b/shlibs/blkid/src/probe.c @@ -348,7 +348,6 @@ void blkid_reset_probe(blkid_probe pr) if (!pr) return; - blkid_probe_reset_buffer(pr); blkid_probe_reset_vals(pr); pr->cur_chain = NULL; @@ -595,6 +594,7 @@ int blkid_probe_set_device(blkid_probe pr, int fd, return -1; blkid_reset_probe(pr); + blkid_probe_reset_buffer(pr); if ((pr->flags & BLKID_FL_PRIVATE_FD) && pr->fd >= 0) close(pr->fd); @@ -602,12 +602,17 @@ int blkid_probe_set_device(blkid_probe pr, int fd, pr->flags &= ~BLKID_FL_PRIVATE_FD; pr->flags &= ~BLKID_FL_TINY_DEV; pr->flags &= ~BLKID_FL_CDROM_DEV; + pr->prob_flags = 0; pr->fd = fd; pr->off = off; pr->size = 0; pr->devno = 0; + pr->disk_devno = 0; pr->mode = 0; pr->blkssz = 0; + pr->wipe_off = 0; + pr->wipe_size = 0; + pr->wipe_chain = NULL; #if defined(POSIX_FADV_RANDOM) && defined(HAVE_POSIX_FADVISE) /* Disable read-ahead */ |