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 3c027fa7e2e13350bb409be0c724c6d7db1b7bb3..5c77b8e70d4a74a8589748463909410e3226460f 100644 (file)
--- a/src/proc_fuse.c
+++ b/src/proc_fuse.c
@@ -617,7 +617,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)
                    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,
                                stats.major,
                                stats.minor,
                                stats.dev_name,


@@ -975,7 +994,19 @@ static int proc_stat_read(char *buf, size_t size, off_t offset,
 
                curcpu++;
 
 
                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,
                           &user,
                           &nice,
                           &system,


@@ -1052,7 +1083,21 @@ static int proc_stat_read(char *buf, size_t size, off_t offset,
 
        cache = d->buf;
 
 
        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,
                        user_sum,
                        nice_sum,
                        system_sum,