Xinqi Bao's Git
projects
/
slstatus.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Add David Demelier to LICENSE
[slstatus.git]
/
components
/
swap.c
diff --git
a/components/swap.c
b/components/swap.c
index
234e7d1
..
c005691
100644
(file)
--- a/
components/swap.c
+++ b/
components/swap.c
@@
-48,7
+48,7
@@
}
sscanf(match, "SwapFree: %ld kB\n", &free);
}
sscanf(match, "SwapFree: %ld kB\n", &free);
- return
bprintf("%f", (float)free / 1024 / 1024
);
+ return
fmt_human_2(free * 1024, "B"
);
}
const char *
}
const char *
@@
-76,7
+76,7
@@
}
sscanf(match, "SwapFree: %ld kB\n", &free);
}
sscanf(match, "SwapFree: %ld kB\n", &free);
- return bprintf("%d", 100 * (total - free - cached) / total);
+ return bprintf("%d
%%
", 100 * (total - free - cached) / total);
}
const char *
}
const char *
@@
-94,7
+94,7
@@
}
sscanf(match, "SwapTotal: %ld kB\n", &total);
}
sscanf(match, "SwapTotal: %ld kB\n", &total);
- return
bprintf("%f", (float)total / 1024 / 1024
);
+ return
fmt_human_2(total * 1024, "B"
);
}
const char *
}
const char *
@@
-122,7
+122,7
@@
}
sscanf(match, "SwapFree: %ld kB\n", &free);
}
sscanf(match, "SwapFree: %ld kB\n", &free);
- return
bprintf("%f", (float)(total - free - cached) / 1024 / 1024
);
+ return
fmt_human_2((total - free - cached) * 1024, "B"
);
}
#elif defined(__OpenBSD__)
#include <stdlib.h>
}
#elif defined(__OpenBSD__)
#include <stdlib.h>
@@
-174,7
+174,7
@@
getstats(&total, &used);
getstats(&total, &used);
- return
bprintf("%f", (float)(total - used) / 1024 / 1024
);
+ return
fmt_human_2((total - used) * 1024, "B"
);
}
const char *
}
const char *
@@
-184,7
+184,7
@@
getstats(&total, &used);
getstats(&total, &used);
- return bprintf("%d", 100 * used / total);
+ return bprintf("%d
%%
", 100 * used / total);
}
const char *
}
const char *
@@
-194,7
+194,7
@@
getstats(&total, &used);
getstats(&total, &used);
- return
bprintf("%f", (float)total / 1024 / 1024
);
+ return
fmt_human_2(total * 1024, "B"
);
}
const char *
}
const char *
@@
-204,6
+204,6
@@
getstats(&total, &used);
getstats(&total, &used);
- return
bprintf("%f", (float)used / 1024 / 1024
);
+ return
fmt_human_2(used * 1024, "B"
);
}
#endif
}
#endif