fix and reformat format strings

Some of these missed the spaces in between and in order to
make this more readable and apparent, put one field per line
and add comments matching the field names.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/proc_fuse.c b/src/proc_fuse.c
index 7a1ba40ab276e040580cba782a8c8e1f8406efae..4e7878005594c4c6a623dbc355772d6e282b8a00 100644 (file)
--- a/src/proc_fuse.c
+++ b/src/proc_fuse.c
@@ -621,7 +621,26 @@ static int proc_diskstats_read(char *buf, size_t size, off_t offset,
                    stats.read_sectors || stats.write_sectors || stats.read_ticks ||
                    stats.write_ticks || stats.ios_pgr || stats.total_ticks || stats.rq_ticks ||
                    stats.discard_merged || stats.discard_sectors || stats.discard_ticks)
-                       snprintf(lbuf, 256, "%u       %u %s %" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "\n",
+                       snprintf(
+                               lbuf,
+                               256,
+                               "%u       %u" /* major, minor */
+                               " %s"         /* dev_name */
+                               " %" PRIu64   /* read */
+                               " %" PRIu64   /* read_merged */
+                               " %" PRIu64   /* read_sectors */
+                               " %" PRIu64   /* read_ticks */
+                               " %" PRIu64   /* write */
+                               " %" PRIu64   /* write_merged */
+                               " %" PRIu64   /* write_sectors */
+                               " %" PRIu64   /* write_ticks */
+                               " %" PRIu64   /* ios_pgr */
+                               " %" PRIu64   /* total_ticks */
+                               " %" PRIu64   /* rq_ticks */
+                               " %" PRIu64   /* discard_merged */
+                               " %" PRIu64   /* discard_sectors */
+                               " %" PRIu64   /* discard_ticks */
+                               "\n",
                                stats.major,
                                stats.minor,
                                stats.dev_name,
@@ -979,7 +998,19 @@ static int proc_stat_read(char *buf, size_t size, off_t offset,
 
                curcpu++;
 
-               ret = sscanf(line, "%*s %" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64,
+               ret = sscanf(
+                          line,
+                          "%*s"        /* <skip> */
+                          " %" PRIu64  /* user */
+                          " %" PRIu64  /* nice */
+                          " %" PRIu64  /* system */
+                          " %" PRIu64  /* idle */
+                          " %" PRIu64  /* iowait */
+                          " %" PRIu64  /* irq */
+                          " %" PRIu64  /* softirq */
+                          " %" PRIu64  /* steal */
+                          " %" PRIu64  /* guest */
+                          " %" PRIu64, /* guest_nice */
                           &user,
                           &nice,
                           &system,
@@ -1056,7 +1087,21 @@ static int proc_stat_read(char *buf, size_t size, off_t offset,
 
        cache = d->buf;
 
-       int cpuall_len = snprintf(cpuall, CPUALL_MAX_SIZE, "cpu  %" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "\n",
+       int cpuall_len = snprintf(
+                       cpuall,
+                       CPUALL_MAX_SIZE,
+                       "cpu  "
+                       " %" PRIu64 /* user_sum */
+                       " %" PRIu64 /* nice_sum */
+                       " %" PRIu64 /* system_sum */
+                       " %" PRIu64 /* idle_sum */
+                       " %" PRIu64 /* iowait_sum */
+                       " %" PRIu64 /* irq_sum */
+                       " %" PRIu64 /* softirq_sum */
+                       " %" PRIu64 /* steal_sum */
+                       " %" PRIu64 /* guest_sum */
+                       " %" PRIu64 /* guest_nice_sum */
+                       "\n",
                        user_sum,
                        nice_sum,
                        system_sum,