remove newlines from warn() in swap_*(), those functions already print a newline...

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 329093f..e6e726e 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -407,7 +407,7 @@ run_command(const char *cmd)
 {
        char *nlptr;
        FILE *fp;
 {
        char *nlptr;
        FILE *fp;

-       char buf[1024] = "n/a";
+       char buf[1024] = UNKNOWN_STR;

 
        fp = popen(cmd, "r");
        if (fp == NULL) {
 
        fp = popen(cmd, "r");
        if (fp == NULL) {


@@ -443,7 +443,7 @@ swap_free(void)
        buf[bytes_read] = '\0';
        fclose(fp);
        if (bytes_read == 0 || bytes_read == sizeof(buf)) {
        buf[bytes_read] = '\0';
        fclose(fp);
        if (bytes_read == 0 || bytes_read == sizeof(buf)) {

-               warn("Failed to read /proc/meminfo\n");
+               warn("Failed to read from /proc/meminfo");

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


@@ -477,7 +477,7 @@ swap_perc(void)
        buf[bytes_read] = '\0';
        fclose(fp);
        if (bytes_read == 0 || bytes_read == sizeof(buf)) {
        buf[bytes_read] = '\0';
        fclose(fp);
        if (bytes_read == 0 || bytes_read == sizeof(buf)) {

-               warn("Failed to read /proc/meminfo\n");
+               warn("Failed to read from /proc/meminfo");

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


@@ -514,7 +514,7 @@ swap_total(void)
        buf[bytes_read] = '\0';
        fclose(fp);
        if (bytes_read == 0 || bytes_read == sizeof(buf)) {
        buf[bytes_read] = '\0';
        fclose(fp);
        if (bytes_read == 0 || bytes_read == sizeof(buf)) {

-               warn("Failed to read /proc/meminfo\n");
+               warn("Failed to read from /proc/meminfo");

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


@@ -545,7 +545,7 @@ swap_used(void)
        buf[bytes_read] = '\0';
        fclose(fp);
        if (bytes_read == 0 || bytes_read == sizeof(buf)) {
        buf[bytes_read] = '\0';
        fclose(fp);
        if (bytes_read == 0 || bytes_read == sizeof(buf)) {

-               warn("Failed to read /proc/meminfo\n");
+               warn("Failed to read from /proc/meminfo");

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