Browse Source

swap: Print UNKNOWN_STR if no swap is allocated

master
Jody Leonard 7 years ago
parent
commit
9bef4e889a
1 changed files with 22 additions and 7 deletions
  1. +22
    -7
      slstatus.c

+ 22
- 7
slstatus.c View File

@@ -424,7 +424,7 @@ run_command(const char *cmd)
static char *
swap_free(void)
{
long free;
long total, free;
FILE *fp;
char buf[2048];
size_t bytes_read;
@@ -443,6 +443,12 @@ swap_free(void)
return smprintf(UNKNOWN_STR);
}

match = strstr(buf, "SwapTotal");
sscanf(match, "SwapTotal: %ld kB\n", &total);
if (total == 0) {
return smprintf(UNKNOWN_STR);
}

match = strstr(buf, "SwapFree");
sscanf(match, "SwapFree: %ld kB\n", &free);

@@ -471,11 +477,14 @@ swap_perc(void)
return smprintf(UNKNOWN_STR);
}

match = strstr(buf, "SwapCached");
sscanf(match, "SwapCached: %ld kB\n", &cached);

match = strstr(buf, "SwapTotal");
sscanf(match, "SwapTotal: %ld kB\n", &total);
if (total == 0) {
return smprintf(UNKNOWN_STR);
}

match = strstr(buf, "SwapCached");
sscanf(match, "SwapCached: %ld kB\n", &cached);

match = strstr(buf, "SwapFree");
sscanf(match, "SwapFree: %ld kB\n", &free);
@@ -507,6 +516,9 @@ swap_total(void)

match = strstr(buf, "SwapTotal");
sscanf(match, "SwapTotal: %ld kB\n", &total);
if (total == 0) {
return smprintf(UNKNOWN_STR);
}

return smprintf("%f", (float)total / 1024 / 1024);
}
@@ -533,11 +545,14 @@ swap_used(void)
return smprintf(UNKNOWN_STR);
}

match = strstr(buf, "SwapCached");
sscanf(match, "SwapCached: %ld kB\n", &cached);

match = strstr(buf, "SwapTotal");
sscanf(match, "SwapTotal: %ld kB\n", &total);
if (total == 0) {
return smprintf(UNKNOWN_STR);
}

match = strstr(buf, "SwapCached");
sscanf(match, "SwapCached: %ld kB\n", &cached);

match = strstr(buf, "SwapFree");
sscanf(match, "SwapFree: %ld kB\n", &free);


Loading…
Cancel
Save