Easier info function names

All the info function names started with "get_", which I removed to make
it easier for the user to configure the program to its needs.
Additionally I renamed some functions (e.g. get_ram_usage) to better
names, making it easier to extend the program with ram usage / total
functions.

diff --git a/config.def.h b/config.def.h
index b3f01df469c78e980ad2a9c42c8877fd59e71de7..e84c40a1830761ebe0c59510bf0cbc269b43c0b9 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -21,13 +21,13 @@ static unsigned int update_interval = 1;
 - volume (alsa volume and mute status in percent) [argument: soundcard]
 - wifi_signal (wifi signal in percent) [argument: wifi card interface name] */
 static const struct arg args[] = {
-    /* function             format          argument */
-    { get_wifi_signal,      "wifi %4s | ",  "wlp3s0" },
-    { get_battery,          "bat %4s | ",   "BAT0" },
-    { get_cpu_usage,        "cpu %4s ",     NULL },
-    { get_cpu_temperature,  "%3s | ",       "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input" },
-    { get_ram_usage,        "ram %3s | ",   NULL },
-    { get_volume,           "vol %4s | ",   "default" },
-    { get_diskusage,        "ssd %3s | ",   "/" },
-    { get_datetime,         "%s",           "%y-%m-%d %H:%M:%S" }
+    /* function     format          argument */
+    { wifi_perc,    "wifi %4s | ",  "wlp3s0" },
+    { battery_perc, "bat %4s | ",   "BAT0" },
+    { cpu_perc,     "cpu %4s ",     NULL },
+    { temp,         "%3s | ",       "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input" },
+    { ram_perc,     "ram %3s | ",   NULL },
+    { vol_perc,     "vol %4s | ",   "default" },
+    { disk_perc,    "ssd %3s | ",   "/" },
+    { datetime,     "%s",           "%y-%m-%d %H:%M:%S" },
 };

diff --git a/slstatus.c b/slstatus.c
index 1db9af8dd400ce18f623a5c8028be2ae3192a727..ee6b16080cb01724aeeae0060359ca9a45661c29 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -45,7 +45,7 @@ smprintf(const char *fmt, ...)
 
 /* battery percentage */
 char *
-get_battery(const char *battery)
+battery_perc(const char *battery)
 {
     int now, full, perc;
     char batterynowfile[64] = "";
@@ -95,32 +95,9 @@ get_battery(const char *battery)
     return smprintf("%d%%", perc);
 }
 
-/* cpu temperature */
-char *
-get_cpu_temperature(const char *file)
-{
-    int temperature;
-    FILE *fp;
-
-    /* open temperature file */
-    if (!(fp = fopen(file, "r"))) {
-        fprintf(stderr, "Could not open temperature file.\n");
-        return smprintf("n/a");
-    }
-
-    /* extract temperature */
-    fscanf(fp, "%d", &temperature);
-
-    /* close temperature file */
-    fclose(fp);
-
-    /* return temperature in degrees */
-    return smprintf("%d°C", temperature / 1000);
-}
-
 /* cpu percentage */
 char *
-get_cpu_usage(const char *null)
+cpu_perc(const char *null)
 {
     int perc;
     long double a[4], b[4];
@@ -162,7 +139,7 @@ get_cpu_usage(const char *null)
 
 /* date and time */
 char *
-get_datetime(const char *timeformat)
+datetime(const char *timeformat)
 {
     time_t tm;
     size_t bufsize = 64;
@@ -186,7 +163,7 @@ get_datetime(const char *timeformat)
 
 /* disk usage percentage */
 char *
-get_diskusage(const char *mountpoint)
+disk_perc(const char *mountpoint)
 {
     int perc = 0;
     struct statvfs fs;
@@ -206,7 +183,7 @@ get_diskusage(const char *mountpoint)
 
 /* ram percentage */
 char *
-get_ram_usage(const char *null)
+ram_perc(const char *null)
 {
     int perc;
     long total, free, buffers, cached;
@@ -234,9 +211,33 @@ get_ram_usage(const char *null)
     return smprintf("%d%%", perc);
 }
 
+/* temperature */
+char *
+temp(const char *file)
+{
+    int temperature;
+    FILE *fp;
+
+    /* open temperature file */
+    if (!(fp = fopen(file, "r"))) {
+        fprintf(stderr, "Could not open temperature file.\n");
+        return smprintf("n/a");
+    }
+
+    /* extract temperature */
+    fscanf(fp, "%d", &temperature);
+
+    /* close temperature file */
+    fclose(fp);
+
+    /* return temperature in degrees */
+    return smprintf("%d°C", temperature / 1000);
+}
+
+
 /* alsa volume percentage */
 char *
-get_volume(const char *soundcard)
+vol_perc(const char *soundcard)
 {
     int mute = 0;
     long vol = 0, max = 0, min = 0;
@@ -274,7 +275,7 @@ get_volume(const char *soundcard)
 
 /* wifi percentage */
 char *
-get_wifi_signal(const char *wificard)
+wifi_perc(const char *wificard)
 {
     int bufsize = 255;
     int strength;

diff --git a/slstatus.h b/slstatus.h
index ed86717f130753fb62a334d1a3d09cad1297211a..fb358dc898782a71b7fd0fd3323647d036e7942c 100644 (file)
--- a/slstatus.h
+++ b/slstatus.h
@@ -14,11 +14,11 @@ struct arg {
 /* functions */
 void setstatus(const char *);
 char *smprintf(const char *, ...);
-char *get_battery(const char *);
-char *get_cpu_temperature(const char *);
-char *get_cpu_usage(const char *);
-char *get_datetime(const char *);
-char *get_diskusage(const char *);
-char *get_ram_usage(const char *);
-char *get_volume(const char *);
-char *get_wifi_signal(const char *);
+char *battery_perc(const char *);
+char *cpu_perc(const char *);
+char *datetime(const char *);
+char *disk_perc(const char *);
+char *ram_perc(const char *);
+char *temp(const char *);
+char *vol_perc(const char *);
+char *wifi_perc(const char *);