$NetBSD: patch-cli_src_cli-xml-output.c,v 1.3 2024/08/06 21:10:48 riastradh Exp $

Avoid wrong-size integer casts and fix format string.

Avoid ctype(3) abuse.
https://github.com/gluster/glusterfs/issues/4397

--- cli/src/cli-xml-output.c.orig	2020-09-16 18:40:32.172503539 +0000
+++ cli/src/cli-xml-output.c
@@ -1661,8 +1661,8 @@ cli_xml_output_vol_top_rw_perf(xmlTextWr
     int ret = -1;
     char *filename = NULL;
     uint64_t throughput = 0;
-    long int time_sec = 0;
-    long int time_usec = 0;
+    int32_t time_sec = 0;
+    int32_t time_usec = 0;
     char timestr[256] = {
         0,
     };
@@ -1692,18 +1692,18 @@ cli_xml_output_vol_top_rw_perf(xmlTextWr
     XML_RET_CHECK_AND_GOTO(ret, out);
 
     snprintf(key, sizeof(key), "%d-time-sec-%d", brick_index, member_index);
-    ret = dict_get_int32(dict, key, (int32_t *)&time_sec);
+    ret = dict_get_int32(dict, key, &time_sec); /* XXX Y2038 bug? */
     if (ret)
         goto out;
 
     snprintf(key, sizeof(key), "%d-time-usec-%d", brick_index, member_index);
-    ret = dict_get_int32(dict, key, (int32_t *)&time_usec);
+    ret = dict_get_int32(dict, key, &time_usec);
     if (ret)
         goto out;
 
     gf_time_fmt(timestr, sizeof timestr, time_sec, gf_timefmt_FT);
     len = strlen(timestr);
-    snprintf(timestr + len, sizeof(timestr) - len, ".%" GF_PRI_SUSECONDS,
+    snprintf(timestr + len, sizeof(timestr) - len, ".%" PRIu32,
              time_usec);
     ret = xmlTextWriterWriteFormatElement(writer, (xmlChar *)"time", "%s",
                                           timestr);
@@ -3425,7 +3425,7 @@ _output_gsync_config(FILE *fp, xmlTextWr
             break;
 
         v = resbuf + strlen(resbuf) - 1;
-        while (isspace(*v)) {
+        while (isspace((unsigned char)*v)) {
             /* strip trailing space */
             *v-- = '\0';
         }
@@ -3447,7 +3447,7 @@ _output_gsync_config(FILE *fp, xmlTextWr
             goto out;
         }
         *v++ = '\0';
-        while (isspace(*v))
+        while (isspace((unsigned char)*v))
             v++;
         v = gf_strdup(v);
         if (!v) {