Introduction
Introduction Statistics Contact Development Disclaimer Help
Change uint64_t to uintmax_t - slstatus - status monitor
git clone git://git.suckless.org/slstatus
Log
Files
Refs
README
LICENSE
---
commit 43a12832a343747b7317987b552a87eb8ed5b42d
parent d76b1a21fc014395cf9f7bd4e14180a3a0945e9c
Author: Aaron Marcher <[email protected]>
Date: Sat, 7 Jul 2018 10:50:25 +0200
Change uint64_t to uintmax_t
Diffstat:
M components/battery.c | 8 ++++----
M components/cpu.c | 8 ++++----
M components/entropy.c | 6 +++---
M components/netspeeds.c | 22 +++++++++++-----------
M components/ram.c | 32 ++++++++++++++++-------------…
M components/temperature.c | 6 +++---
M components/uptime.c | 4 ++--
M util.c | 2 +-
M util.h | 2 +-
9 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/components/battery.c b/components/battery.c
@@ -77,7 +77,7 @@
const char *
battery_remaining(const char *bat)
{
- uint64_t charge_now, current_now, m, h;
+ uintmax_t charge_now, current_now, m, h;
double timeleft;
char path[PATH_MAX], state[12];
@@ -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, "%" PRIu64, &charge_now) < 0) {
+ pscanf(path, "%" PRIuMAX, &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, "%" PRIu64, &current_now) < 0) {
+ pscanf(path, "%" PRIuMAX, &current_now) < 0) {
return NULL;
}
@@ -113,7 +113,7 @@
h = timeleft;
m = (timeleft - (double)h) * 60;
- return bprintf("%" PRIu64 "h %" PRIu64 "m", h, m);
+ return bprintf("%" PRIuMAX "h %" PRIuMAX "m", h, m);
}
return "";
diff --git a/components/cpu.c b/components/cpu.c
@@ -11,11 +11,11 @@
const char *
cpu_freq(void)
{
- uint64_t freq;
+ uintmax_t freq;
/* in kHz */
if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_f…
- "%"SCNu64, &freq) != 1) {
+ "%" PRIuMAX, &freq) != 1) {
return NULL;
}
@@ -74,8 +74,8 @@
cpu_perc(void)
{
int mib[2];
- static uint64_t a[CPUSTATES];
- uint64_t b[CPUSTATES];
+ static uintmax_t a[CPUSTATES];
+ uintmax_t b[CPUSTATES];
size_t size;
mib[0] = CTL_KERN;
diff --git a/components/entropy.c b/components/entropy.c
@@ -8,14 +8,14 @@
const char *
entropy(void)
{
- uint64_t num;
+ uintmax_t num;
if (pscanf("/proc/sys/kernel/random/entropy_avail",
- "%" PRIu64, &num) != 1) {
+ "%" PRIuMAX, &num) != 1) {
return NULL;
}
- return bprintf("%" PRIu64, num);
+ return bprintf("%" PRIuMAX, num);
}
#elif defined(__OpenBSD__)
const char *
diff --git a/components/netspeeds.c b/components/netspeeds.c
@@ -5,13 +5,13 @@
#include "../util.h"
#if defined(__linux__)
- #include <stdint.h>
+ #include <inttypes.h>
const char *
netspeed_rx(const char *interface)
{
- uint64_t oldrxbytes;
- static uint64_t rxbytes;
+ uintmax_t oldrxbytes;
+ static uintmax_t rxbytes;
extern const unsigned int interval;
char path[PATH_MAX];
@@ -22,7 +22,7 @@
interface) < 0) {
return NULL;
}
- if (pscanf(path, "%llu", &rxbytes) != 1) {
+ if (pscanf(path, "%" PRIuMAX, &rxbytes) != 1) {
return NULL;
}
if (oldrxbytes == 0) {
@@ -36,8 +36,8 @@
const char *
netspeed_tx(const char *interface)
{
- uint64_t oldtxbytes;
- static uint64_t txbytes;
+ uintmax_t oldtxbytes;
+ static uintmax_t txbytes;
extern const unsigned int interval;
char path[PATH_MAX];
@@ -48,7 +48,7 @@
interface) < 0) {
return NULL;
}
- if (pscanf(path, "%llu", &txbytes) != 1) {
+ if (pscanf(path, "%" PRIuMAX, &txbytes) != 1) {
return NULL;
}
if (oldtxbytes == 0) {
@@ -70,8 +70,8 @@
{
struct ifaddrs *ifal, *ifa;
struct if_data *ifd;
- uint64_t oldrxbytes;
- static uint64_t rxbytes;
+ uintmax_t oldrxbytes;
+ static uintmax_t rxbytes;
extern const unsigned int interval;
int if_ok = 0;
@@ -106,8 +106,8 @@
{
struct ifaddrs *ifal, *ifa;
struct if_data *ifd;
- uint64_t oldtxbytes;
- static uint64_t txbytes;
+ uintmax_t oldtxbytes;
+ static uintmax_t txbytes;
extern const unsigned int interval;
int if_ok = 0;
diff --git a/components/ram.c b/components/ram.c
@@ -9,12 +9,12 @@
const char *
ram_free(void)
{
- uint64_t free;
+ uintmax_t free;
if (pscanf("/proc/meminfo",
- "MemTotal: %" PRIu64 " kB\n"
- "MemFree: %" PRIu64 " kB\n"
- "MemAvailable: %" PRIu64 " kB\n",
+ "MemTotal: %" PRIuMAX " kB\n"
+ "MemFree: %" PRIuMAX " kB\n"
+ "MemAvailable: %" PRIuMAX " kB\n",
&free, &free, &free) != 3) {
return NULL;
}
@@ -25,13 +25,13 @@
const char *
ram_perc(void)
{
- uint64_t total, free, buffers, cached;
+ uintmax_t total, free, buffers, cached;
if (pscanf("/proc/meminfo",
- "MemTotal: %" PRIu64 " kB\n"
- "MemFree: %" PRIu64 " kB\n"
- "MemAvailable: %" PRIu64 " kB\nBuffers: %ld kB\n"
- "Cached: %" PRIu64 " kB\n",
+ "MemTotal: %" PRIuMAX " kB\n"
+ "MemFree: %" PRIuMAX " kB\n"
+ "MemAvailable: %" PRIuMAX " kB\nBuffers: %ld kB\n"
+ "Cached: %" PRIuMAX " kB\n",
&total, &free, &buffers, &buffers, &cached) != 5) {
return NULL;
}
@@ -47,9 +47,9 @@
const char *
ram_total(void)
{
- uint64_t total;
+ uintmax_t total;
- if (pscanf("/proc/meminfo", "MemTotal: %" PRIu64 " kB\n",
+ if (pscanf("/proc/meminfo", "MemTotal: %" PRIuMAX " kB\n",
&total) != 1) {
return NULL;
}
@@ -60,13 +60,13 @@
const char *
ram_used(void)
{
- uint64_t total, free, buffers, cached;
+ uintmax_t total, free, buffers, cached;
if (pscanf("/proc/meminfo",
- "MemTotal: %" PRIu64 " kB\n"
- "MemFree: %" PRIu64 " kB\n"
- "MemAvailable: %" PRIu64 " kB\nBuffers: %" PRIu64 "…
- "Cached: %" PRIu64 " kB\n",
+ "MemTotal: %" PRIuMAX " kB\n"
+ "MemFree: %" PRIuMAX " kB\n"
+ "MemAvailable: %" PRIuMAX " kB\nBuffers: %" PRIuMAX…
+ "Cached: %" PRIuMAX " kB\n",
&total, &free, &buffers, &buffers, &cached) != 5) {
return NULL;
}
diff --git a/components/temperature.c b/components/temperature.c
@@ -9,13 +9,13 @@
const char *
temp(const char *file)
{
- uint64_t temp;
+ uintmax_t temp;
- if(pscanf(file, "%" PRIu64, &temp) != 1) {
+ if(pscanf(file, "%" PRIuMAX, &temp) != 1) {
return NULL;
}
- return bprintf("%" PRIu64, temp / 1000);
+ return bprintf("%" PRIuMAX, temp / 1000);
}
#elif defined(__OpenBSD__)
#include <stdio.h>
diff --git a/components/uptime.c b/components/uptime.c
@@ -8,7 +8,7 @@
const char *
uptime(void)
{
- uint64_t h, m;
+ uintmax_t h, m;
struct timespec uptime;
if (clock_gettime(CLOCK_BOOTTIME, &uptime) < 0) {
@@ -19,5 +19,5 @@ uptime(void)
h = uptime.tv_sec / 3600;
m = uptime.tv_sec % 3600 / 60;
- return bprintf("%" PRIu64 "h %" PRIu64 "m", h, m);
+ return bprintf("%" PRIuMAX "h %" PRIuMAX "m", h, m);
}
diff --git a/util.c b/util.c
@@ -94,7 +94,7 @@ bprintf(const char *fmt, ...)
}
const char *
-fmt_human(uint64_t num, int base)
+fmt_human(uintmax_t num, int base)
{
double scaled;
size_t i, prefixlen;
diff --git a/util.h b/util.h
@@ -12,5 +12,5 @@ void die(const char *, ...);
int esnprintf(char *str, size_t size, const char *fmt, ...);
const char *bprintf(const char *fmt, ...);
-const char *fmt_human(uint64_t num, int base);
+const char *fmt_human(uintmax_t num, int base);
int pscanf(const char *path, const char *fmt, ...);
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.