libblkid: reset errno before calling probefuncs

The probers optionally use errno to communicate error details.
When a leftover errno is set from libblkid internally this can confuse
the probers.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index 1c344fd30334d60cfe6c75aa442247a1324f86ea..8ebf480f55c07c7676e7bd09a270b46e43857eea 100644 (file)
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -555,6 +555,7 @@ static int idinfo_probe(blkid_probe pr, const struct blkid_idinfo *id,
        if (id->probefunc) {
                DBG(LOWPROBE, ul_debug(
                        "%s: ---> call probefunc()", id->name));
+               errno = 0;
                rc = id->probefunc(pr, mag);
                if (rc < 0) {
                        /* reset after error */

diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index fb0392707896bdcc48df33b8ac63b878812533bc..96bc0ef89627788ce5acae2ea9d302bee6ebddce 100644 (file)
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -421,6 +421,7 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn)
                /* final check by probing function */
                if (id->probefunc) {
                        DBG(LOWPROBE, ul_debug("\tcall probefunc()"));
+                       errno = 0;
                        rc = id->probefunc(pr, mag);
                        if (rc != BLKID_PROBE_OK) {
                                blkid_probe_chain_reset_values(pr, chn);

diff --git a/libblkid/src/topology/topology.c b/libblkid/src/topology/topology.c
index cd1f4c25f747736b64256552c35370aad2566889..67df3e3389c941c281397b8793e0b318d0559ed7 100644 (file)
--- a/libblkid/src/topology/topology.c
+++ b/libblkid/src/topology/topology.c
@@ -182,6 +182,8 @@ static int topology_probe(blkid_probe pr, struct blkid_chain *chn)
 
                if (id->probefunc) {
                        DBG(LOWPROBE, ul_debug("%s: call probefunc()", id->name));
+
+                       errno = 0;
                        if (id->probefunc(pr, NULL) != 0)
                                continue;
                }