suckless/slstatus
suckless/slstatus
1
0
Fork 0
Code Activity

components/swap.c | move duplicated code to separate function

Browse source
This commit is contained in:
Laslo Hunhold 2018-05-01 20:20:58 +02:00 committed by Aaron Marcher
parent 9750a3d731
commit 19343ff343
1 changed files with 28 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
components/swap.c
View file

@ -6,30 +6,40 @@
#include "../util.h" #include "../util.h"
static size_t
pread(const char *path, char *buf, size_t bufsiz)
{
FILE *fp;
size_t bytes_read;
if (!(fp = fopen(path, "r"))) {
fprintf(stderr, "fopen '%s': %s\n", path,
strerror(errno));
return 0;
}
if ((bytes_read = fread(buf, sizeof(char), bufsiz, fp)) == 0) {
fprintf(stderr, "fread '%s': %s\n", path,
strerror(errno));
fclose(fp);
return 0;
}
fclose(fp);
buf[bytes_read] = '\0';
return bytes_read;
}
const char * const char *
swap_free(void) swap_free(void)
{ {
long total, free; long total, free;
FILE *fp;
size_t bytes_read;
char *match; char *match;
fp = fopen("/proc/meminfo", "r"); if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {
if (fp == NULL) {
fprintf(stderr, "fopen '/proc/meminfo': %s\n",
strerror(errno));
return NULL; return NULL;
} }
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
fp)) == 0) {
fprintf(stderr, "fread '/proc/meminfo': %s\n",
strerror(errno));
fclose(fp);
return NULL;
}
fclose(fp);
if ((match = strstr(buf, "SwapTotal")) == NULL) if ((match = strstr(buf, "SwapTotal")) == NULL)
return NULL; return NULL;
sscanf(match, "SwapTotal: %ld kB\n", &total); sscanf(match, "SwapTotal: %ld kB\n", &total);
@ -45,26 +55,12 @@
swap_perc(void) swap_perc(void)
{ {
long total, free, cached; long total, free, cached;
FILE *fp;
size_t bytes_read;
char *match; char *match;
fp = fopen("/proc/meminfo", "r"); if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {
if (fp == NULL) {
fprintf(stderr, "fopen '/proc/meminfo': %s\n",
strerror(errno));
return NULL; return NULL;
} }
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
fp)) == 0) {
fprintf(stderr, "fread '/proc/meminfo': %s\n",
strerror(errno));
fclose(fp);
return NULL;
}
fclose(fp);
if ((match = strstr(buf, "SwapTotal")) == NULL) if ((match = strstr(buf, "SwapTotal")) == NULL)
return NULL; return NULL;
sscanf(match, "SwapTotal: %ld kB\n", &total); sscanf(match, "SwapTotal: %ld kB\n", &total);
@ -84,24 +80,11 @@
swap_total(void) swap_total(void)
{ {
long total; long total;
FILE *fp;
size_t bytes_read;
char *match; char *match;
fp = fopen("/proc/meminfo", "r"); if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {
if (fp == NULL) {
fprintf(stderr, "fopen '/proc/meminfo': %s\n",
strerror(errno));
return NULL; return NULL;
} }
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
fp)) == 0) {
fprintf(stderr, "fread '/proc/meminfo': %s\n",
strerror(errno));
fclose(fp);
return NULL;
}
fclose(fp);
if ((match = strstr(buf, "SwapTotal")) == NULL) if ((match = strstr(buf, "SwapTotal")) == NULL)
return NULL; return NULL;
@ -114,24 +97,11 @@
swap_used(void) swap_used(void)
{ {
long total, free, cached; long total, free, cached;
FILE *fp;
size_t bytes_read;
char *match; char *match;
fp = fopen("/proc/meminfo", "r"); if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {
if (fp == NULL) {
fprintf(stderr, "fopen '/proc/meminfo': %s\n",
strerror(errno));
return NULL; return NULL;
} }
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
fp)) == 0) {
fprintf(stderr, "fread '/proc/meminfo': %s\n",
strerror(errno));
fclose(fp);
return NULL;
}
fclose(fp);
if ((match = strstr(buf, "SwapTotal")) == NULL) if ((match = strstr(buf, "SwapTotal")) == NULL)
return NULL; return NULL;