Simplify format specifiers for uintmax_t

diff --git a/components/battery.c b/components/battery.c
index ae31dd6..79d16c2 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -5,8 +5,8 @@
 #include "../util.h"
 
 #if defined(__linux__)
 #include "../util.h"
 
 #if defined(__linux__)

-       #include <inttypes.h>

        #include <limits.h>
        #include <limits.h>

+       #include <stdint.h>

        #include <unistd.h>
 
        static const char *
        #include <unistd.h>
 
        static const char *


@@ -93,7 +93,7 @@
                if (!pick(bat, "/sys/class/power_supply/%s/charge_now",
                          "/sys/class/power_supply/%s/energy_now",
                          path, sizeof(path)) ||
                if (!pick(bat, "/sys/class/power_supply/%s/charge_now",
                          "/sys/class/power_supply/%s/energy_now",
                          path, sizeof(path)) ||

-                   pscanf(path, "%" PRIuMAX, &charge_now) < 0) {
+                   pscanf(path, "%ju", &charge_now) < 0) {

                        return NULL;
                }
 
                        return NULL;
                }
 


@@ -101,7 +101,7 @@
                        if (!pick(bat, "/sys/class/power_supply/%s/current_now",
                                  "/sys/class/power_supply/%s/power_now", path,
                                  sizeof(path)) ||
                        if (!pick(bat, "/sys/class/power_supply/%s/current_now",
                                  "/sys/class/power_supply/%s/power_now", path,
                                  sizeof(path)) ||

-                           pscanf(path, "%" PRIuMAX, &current_now) < 0) {
+                           pscanf(path, "%ju", &current_now) < 0) {

                                return NULL;
                        }
 
                                return NULL;
                        }
 


@@ -113,7 +113,7 @@
                        h = timeleft;
                        m = (timeleft - (double)h) * 60;
 
                        h = timeleft;
                        m = (timeleft - (double)h) * 60;
 

-                       return bprintf("%" PRIuMAX "h %" PRIuMAX "m", h, m);
+                       return bprintf("%juh %jum", h, m);

                }
 
                return "";
                }
 
                return "";

diff --git a/components/cpu.c b/components/cpu.c
index 14c8658..43ee8a9 100644 (file)
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -1,13 +1,11 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

+#include <stdint.h>

 #include <stdio.h>
 #include <string.h>
 
 #include "../util.h"
 
 #if defined(__linux__)
 #include <stdio.h>
 #include <string.h>
 
 #include "../util.h"
 
 #if defined(__linux__)

-       #include <inttypes.h>
-       #include <stdint.h>
-

        const char *
        cpu_freq(void)
        {
        const char *
        cpu_freq(void)
        {


@@ -15,7 +13,7 @@
 
                /* in kHz */
                if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
 
                /* in kHz */
                if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",

-                           "%" PRIuMAX, &freq) != 1) {
+                           "%ju", &freq) != 1) {

                        return NULL;
                }
 
                        return NULL;
                }
 


@@ -45,7 +43,6 @@
                                (a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6]))));
        }
 #elif defined(__OpenBSD__)
                                (a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6]))));
        }
 #elif defined(__OpenBSD__)

-       #include <inttypes.h>

        #include <sys/param.h>
        #include <sys/sched.h>
        #include <sys/sysctl.h>
        #include <sys/param.h>
        #include <sys/sched.h>
        #include <sys/sysctl.h>

diff --git a/components/entropy.c b/components/entropy.c
index 5173f15..caa698e 100644 (file)
--- a/components/entropy.c
+++ b/components/entropy.c
@@ -1,6 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #if defined(__linux__)
 /* See LICENSE file for copyright and license details. */
 #if defined(__linux__)

-       #include <inttypes.h>
+       #include <stdint.h>

        #include <stdio.h>
 
        #include "../util.h"
        #include <stdio.h>
 
        #include "../util.h"


@@ -11,11 +11,11 @@
                uintmax_t num;
 
                if (pscanf("/proc/sys/kernel/random/entropy_avail",
                uintmax_t num;
 
                if (pscanf("/proc/sys/kernel/random/entropy_avail",

-                          "%" PRIuMAX, &num) != 1) {
+                          "%ju", &num) != 1) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               return bprintf("%" PRIuMAX, num);
+               return bprintf("%ju", num);

        }
 #elif defined(__OpenBSD__)
        const char *
        }
 #elif defined(__OpenBSD__)
        const char *

diff --git a/components/netspeeds.c b/components/netspeeds.c
index ac9c4a6..02c030e 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -5,7 +5,7 @@
 #include "../util.h"
 
 #if defined(__linux__)
 #include "../util.h"
 
 #if defined(__linux__)

-       #include <inttypes.h>
+       #include <stdint.h>

 
        const char *
        netspeed_rx(const char *interface)
 
        const char *
        netspeed_rx(const char *interface)


@@ -22,7 +22,7 @@
                              interface) < 0) {
                        return NULL;
                }
                              interface) < 0) {
                        return NULL;
                }

-               if (pscanf(path, "%" PRIuMAX, &rxbytes) != 1) {
+               if (pscanf(path, "%ju", &rxbytes) != 1) {

                        return NULL;
                }
                if (oldrxbytes == 0) {
                        return NULL;
                }
                if (oldrxbytes == 0) {


@@ -48,7 +48,7 @@
                              interface) < 0) {
                        return NULL;
                }
                              interface) < 0) {
                        return NULL;
                }

-               if (pscanf(path, "%" PRIuMAX, &txbytes) != 1) {
+               if (pscanf(path, "%ju", &txbytes) != 1) {

                        return NULL;
                }
                if (oldtxbytes == 0) {
                        return NULL;
                }
                if (oldtxbytes == 0) {

diff --git a/components/ram.c b/components/ram.c
index a2fff95..d2fbce9 100644 (file)
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,7 +4,7 @@
 #include "../util.h"
 
 #if defined(__linux__)
 #include "../util.h"
 
 #if defined(__linux__)

-       #include <inttypes.h>
+       #include <stdint.h>

 
        const char *
        ram_free(void)
 
        const char *
        ram_free(void)


@@ -12,9 +12,9 @@
                uintmax_t free;
 
                if (pscanf("/proc/meminfo",
                uintmax_t free;
 
                if (pscanf("/proc/meminfo",

-                          "MemTotal: %" PRIuMAX " kB\n"
-                          "MemFree: %" PRIuMAX " kB\n"
-                          "MemAvailable: %" PRIuMAX " kB\n",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\n",

                           &free, &free, &free) != 3) {
                        return NULL;
                }
                           &free, &free, &free) != 3) {
                        return NULL;
                }


@@ -28,10 +28,10 @@
                uintmax_t total, free, buffers, cached;
 
                if (pscanf("/proc/meminfo",
                uintmax_t total, free, buffers, cached;
 
                if (pscanf("/proc/meminfo",

-                          "MemTotal: %" PRIuMAX " kB\n"
-                          "MemFree: %" PRIuMAX " kB\n"
-                          "MemAvailable: %" PRIuMAX " kB\nBuffers: %ld kB\n"
-                          "Cached: %" PRIuMAX " kB\n",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\nBuffers: %ju kB\n"
+                          "Cached: %ju kB\n",

                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }


@@ -49,7 +49,7 @@
        {
                uintmax_t total;
 
        {
                uintmax_t total;
 

-               if (pscanf("/proc/meminfo", "MemTotal: %" PRIuMAX " kB\n",
+               if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n",

                           &total) != 1) {
                        return NULL;
                }
                           &total) != 1) {
                        return NULL;
                }


@@ -63,10 +63,10 @@
                uintmax_t total, free, buffers, cached;
 
                if (pscanf("/proc/meminfo",
                uintmax_t total, free, buffers, cached;
 
                if (pscanf("/proc/meminfo",

-                          "MemTotal: %" PRIuMAX " kB\n"
-                          "MemFree: %" PRIuMAX " kB\n"
-                          "MemAvailable: %" PRIuMAX " kB\nBuffers: %" PRIuMAX " kB\n"
-                          "Cached: %" PRIuMAX " kB\n",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\nBuffers: %ju kB\n"
+                          "Cached: %ju kB\n",

                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }

diff --git a/components/temperature.c b/components/temperature.c
index 71e1378..45fbc9b 100644 (file)
--- a/components/temperature.c
+++ b/components/temperature.c
@@ -4,18 +4,18 @@
 #include "../util.h"
 
 #if defined(__linux__)
 #include "../util.h"
 
 #if defined(__linux__)

-       #include <inttypes.h>
+       #include <stdint.h>

 
        const char *
        temp(const char *file)
        {
                uintmax_t temp;
 
 
        const char *
        temp(const char *file)
        {
                uintmax_t temp;
 

-               if(pscanf(file, "%" PRIuMAX, &temp) != 1) {
+               if(pscanf(file, "%ju", &temp) != 1) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               return bprintf("%" PRIuMAX, temp / 1000);
+               return bprintf("%ju", temp / 1000);

        }
 #elif defined(__OpenBSD__)
        #include <stdio.h>
        }
 #elif defined(__OpenBSD__)
        #include <stdio.h>

diff --git a/components/uptime.c b/components/uptime.c
index 67acbf7..978f88f 100644 (file)
--- a/components/uptime.c
+++ b/components/uptime.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <inttypes.h>
+#include <stdint.h>

 #include <stdio.h>
 #include <time.h>
 
 #include <stdio.h>
 #include <time.h>
 


@@ -19,5 +19,5 @@ uptime(void)
        h = uptime.tv_sec / 3600;
        m = uptime.tv_sec % 3600 / 60;
 
        h = uptime.tv_sec / 3600;
        m = uptime.tv_sec % 3600 / 60;
 

-       return bprintf("%" PRIuMAX "h %" PRIuMAX "m", h, m);
+       return bprintf("%juh %jum", h, m);

 }
 }