removed unnecessary typecast and added more comments

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 163b44e..d360977 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,12 +1,10 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <alsa/asoundlib.h>
 /* See LICENSE file for copyright and license details. */
 
 #include <alsa/asoundlib.h>

-#include <arpa/inet.h>

 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <limits.h>
 #include <linux/wireless.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <limits.h>
 #include <linux/wireless.h>

-#include <locale.h>

 #include <netdb.h>
 #include <pwd.h>
 #include <stdarg.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <stdarg.h>


@@ -29,9 +27,8 @@
 #include "strlcat.h"
 #include "strlcpy.h"
 
 #include "strlcat.h"
 #include "strlcpy.h"
 

-typedef char *(*op_fun)();

 struct arg {
 struct arg {

-       op_fun func;
+       char *(*func)();

        const char *format;
        const char *args;
 };
        const char *format;
        const char *args;
 };


@@ -105,7 +102,7 @@ battery_perc(const char *battery)
        int now, full, perc;
        char batterynowfile[64];
        char batteryfullfile[64];
        int now, full, perc;
        char batterynowfile[64];
        char batteryfullfile[64];

-       FILE *fp = fopen(batterynowfile, "r");
+       FILE *fp;

 
        strlcpy(batterynowfile, BATTERY_PATH, sizeof(batterynowfile));
        strlcat(batterynowfile, battery, sizeof(batterynowfile));
 
        strlcpy(batterynowfile, BATTERY_PATH, sizeof(batterynowfile));
        strlcat(batterynowfile, battery, sizeof(batterynowfile));


@@ -117,6 +114,7 @@ battery_perc(const char *battery)
        strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
        strlcat(batteryfullfile, BATTERY_FULL, sizeof(batteryfullfile));
 
        strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
        strlcat(batteryfullfile, BATTERY_FULL, sizeof(batteryfullfile));
 

+       fp = fopen(batterynowfile, "r");

        if (fp == NULL ) {
                fprintf(stderr, "Error opening battery file: %s: %s\n",
                                                batterynowfile,
        if (fp == NULL ) {
                fprintf(stderr, "Error opening battery file: %s: %s\n",
                                                batterynowfile,


@@ -251,7 +249,8 @@ entropy(void)
        FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
 
        if (fp == NULL) {
        FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Could not open entropy file.\n");
+               fprintf(stderr, "Could not open entropy file: %s\n",
+                                               strerror(errno));

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -475,6 +474,7 @@ uptime(void)
 static char *
 username(void)
 {
 static char *
 username(void)
 {

+       /* FIXME: WHY USE REGISTER MODIFIER? */

        register struct passwd *pw;
        register uid_t uid;
 
        register struct passwd *pw;
        register uid_t uid;
 


@@ -514,6 +514,10 @@ uid(void)
 static char *
 vol_perc(const char *soundcard)
 {
 static char *
 vol_perc(const char *soundcard)
 {

+       /*
+        * TODO: FIXME: 
+        * https://github.com/drkh5h/slstatus/issues/12
+        */

        int mute = 0;
        long vol = 0, max = 0, min = 0;
        snd_mixer_t *handle;
        int mute = 0;
        long vol = 0, max = 0, min = 0;
        snd_mixer_t *handle;


@@ -562,12 +566,14 @@ wifi_perc(const char *wificard)
        char path[64];
        char status[5];
        char needle[strlen(wificard)+2];
        char path[64];
        char status[5];
        char needle[strlen(wificard)+2];

-       FILE *fp = fopen(path, "r");
+       FILE *fp;

 
        strlcpy(path, "/sys/class/net/", sizeof(path));
        strlcat(path, wificard, sizeof(path));
        strlcat(path, "/operstate", sizeof(path));
 
 
        strlcpy(path, "/sys/class/net/", sizeof(path));
        strlcat(path, wificard, sizeof(path));
        strlcat(path, "/operstate", sizeof(path));
 

+       fp = fopen(path, "r");
+

        if(fp == NULL) {
                fprintf(stderr, "Error opening wifi operstate file: %s\n",
                                                        strerror(errno));
        if(fp == NULL) {
                fprintf(stderr, "Error opening wifi operstate file: %s\n",
                                                        strerror(errno));