From 7a45833263459bc599478569c0e8840264211603 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 20 Apr 2009 11:54:41 +0200 Subject: [PATCH] blkid: rename blkid_debug_init to blkid_init_debug Signed-off-by: Karel Zak --- libs/blkid/src/blkidP.h | 4 ++-- libs/blkid/src/cache.c | 6 +++--- libs/blkid/src/config.c | 2 +- libs/blkid/src/dev.c | 2 +- libs/blkid/src/devname.c | 2 +- libs/blkid/src/devno.c | 2 +- libs/blkid/src/evaluate.c | 4 ++-- libs/blkid/src/probe.c | 2 +- libs/blkid/src/read.c | 2 +- libs/blkid/src/resolve.c | 2 +- libs/blkid/src/save.c | 2 +- libs/blkid/src/tag.c | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libs/blkid/src/blkidP.h b/libs/blkid/src/blkidP.h index 128c6df2..4131c5bb 100644 --- a/libs/blkid/src/blkidP.h +++ b/libs/blkid/src/blkidP.h @@ -264,7 +264,7 @@ extern char *blkid_strndup(const char *s, const int length); #ifdef CONFIG_BLKID_DEBUG #include extern int blkid_debug_mask; -extern void blkid_debug_init(int mask); +extern void blkid_init_debug(int mask); extern void blkid_debug_dump_dev(blkid_dev dev); extern void blkid_debug_dump_tag(blkid_tag tag); @@ -272,7 +272,7 @@ extern void blkid_debug_dump_tag(blkid_tag tag); #else /* !CONFIG_BLKID_DEBUG */ #define DBG(m,x) -#define blkid_debug_init(x) +#define blkid_init_debug(x) #endif /* CONFIG_BLKID_DEBUG */ /* devno.c */ diff --git a/libs/blkid/src/cache.c b/libs/blkid/src/cache.c index d2b54f23..01e4be06 100644 --- a/libs/blkid/src/cache.c +++ b/libs/blkid/src/cache.c @@ -76,7 +76,7 @@ static blkid_debug_dump_cache(int mask, blkid_cache cache) #endif #ifdef CONFIG_BLKID_DEBUG -void blkid_debug_init(int mask) +void blkid_init_debug(int mask) { if (blkid_debug_mask & DEBUG_INIT) return; @@ -124,7 +124,7 @@ int blkid_get_cache(blkid_cache *ret_cache, const char *filename) { blkid_cache cache; - blkid_debug_init(0); + blkid_init_debug(0); DBG(DEBUG_CACHE, printf("creating blkid cache (using %s)\n", filename ? filename : "default cache")); @@ -216,7 +216,7 @@ int main(int argc, char** argv) blkid_cache cache = NULL; int ret; - blkid_debug_init(DEBUG_ALL); + blkid_init_debug(DEBUG_ALL); if ((argc > 2)) { fprintf(stderr, "Usage: %s [filename] \n", argv[0]); diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c index f75b2928..2e592181 100644 --- a/libs/blkid/src/config.c +++ b/libs/blkid/src/config.c @@ -185,7 +185,7 @@ int main(int argc, char *argv[]) struct blkid_config *conf; char *filename = NULL; - blkid_debug_init(DEBUG_ALL); + blkid_init_debug(DEBUG_ALL); if (argc == 2) filename = argv[1]; diff --git a/libs/blkid/src/dev.c b/libs/blkid/src/dev.c index 856e7d3e..31b9fe86 100644 --- a/libs/blkid/src/dev.c +++ b/libs/blkid/src/dev.c @@ -220,7 +220,7 @@ int main(int argc, char **argv) optarg); exit(1); } - blkid_debug_init(mask); + blkid_init_debug(mask); break; } case '?': diff --git a/libs/blkid/src/devname.c b/libs/blkid/src/devname.c index 5f877fcc..7cf6d677 100644 --- a/libs/blkid/src/devname.c +++ b/libs/blkid/src/devname.c @@ -477,7 +477,7 @@ int main(int argc, char **argv) blkid_cache cache = NULL; int ret; - blkid_debug_init(DEBUG_ALL); + blkid_init_debug(DEBUG_ALL); if (argc != 1) { fprintf(stderr, "Usage: %s\n" "Probe all devices and exit\n", argv[0]); diff --git a/libs/blkid/src/devno.c b/libs/blkid/src/devno.c index 3b1d2c32..8ffdb835 100644 --- a/libs/blkid/src/devno.c +++ b/libs/blkid/src/devno.c @@ -194,7 +194,7 @@ int main(int argc, char** argv) dev_t devno; const char *errmsg = "Couldn't parse %s: %s\n"; - blkid_debug_init(DEBUG_ALL); + blkid_init_debug(DEBUG_ALL); if ((argc != 2) && (argc != 3)) { fprintf(stderr, "Usage:\t%s device_number\n\t%s major minor\n" "Resolve a device number to a device name\n", diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c index e2acee7c..85591b71 100644 --- a/libs/blkid/src/evaluate.c +++ b/libs/blkid/src/evaluate.c @@ -203,7 +203,7 @@ char *blkid_evaluate_spec(const char *token, const char *value, blkid_cache *cac return NULL; if (!cache || !*cache) - blkid_debug_init(0); + blkid_init_debug(0); DBG(DEBUG_EVALUATE, printf("evaluating %s%s%s\n", token, value ? "=" : "", @@ -254,7 +254,7 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - blkid_debug_init(0); + blkid_init_debug(0); res = blkid_evaluate_spec(argv[1], argv[2], &cache); if (res) diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c index 74c9edfc..e6038c20 100644 --- a/libs/blkid/src/probe.c +++ b/libs/blkid/src/probe.c @@ -136,7 +136,7 @@ int blkid_known_fstype(const char *fstype) */ blkid_probe blkid_new_probe(void) { - blkid_debug_init(0); + blkid_init_debug(0); return calloc(1, sizeof(struct blkid_struct_probe)); } diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c index 09980d76..41638745 100644 --- a/libs/blkid/src/read.c +++ b/libs/blkid/src/read.c @@ -476,7 +476,7 @@ int main(int argc, char**argv) blkid_cache cache = NULL; int ret; - blkid_debug_init(DEBUG_ALL); + blkid_init_debug(DEBUG_ALL); if (argc > 2) { fprintf(stderr, "Usage: %s [filename]\n" "Test parsing of the cache (filename)\n", argv[0]); diff --git a/libs/blkid/src/resolve.c b/libs/blkid/src/resolve.c index b6ca827c..bf13b864 100644 --- a/libs/blkid/src/resolve.c +++ b/libs/blkid/src/resolve.c @@ -111,7 +111,7 @@ int main(int argc, char **argv) char *value; blkid_cache cache; - blkid_debug_init(DEBUG_ALL); + blkid_init_debug(DEBUG_ALL); if (argc != 2 && argc != 3) { fprintf(stderr, "Usage:\t%s tagname=value\n" "\t%s tagname devname\n" diff --git a/libs/blkid/src/save.c b/libs/blkid/src/save.c index 12d385d0..bbe6f488 100644 --- a/libs/blkid/src/save.c +++ b/libs/blkid/src/save.c @@ -163,7 +163,7 @@ int main(int argc, char **argv) blkid_cache cache = NULL; int ret; - blkid_debug_init(DEBUG_ALL); + blkid_init_debug(DEBUG_ALL); if (argc > 2) { fprintf(stderr, "Usage: %s [filename]\n" "Test loading/saving a cache (filename)\n", argv[0]); diff --git a/libs/blkid/src/tag.c b/libs/blkid/src/tag.c index f7d04950..0dbe1ff5 100644 --- a/libs/blkid/src/tag.c +++ b/libs/blkid/src/tag.c @@ -426,7 +426,7 @@ int main(int argc, char **argv) optarg); exit(1); } - blkid_debug_init(mask); + blkid_init_debug(mask); break; } case '?': -- 2.39.5