blkid: rename blkid_debug_init to blkid_init_debug

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libs/blkid/src/blkidP.h b/libs/blkid/src/blkidP.h
index 128c6df2205986c9d981d915fe299dc4f6f78300..4131c5bba8493fb7cf096df0d75717c904e0f2c0 100644 (file)
--- 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 <stdio.h>
 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 d2b54f23da322a34ceef6ef3371ae9f0611617a2..01e4be061fd15db3549405454a84d26a7f86973d 100644 (file)
--- 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 f75b292845f326b6dbb37b17f4fa1181cbed7277..2e5921819201d2fd5001a0a91a52e99e2fbadbea 100644 (file)
--- 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 856e7d3ed509f19c861f9a5cd615841930c81dd6..31b9fe86f32c4ba390c4698e1960138b378f2260 100644 (file)
--- 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 5f877fcc7815413ef68adff73fd959afc31d5cc8..7cf6d6771bdaf83b55df6f099021221aab270e38 100644 (file)
--- 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 3b1d2c3294ae29db1cdd4d14a00d50e784dcac14..8ffdb835d37c96422b5b6b05bd64b31797803fd3 100644 (file)
--- 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 e2acee7c40bee8f93c523a2164ed5fd5e2764dc5..85591b71d5260e04f3993ef9957bf26e2413a550 100644 (file)
--- 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 74c9edfcbaba7ed0900b98be5d763034c323efc7..e6038c2069bae8eca2d1828e7f167a4179f60be0 100644 (file)
--- 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 09980d76d3bf953db94574c05b6dd1c54dabf173..4163874563e6bf8bf99590908156795c86ef46c1 100644 (file)
--- 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 b6ca827ccf59454bc54064917432627eb4c52516..bf13b86488bb01b0dbccfa2aab361fb91faa9c01 100644 (file)
--- 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 12d385d0a75871cc1d0ddfc67a19c887dc6abff2..bbe6f488e26495b360633332bbca411034796269 100644 (file)
--- 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 f7d04950ad23681c7ec10f39c12d626ec1c556d8..0dbe1ff5a4f2bfe71cfc004b6d0cb7437f035b88 100644 (file)
--- 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 '?':