[PBCKP-216] remove warning: ISO C90 forbids mixed declarations and code + codestyle fixes

Author: kulaginm

src/show.c

@@ -3,7 +3,7 @@
  * show.c: show backup information.
  *
  * Portions Copyright (c) 2009-2011, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
- * Portions Copyright (c) 2015-2019, Postgres Professional
+ * Portions Copyright (c) 2015-2022, Postgres Professional
  *
  *-------------------------------------------------------------------------
  */
@@ -1015,6 +1015,12 @@ show_archive_json(const char *instance_name, uint32 xlog_seg_size,
 		timelineInfo  *tlinfo = (timelineInfo  *) parray_get(actual_tli_list, i);
 		char		tmp_buf[MAXFNAMELEN];
 		float		zratio = 0;
+		locale_t saveloc;
+#ifdef HAVE_USELOCALE
+		locale_t newloc;
+#elif HAVE__CONFIGTHREADLOCALE
+		locale_t oldthreadlocale;
+#endif
 
 		if (i != (parray_num(actual_tli_list) - 1))
 			appendPQExpBufferChar(buf, ',');
@@ -1047,25 +1053,24 @@ show_archive_json(const char *instance_name, uint32 xlog_seg_size,
 
 		json_add_key(buf, "zratio", json_level);
 
-		// forcing comma-based floating point representation
-		locale_t saveloc;
+		/* forcing comma-based floating point representation */
 #ifdef HAVE_USELOCALE
-		locale_t newloc = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0);
+		newloc = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
 		saveloc = uselocale(newloc);
 #else
 #ifdef HAVE__CONFIGTHREADLOCALE
-		locale_t oldthreadlocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+		oldthreadlocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
 #endif
 		saveloc = setlocale(LC_NUMERIC, NULL);
 		setlocale(LC_NUMERIC, "C");
 #endif
 		if (tlinfo->size != 0)
-			zratio = ((float)xlog_seg_size*tlinfo->n_xlog_files) / tlinfo->size;
+			zratio = ((float) xlog_seg_size * tlinfo->n_xlog_files) / tlinfo->size;
 		appendPQExpBuffer(buf, "%.2f", zratio);
 
-		// restoring previous locale
+		/* restoring previous locale */
 #ifdef HAVE_USELOCALE
-		if(saveloc != (locale_t)0)
+		if(saveloc != (locale_t) 0)
 			uselocale(saveloc);
 		freelocale(newloc);
 #else