diff options
| author | Karel Zak | 2013-04-08 18:22:13 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-04-08 18:22:13 +0200 |
| commit | 0540ea544d4b459bc148d29645225190b76ca8b7 (patch) | |
| tree | f0902ec8cb04f8148ffd87170c2f1bdd7534564e /libblkid/src/config.c | |
| parent | bash-completion: Symlink runuser symlink to su so it gets loaded on demand. (diff) | |
| download | kernel-qcow2-util-linux-0540ea544d4b459bc148d29645225190b76ca8b7.tar.gz kernel-qcow2-util-linux-0540ea544d4b459bc148d29645225190b76ca8b7.tar.xz kernel-qcow2-util-linux-0540ea544d4b459bc148d29645225190b76ca8b7.zip | |
libblkid: clean up DBG()
- use stderr only
- use BLKID_ prefix for debug masks
- don't use \n in in messages and don't use printf(),
but use generic blkid_debug().
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/config.c')
| -rw-r--r-- | libblkid/src/config.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/libblkid/src/config.c b/libblkid/src/config.c index 0b2ef20c3..124e8a78e 100644 --- a/libblkid/src/config.c +++ b/libblkid/src/config.c @@ -50,8 +50,8 @@ static int parse_evaluate(struct blkid_config *conf, char *s) } return 0; err: - DBG(DEBUG_CONFIG, printf( - "config file: unknown evaluation method '%s'.\n", s)); + DBG(CONFIG, blkid_debug( + "config file: unknown evaluation method '%s'.", s)); return -1; } @@ -71,8 +71,8 @@ static int parse_next(FILE *fd, struct blkid_config *conf) if (feof(fd)) s = strchr (buf, '\0'); else { - DBG(DEBUG_CONFIG, fprintf(stderr, - "libblkid: config file: missing newline at line '%s'.\n", + DBG(CONFIG, blkid_debug( + "config file: missing newline at line '%s'.", buf)); return -1; } @@ -102,8 +102,8 @@ static int parse_next(FILE *fd, struct blkid_config *conf) if (*s && parse_evaluate(conf, s) == -1) return -1; } else { - DBG(DEBUG_CONFIG, printf( - "config file: unknown option '%s'.\n", s)); + DBG(CONFIG, blkid_debug( + "config file: unknown option '%s'.", s)); return -1; } return 0; @@ -125,19 +125,16 @@ struct blkid_config *blkid_read_config(const char *filename) return NULL; conf->uevent = -1; - DBG(DEBUG_CONFIG, fprintf(stderr, - "reading config file: %s.\n", filename)); + DBG(CONFIG, blkid_debug("reading config file: %s.", filename)); f = fopen(filename, "r" UL_CLOEXECSTR); if (!f) { - DBG(DEBUG_CONFIG, fprintf(stderr, - "%s: does not exist, using built-in default\n", filename)); + DBG(CONFIG, blkid_debug("%s: does not exist, using built-in default", filename)); goto dflt; } while (!feof(f)) { if (parse_next(f, conf)) { - DBG(DEBUG_CONFIG, fprintf(stderr, - "%s: parse error\n", filename)); + DBG(CONFIG, blkid_debug("%s: parse error", filename)); goto err; } } @@ -178,7 +175,7 @@ int main(int argc, char *argv[]) struct blkid_config *conf; char *filename = NULL; - blkid_init_debug(DEBUG_ALL); + blkid_init_debug(BLKID_DEBUG_ALL); if (argc == 2) filename = argv[1]; |