From: Karel Zak <kzak@redhat.com>
Date: Wed, 19 Aug 2020 11:01:37 +0000 (+0200)
Subject: lscpu: move debug initialization to main
X-Git-Tag: v2.37-rc1~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43715b4ea8599daaf4ad91b5792b5c0b16c09330;p=thirdparty%2Futil-linux.git

lscpu: move debug initialization to main

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

diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
index c02ae6c8aa..00b184f6d0 100644
--- a/sys-utils/lscpu-cputype.c
+++ b/sys-utils/lscpu-cputype.c
@@ -6,14 +6,6 @@
 
 #include "fileutils.h"
 
-UL_DEBUG_DEFINE_MASK(lscpu);
-UL_DEBUG_DEFINE_MASKNAMES(lscpu) = UL_DEBUG_EMPTY_MASKNAMES;
-
-static void lscpu_init_debug(void)
-{
-	__UL_INIT_DEBUG_FROM_ENV(lscpu, LSCPU_DEBUG_, 0, LSCPU_DEBUG);
-}
-
 static void context_init_paths(struct lscpu_cxt *cxt)
 {
 	DBG(MISC, ul_debugobj(cxt, "initialize paths"));
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 4508cac907..e51bb5147e 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -163,6 +163,15 @@ static struct lscpu_coldesc coldescs_cache[] =
 	[COL_CACHE_COHERENCYSIZE] = { "COHERENCY-SIZE", N_("minimum amount of data in bytes transferred from memory to cache"), SCOLS_FL_RIGHT }
 };
 
+UL_DEBUG_DEFINE_MASK(lscpu);
+UL_DEBUG_DEFINE_MASKNAMES(lscpu) = UL_DEBUG_EMPTY_MASKNAMES;
+
+static void lscpu_init_debug(void)
+{
+	__UL_INIT_DEBUG_FROM_ENV(lscpu, LSCPU_DEBUG_, 0, LSCPU_DEBUG);
+}
+
+
 static int
 cpu_column_name_to_id(const char *name, size_t namesz)
 {
@@ -1013,6 +1022,9 @@ static void __attribute__((__noreturn__)) usage(void)
 
 int main(int argc, char *argv[])
 {
+
+	lscpu_init_debug();
+
 #ifdef LSCPU_OLD_OUTPUT_CODE
 	struct lscpu_modifier _mod = { .mode = OUTPUT_SUMMARY }, *mod = &_mod;
 	struct lscpu_desc _desc = { .flags = NULL }, *desc = &_desc;