[PBCKP-216] review fixes

...and a little bit of refactoring

tags: pg_probackup

Author: Daniel Shelepanov

src/show.c

@@ -74,37 +74,38 @@ static int32 json_level = 0;
 
 static const char* lc_env_locale;
 typedef enum {
-	LOCALE_OUTPUT,
-	LOCALE_ENV
+	LOCALE_C,	// Used for formatting output to unify the dot-based floating point representation
+	LOCALE_ENV	// Default environment locale
 } output_numeric_locale;
 
 #ifdef HAVE_USELOCALE
-static locale_t env_locale, out_locale;
+static locale_t env_locale, c_locale;
 #endif
 void memorize_environment_locale() {
 	lc_env_locale = (const char *)getenv("LC_NUMERIC");
 	lc_env_locale = lc_env_locale != NULL ? lc_env_locale : "C";
 #ifdef HAVE_USELOCALE
 	env_locale = newlocale(LC_NUMERIC_MASK, lc_env_locale, (locale_t)0);
-	out_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0);
+	c_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0);
+#else
+#ifdef HAVE__CONFIGTHREADLOCALE
+		_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
 #endif
 }
 
 void free_environment_locale() {
 #ifdef HAVE_USELOCALE
 	freelocale(env_locale);
-	freelocale(out_locale);
+	freelocale(c_locale);
 #endif
 }
 
 static void set_output_numeric_locale(output_numeric_locale loc) {
 #ifdef HAVE_USELOCALE
-		uselocale(loc == LOCALE_OUTPUT ? out_locale : env_locale);
+		uselocale(loc == LOCALE_C ? c_locale : env_locale);
 #else
-#ifdef HAVE__CONFIGTHREADLOCALE
-		_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
-#endif
-		setlocale(LC_NUMERIC, loc == LOCALE_OUTPUT ? lc_env_locale : "C");
+		setlocale(LC_NUMERIC, loc == LOCALE_C ? "C" : lc_env_locale);
 #endif
 }
 
@@ -125,7 +126,7 @@ do_show(CatalogState *catalogState, InstanceState *instanceState,
 		requested_backup_id != INVALID_BACKUP_ID)
 		elog(ERROR, "You cannot specify --archive and (-i, --backup-id) options together");
 
-	set_output_numeric_locale(LOCALE_ENV);
+	set_output_numeric_locale(LOCALE_C);
 	/*
 	 * if instance is not specified,
 	 * show information about all instances in this backup catalog
@@ -148,7 +149,7 @@ do_show(CatalogState *catalogState, InstanceState *instanceState,
 				show_instance(instanceState, INVALID_BACKUP_ID, true);
 		}
 		show_instance_end();
-		set_output_numeric_locale(LOCALE_OUTPUT);
+		set_output_numeric_locale(LOCALE_ENV);
 
 		return 0;
 	}
@@ -167,7 +168,7 @@ do_show(CatalogState *catalogState, InstanceState *instanceState,
 			show_instance(instanceState, requested_backup_id, false);
 
 		show_instance_end();
-		set_output_numeric_locale(LOCALE_OUTPUT);
+		set_output_numeric_locale(LOCALE_ENV);
 
 		return 0;
 	}
@@ -181,7 +182,7 @@ do_show(CatalogState *catalogState, InstanceState *instanceState,
 		else
 			show_backup(instanceState, requested_backup_id);
 
-		set_output_numeric_locale(LOCALE_OUTPUT);
+		set_output_numeric_locale(LOCALE_ENV);
 		return 0;
 	}
 }