nvme-print: fix to use nl_langinfo() instead of setlocale()

Remove the hard coded implementation to check the fahrenheit print.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

nvme-print.c

@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <time.h>
 #include <sys/stat.h>
-#include <locale.h>
 
 #include "nvme.h"
 #include "libnvme.h"
@@ -815,46 +814,6 @@ void nvme_show_endurance_log(struct nvme_endurance_group_log *endurance_log,
 	nvme_print(endurance_log, flags, endurance_log, group_id, devname);
 }
 
-static bool is_fahrenheit_country(const char *country)
-{
-	static const char * const countries[] = {
-		"AQ", "AS", "BS", "BZ", "CY", "FM", "GU", "KN", "KY", "LR",
-		"MH", "MP", "MS", "PR", "PW", "TC", "US", "VG", "VI"
-	};
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(countries); i++) {
-		if (!strcmp(country, countries[i]))
-			return true;
-	}
-
-	return false;
-}
-
-#ifndef LC_MEASUREMENT
-#define LC_MEASUREMENT LC_ALL
-#endif
-
-static bool is_temperature_fahrenheit(void)
-{
-	const char *locale, *underscore;
-	char country[3] = { 0 };
-
-	setlocale(LC_MEASUREMENT, "");
-	locale = setlocale(LC_MEASUREMENT, NULL);
-
-	if (!locale || strlen(locale) < 2)
-		return false;
-
-	underscore = strchr(locale, '_');
-	if (underscore && strlen(underscore) >= 3)
-		locale = underscore + 1;
-
-	memcpy(country, locale, 2);
-
-	return is_fahrenheit_country(country);
-}
-
 const char *nvme_degrees_string(long t)
 {
 	static char str[STR_LEN];
@@ -873,7 +832,7 @@ const char *nvme_degrees_fahrenheit_string(long t)
 	static char str[STR_LEN];
 	long val = kelvin_to_fahrenheit(t);
 
-	if (!is_temperature_fahrenheit())
+	if (!nvme_cfg.fahrenheit)
 		return NULL;
 
 	if (nvme_is_output_format_json())

nvme.c

@@ -42,6 +42,7 @@
 #include <dirent.h>
 #include <libgen.h>
 #include <signal.h>
+#include <langinfo.h>
 
 #include <linux/fs.h>
 
@@ -11125,6 +11126,16 @@ void register_extension(struct plugin *plugin)
 	nvme.extensions->tail = plugin;
 }
 
+static bool is_temperature_fahrenheit(void)
+{
+	const char *m = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
+
+	if (m && m[0] == 2)
+		return true;
+
+	return false;
+}
+
 int main(int argc, char **argv)
 {
 	int err;
@@ -11135,6 +11146,7 @@ int main(int argc, char **argv)
 		return 0;
 	}
 	setlocale(LC_ALL, "");
+	nvme_cfg.fahrenheit = is_temperature_fahrenheit();
 
 	err = nvme_install_sigint_handler();
 	if (err)

nvme.h

@@ -83,6 +83,7 @@ struct nvme_config {
 	bool dry_run;
 	bool no_retries;
 	unsigned int output_format_ver;
+	bool fahrenheit;
 };
 
 /*