Introduction
Introduction Statistics Contact Development Disclaimer Help
Simplify format specifiers for uintmax_t - slstatus - status monitor
git clone git://git.suckless.org/slstatus
Log
Files
Refs
README
LICENSE
---
commit acfa1f50c24add6b9a78d94af21f9350150fb9c2
parent c2492c3f99d9d434a6f935dea8e97fa27cdd2adc
Author: Aaron Marcher <[email protected]>
Date: Sat, 7 Jul 2018 11:08:26 +0200
Simplify format specifiers for uintmax_t
Diffstat:
M components/battery.c | 8 ++++----
M components/cpu.c | 7 ++-----
M components/entropy.c | 6 +++---
M components/netspeeds.c | 6 +++---
M components/ram.c | 26 +++++++++++++-------------
M components/temperature.c | 6 +++---
M components/uptime.c | 4 ++--
7 files changed, 30 insertions(+), 33 deletions(-)
---
diff --git a/components/battery.c b/components/battery.c
@@ -5,8 +5,8 @@
#include "../util.h"
#if defined(__linux__)
- #include <inttypes.h>
#include <limits.h>
+ #include <stdint.h>
#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)) ||
- pscanf(path, "%" PRIuMAX, &charge_now) < 0) {
+ pscanf(path, "%ju", &charge_now) < 0) {
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)) ||
- pscanf(path, "%" PRIuMAX, &current_now) < 0) {
+ pscanf(path, "%ju", &current_now) < 0) {
return NULL;
}
@@ -113,7 +113,7 @@
h = timeleft;
m = (timeleft - (double)h) * 60;
- return bprintf("%" PRIuMAX "h %" PRIuMAX "m", h, m);
+ return bprintf("%juh %jum", h, m);
}
return "";
diff --git a/components/cpu.c b/components/cpu.c
@@ -1,13 +1,11 @@
/* See LICENSE file for copyright and license details. */
+#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include "../util.h"
#if defined(__linux__)
- #include <inttypes.h>
- #include <stdint.h>
-
const char *
cpu_freq(void)
{
@@ -15,7 +13,7 @@
/* in kHz */
if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_f…
- "%" PRIuMAX, &freq) != 1) {
+ "%ju", &freq) != 1) {
return NULL;
}
@@ -45,7 +43,6 @@
(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>
diff --git a/components/entropy.c b/components/entropy.c
@@ -1,6 +1,6 @@
/* See LICENSE file for copyright and license details. */
#if defined(__linux__)
- #include <inttypes.h>
+ #include <stdint.h>
#include <stdio.h>
#include "../util.h"
@@ -11,11 +11,11 @@
uintmax_t num;
if (pscanf("/proc/sys/kernel/random/entropy_avail",
- "%" PRIuMAX, &num) != 1) {
+ "%ju", &num) != 1) {
return NULL;
}
- return bprintf("%" PRIuMAX, num);
+ return bprintf("%ju", num);
}
#elif defined(__OpenBSD__)
const char *
diff --git a/components/netspeeds.c b/components/netspeeds.c
@@ -5,7 +5,7 @@
#include "../util.h"
#if defined(__linux__)
- #include <inttypes.h>
+ #include <stdint.h>
const char *
netspeed_rx(const char *interface)
@@ -22,7 +22,7 @@
interface) < 0) {
return NULL;
}
- if (pscanf(path, "%" PRIuMAX, &rxbytes) != 1) {
+ if (pscanf(path, "%ju", &rxbytes) != 1) {
return NULL;
}
if (oldrxbytes == 0) {
@@ -48,7 +48,7 @@
interface) < 0) {
return NULL;
}
- if (pscanf(path, "%" PRIuMAX, &txbytes) != 1) {
+ if (pscanf(path, "%ju", &txbytes) != 1) {
return NULL;
}
if (oldtxbytes == 0) {
diff --git a/components/ram.c b/components/ram.c
@@ -4,7 +4,7 @@
#include "../util.h"
#if defined(__linux__)
- #include <inttypes.h>
+ #include <stdint.h>
const char *
ram_free(void)
@@ -12,9 +12,9 @@
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;
}
@@ -28,10 +28,10 @@
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;
}
@@ -49,7 +49,7 @@
{
uintmax_t total;
- if (pscanf("/proc/meminfo", "MemTotal: %" PRIuMAX " kB\n",
+ if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n",
&total) != 1) {
return NULL;
}
@@ -63,10 +63,10 @@
uintmax_t total, free, buffers, cached;
if (pscanf("/proc/meminfo",
- "MemTotal: %" PRIuMAX " kB\n"
- "MemFree: %" PRIuMAX " kB\n"
- "MemAvailable: %" PRIuMAX " kB\nBuffers: %" PRIuMAX…
- "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;
}
diff --git a/components/temperature.c b/components/temperature.c
@@ -4,18 +4,18 @@
#include "../util.h"
#if defined(__linux__)
- #include <inttypes.h>
+ #include <stdint.h>
const char *
temp(const char *file)
{
uintmax_t temp;
- if(pscanf(file, "%" PRIuMAX, &temp) != 1) {
+ if(pscanf(file, "%ju", &temp) != 1) {
return NULL;
}
- return bprintf("%" PRIuMAX, temp / 1000);
+ return bprintf("%ju", temp / 1000);
}
#elif defined(__OpenBSD__)
#include <stdio.h>
diff --git a/components/uptime.c b/components/uptime.c
@@ -1,5 +1,5 @@
/* See LICENSE file for copyright and license details. */
-#include <inttypes.h>
+#include <stdint.h>
#include <stdio.h>
#include <time.h>
@@ -19,5 +19,5 @@ uptime(void)
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);
}
You are viewing proxied material from suckless.org. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.