diff options
-rw-r--r-- | src/bootchart/bootchart.c | 21 | ||||
-rw-r--r-- | src/bootchart/log.c | 5 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 3d77bab129..7bcfd98249 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -28,6 +28,7 @@ #include "bootchart.h" +#include "util.h" double graph_start; double log_start; @@ -109,25 +110,25 @@ int main(int argc, char *argv[]) // todo: filter leading/trailing whitespace - if (!strcmp(key, "samples")) + if (streq(key, "samples")) len = atoi(val); - if (!strcmp(key, "freq")) + if (streq(key, "freq")) hz = atof(val); - if (!strcmp(key, "rel")) + if (streq(key, "rel")) relative = atoi(val); - if (!strcmp(key, "filter")) + if (streq(key, "filter")) filter = atoi(val); - if (!strcmp(key, "pss")) + if (streq(key, "pss")) pss = atoi(val); - if (!strcmp(key, "output")) + if (streq(key, "output")) strncpy(output_path, val, PATH_MAX - 1); - if (!strcmp(key, "init")) + if (streq(key, "init")) strncpy(init_path, val, PATH_MAX - 1); - if (!strcmp(key, "scale_x")) + if (streq(key, "scale_x")) scale_x = atof(val); - if (!strcmp(key, "scale_y")) + if (streq(key, "scale_y")) scale_y = atof(val); - if (!strcmp(key, "entropy")) + if (streq(key, "entropy")) entropy = atoi(val); } fclose(f); diff --git a/src/bootchart/log.c b/src/bootchart/log.c index 78f0cab178..c697121814 100644 --- a/src/bootchart/log.c +++ b/src/bootchart/log.c @@ -26,6 +26,7 @@ #include "bootchart.h" +#include "util.h" /* * Alloc a static 4k buffer for stdio - primarily used to increase @@ -125,9 +126,9 @@ void log_sample(int sample) while (m) { if (sscanf(m, "%s %s", key, val) < 2) goto vmstat_next; - if (!strcmp(key, "pgpgin")) + if (streq(key, "pgpgin")) blockstat[sample].bi = atoi(val); - if (!strcmp(key, "pgpgout")) { + if (streq(key, "pgpgout")) { blockstat[sample].bo = atoi(val); break; } |