Use initalization instead of explicit zeroing in more places

[elogind.git] / src / bootchart / bootchart.c

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 052e6370c98ebe83a8e76853b13e2aefaba87111..288148f483e6349639f6440e9bfd5ba5b3a5ed09 100644 (file)
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -239,7 +239,9 @@ static int parse_args(int argc, char *argv[]) {
 
 int main(int argc, char *argv[]) {
         _cleanup_free_ char *build = NULL;
-        struct sigaction sig;
+        struct sigaction sig = {
+                .sa_handler = signal_handler,
+        };
         struct ps_struct *ps;
         char output_file[PATH_MAX];
         char datestr[200];
@@ -279,8 +281,6 @@ int main(int argc, char *argv[]) {
         }
 
         /* handle TERM/INT nicely */
-        memset(&sig, 0, sizeof(struct sigaction));
-        sig.sa_handler = signal_handler;
         sigaction(SIGHUP, &sig, NULL);
 
         interval = (1.0 / arg_hz) * 1000000000.0;
@@ -288,7 +288,7 @@ int main(int argc, char *argv[]) {
         log_uptime();
 
         /* main program loop */
-        while (!exiting) {
+        for (samples = 0; !exiting && samples < arg_samples_len; samples++) {
                 int res;
                 double sample_stop;
                 struct timespec req;
@@ -315,7 +315,7 @@ int main(int argc, char *argv[]) {
                                        NULL);
 
                 /* wait for /proc to become available, discarding samples */
-                if (!(graph_start > 0.0))
+                if (graph_start <= 0.0)
                         log_uptime();
                 else
                         log_sample(samples);
@@ -334,7 +334,7 @@ int main(int argc, char *argv[]) {
                  * we'll lose all the missed samples and overrun our total
                  * time
                  */
-                if ((newint_ns > 0) || (newint_s > 0)) {
+                if (newint_ns > 0 || newint_s > 0) {
                         req.tv_sec = newint_s;
                         req.tv_nsec = newint_ns;
 
@@ -350,14 +350,8 @@ int main(int argc, char *argv[]) {
                 } else {
                         overrun++;
                         /* calculate how many samples we lost and scrap them */
-                        arg_samples_len = arg_samples_len + ((int)(newint_ns / interval));
+                        arg_samples_len -= (int)(newint_ns / interval);
                 }
-
-                samples++;
-
-                if (samples > arg_samples_len)
-                        break;
-
         }
 
         /* do some cleanup, close fd's */