From 801b0a62519948fb42f271ad00fca64deef68c64 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 21 Dec 2022 19:07:54 +0000 Subject: [PATCH] libblkid: remove strewn around calls to blkid_init_debug() Now that we always initialize libblkid debugging when loading we don't need them anymore. --- libblkid/src/cache.c | 2 -- libblkid/src/evaluate.c | 5 ----- libblkid/src/probe.c | 1 - 3 files changed, 8 deletions(-) diff --git a/libblkid/src/cache.c b/libblkid/src/cache.c index a7f2c95ffc..5f598735b1 100644 --- a/libblkid/src/cache.c +++ b/libblkid/src/cache.c @@ -97,8 +97,6 @@ int blkid_get_cache(blkid_cache *ret_cache, const char *filename) if (!ret_cache) return -BLKID_ERR_PARAM; - blkid_init_debug(0); - if (!(cache = calloc(1, sizeof(struct blkid_struct_cache)))) return -BLKID_ERR_MEM; diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c index 8157a7cca6..cd2f3a377a 100644 --- a/libblkid/src/evaluate.c +++ b/libblkid/src/evaluate.c @@ -236,9 +236,6 @@ char *blkid_evaluate_tag(const char *token, const char *value, blkid_cache *cach if (!token) return NULL; - if (!cache || !*cache) - blkid_init_debug(0); - DBG(EVALUATE, ul_debug("evaluating %s%s%s", token, value ? "=" : "", value ? value : "")); @@ -317,8 +314,6 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - blkid_init_debug(0); - res = blkid_evaluate_spec(argv[1], &cache); if (res) printf("%s\n", res); diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c index 34d2646c0f..61c7a44680 100644 --- a/libblkid/src/probe.c +++ b/libblkid/src/probe.c @@ -139,7 +139,6 @@ blkid_probe blkid_new_probe(void) int i; blkid_probe pr; - blkid_init_debug(0); pr = calloc(1, sizeof(struct blkid_struct_probe)); if (!pr) return NULL; -- 2.47.2