diff options
| author | Zhihao Cheng <chengzhihao1@huawei.com> | 2024-11-11 16:36:36 +0800 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2024-11-11 10:32:45 +0100 |
| commit | 6a4a0c16329b6649d5eb00d318d8a95503e3597a (patch) | |
| tree | d154b290e3f5591567e8d119bd9641c87d3fc94a | |
| parent | 14aa5e63ab989e4f85495e96a74f34d18813caf6 (diff) | |
ubifs-utils: Move 'debug_level' into ubifs_info structure
Embed new member 'debug_level' into 'ubifs_info' structure, then global
variable 'debug_level' can be removed from mkfs.ubifs.c. Next patches
will import UBIFS libs from linux kernel, which could print messages
with different levels, then 'debug_level' can be used to control which
level messages should be printed.
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | ubifs-utils/common/defs.h | 4 | ||||
| -rw-r--r-- | ubifs-utils/common/ubifs.h | 3 | ||||
| -rw-r--r-- | ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/ubifs-utils/common/defs.h b/ubifs-utils/common/defs.h index 3dafc6d..cafc94a 100644 --- a/ubifs-utils/common/defs.h +++ b/ubifs-utils/common/defs.h @@ -23,9 +23,7 @@ extern struct ubifs_info info_; enum { MKFS_PROGRAM_TYPE = 0 }; -extern int debug_level; - -#define dbg_msg(lvl, fmt, ...) do {if (debug_level >= lvl) \ +#define dbg_msg(lvl, fmt, ...) do {if (info_.debug_level >= lvl) \ printf("%s: %s: " fmt "\n", PROGRAM_NAME, __FUNCTION__, ##__VA_ARGS__); \ } while(0) diff --git a/ubifs-utils/common/ubifs.h b/ubifs-utils/common/ubifs.h index 2b0ffe5..58aaba9 100644 --- a/ubifs-utils/common/ubifs.h +++ b/ubifs-utils/common/ubifs.h @@ -273,6 +273,8 @@ struct ubifs_znode * @highest_inum: highest used inode number * @max_sqnum: current global sequence number * + * @debug_level: level of debug messages, 0 - none, 1 - statistics, + * 2 - files, 3 - more details * @program_type: used to identify the type of current program * @program_name: program name * @@ -363,6 +365,7 @@ struct ubifs_info ino_t highest_inum; unsigned long long max_sqnum; + int debug_level; int program_type; const char *program_name; diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c index 22969f9..f66c6a4 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -138,8 +138,6 @@ struct ubifs_info info_; static struct ubifs_info *c = &info_; static libubi_t ubi; -/* Debug levels are: 0 (none), 1 (statistics), 2 (files) ,3 (more details) */ -int debug_level; int verbose; int yes; @@ -671,9 +669,9 @@ static int get_options(int argc, char**argv) common_print_version(); exit(EXIT_SUCCESS); case 'g': - debug_level = strtol(optarg, &endp, 0); + c->debug_level = strtol(optarg, &endp, 0); if (*endp != '\0' || endp == optarg || - debug_level < 0 || debug_level > 3) + c->debug_level < 0 || c->debug_level > 3) return errmsg("bad debugging level '%s'", optarg); break; |