posix_fadvice advice parameter change

[debian/dhcpd-pools.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 22a67a4..f2858c6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -24,6 +24,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <err.h>
 
 #include "dhcpd-pools.h"
 
@@ -39,8 +40,8 @@ int output_txt(void)
        if (config.output_file[0]) {
                outfile = fopen(config.output_file, "w+");
                if (outfile == NULL) {
-                       eprintf("output_txt: %s:", config.output_file);
-                       exit(EXIT_FAILURE);
+                       err(EXIT_FAILURE, "output_txt: %s",
+                           config.output_file);
                }
        } else {
                outfile = stdout;
@@ -54,7 +55,7 @@ int output_txt(void)
                fprintf
                    (outfile,
                     "shared net name     first ip           last ip            max   cur    percent  touch   t+c  t+c perc");
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        fprintf(outfile, "     bu  bu perc");
                }
                fprintf(outfile, "\n");
@@ -85,7 +86,7 @@ int output_txt(void)
                                          range_p->count)) /
                                (range_p->last_ip - range_p->first_ip -
                                 1));
-                       if (num_backups > 0) {
+                       if (0 < num_backups) {
                                fprintf(outfile, "%7lu %8.3f",
                                        range_p->backups,
                                        (float) (100 * range_p->backups) /
@@ -104,7 +105,7 @@ int output_txt(void)
                fprintf(outfile, "Shared networks:\n");
                fprintf(outfile,
                        "name                   max   cur     percent  touch    t+c  t+c perc");
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        fprintf(outfile, "     bu  bu perc");
                }
                fprintf(outfile, "\n");
@@ -123,7 +124,7 @@ int output_txt(void)
                                         (shared_p->touched +
                                          shared_p->used)) /
                                shared_p->available);
-                       if (num_backups > 0) {
+                       if (0 < num_backups) {
                                fprintf(outfile, "%7lu %8.3f",
                                        shared_p->backups,
                                        (float) (100 * shared_p->backups) /
@@ -142,7 +143,7 @@ int output_txt(void)
                fprintf(outfile,
                        "name                   max   cur     percent  touch    t+c  t+c perc");
 
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        fprintf(outfile, "     bu  bu perc");
                }
                fprintf(outfile, "\n");
@@ -161,7 +162,7 @@ int output_txt(void)
                                  shared_networks->used)) /
                        shared_networks->available);
 
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        fprintf(outfile, "%7lu %8.3f",
                                shared_networks->backups,
                                (float) (100 * shared_networks->backups) /
@@ -172,12 +173,12 @@ int output_txt(void)
        if (outfile == stdout) {
                ret = fflush(stdout);
                if (ret) {
-                       eprintf("output_txt: fflush:");
+                       warn("output_txt: fflush");
                }
        } else {
                ret = fclose(outfile);
                if (ret) {
-                       eprintf("output_txt: fclose:");
+                       warn("output_txt: fclose");
                }
        }
 
@@ -196,8 +197,8 @@ int output_xml(void)
        if (config.output_file[0]) {
                outfile = fopen(config.output_file, "w+");
                if (outfile == NULL) {
-                       eprintf("output_xml: %s:", config.output_file);
-                       exit(EXIT_FAILURE);
+                       err(EXIT_FAILURE, "output_xml: %s",
+                           config.output_file);
                }
        } else {
                outfile = stdout;
@@ -276,12 +277,12 @@ int output_xml(void)
        if (outfile == stdout) {
                ret = fflush(stdout);
                if (ret) {
-                       eprintf("output_xml: fflush:");
+                       warn("output_xml: fflush");
                }
        } else {
                ret = fclose(outfile);
                if (ret) {
-                       eprintf("output_xml: fclose:");
+                       warn("output_xml: fclose");
                }
        }
 
@@ -425,8 +426,8 @@ int output_html(void)
        if (config.output_file[0]) {
                outfile = fopen(config.output_file, "w+");
                if (outfile == NULL) {
-                       eprintf("output_html: %s:", config.output_file);
-                       exit(EXIT_FAILURE);
+                       err(EXIT_FAILURE, "output_html: %s",
+                           config.output_file);
                }
        } else {
                outfile = stdout;
@@ -451,7 +452,7 @@ int output_html(void)
                output_line(outfile, "th", "ralign", "touch");
                output_line(outfile, "th", "ralign", "t+c");
                output_line(outfile, "th", "ralign", "t+c perc");
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        output_line(outfile, "th", "ralign", "bu");
                        output_line(outfile, "th", "ralign", "bu perc");
                }
@@ -491,7 +492,7 @@ int output_html(void)
                                               range_p->count)) /
                                     (range_p->last_ip -
                                      range_p->first_ip - 1));
-                       if (num_backups > 0) {
+                       if (0 < num_backups) {
                                output_long(outfile, "td",
                                            range_p->backups);
                                output_float(outfile, "td",
@@ -517,7 +518,7 @@ int output_html(void)
                output_line(outfile, "th", "ralign", "touch");
                output_line(outfile, "th", "ralign", "t+c");
                output_line(outfile, "th", "ralign", "t+c perc");
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        output_line(outfile, "th", "ralign", "bu");
                        output_line(outfile, "th", "ralign", "bu perc");
                }
@@ -542,7 +543,7 @@ int output_html(void)
                                              (shared_p->touched +
                                               shared_p->used)) /
                                     shared_p->available);
-                       if (num_backups > 0) {
+                       if (0 < num_backups) {
                                output_long(outfile, "td",
                                            shared_p->backups);
                                output_float(outfile, "td",
@@ -565,7 +566,7 @@ int output_html(void)
                output_line(outfile, "th", "ralign", "touch");
                output_line(outfile, "th", "ralign", "t+c");
                output_line(outfile, "th", "ralign", "t+c perc");
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        output_line(outfile, "th", "ralign", "bu");
                        output_line(outfile, "th", "ralign", "bu perc");
                }
@@ -590,7 +591,7 @@ int output_html(void)
                                      (shared_networks->touched +
                                       shared_networks->used)) /
                             shared_networks->available);
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        output_long(outfile, "td",
                                    shared_networks->backups);
                        output_float(outfile, "td",
@@ -607,12 +608,12 @@ int output_html(void)
        if (outfile == stdout) {
                ret = fflush(stdout);
                if (ret) {
-                       eprintf("output_html: fflush:");
+                       warn("output_html: fflush");
                }
        } else {
                ret = fclose(outfile);
                if (ret) {
-                       eprintf("output_html: fclose:");
+                       warn("output_html: fclose");
                }
        }
        return 0;
@@ -630,8 +631,8 @@ int output_csv(void)
        if (config.output_file[0]) {
                outfile = fopen(config.output_file, "w+");
                if (outfile == NULL) {
-                       eprintf("output_csv: %s:", config.output_file);
-                       exit(EXIT_FAILURE);
+                       err(EXIT_FAILURE, "output_csv: %s",
+                           config.output_file);
                }
        } else {
                outfile = stdout;
@@ -645,7 +646,7 @@ int output_csv(void)
                fprintf
                    (outfile,
                     "\"shared net name\",\"first ip\",\"last ip\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\"");
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        fprintf(outfile, ",\"bu\",\"bu perc\"");
                }
                fprintf(outfile, "\n");
@@ -677,7 +678,7 @@ int output_csv(void)
                                          range_p->count)) /
                                (range_p->last_ip - range_p->first_ip -
                                 1));
-                       if (num_backups > 0) {
+                       if (0 < num_backups) {
                                fprintf(outfile, ",\"%lu\",\"%.3f\"",
                                        range_p->backups,
                                        (float) (100 * range_p->backups) /
@@ -695,7 +696,7 @@ int output_csv(void)
                fprintf(outfile, "\"Shared networks:\"\n");
                fprintf(outfile,
                        "\"name\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\"");
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        fprintf(outfile, ",\"bu\",\"bu perc\"");
                }
                fprintf(outfile, "\n");
@@ -715,7 +716,7 @@ int output_csv(void)
                                         (shared_p->touched +
                                          shared_p->used)) /
                                shared_p->available);
-                       if (num_backups > 0) {
+                       if (0 < num_backups) {
                                fprintf(outfile, ",\"%lu\",\"%.3f\"",
                                        shared_p->backups,
                                        (float) (100 * shared_p->backups) /
@@ -732,7 +733,7 @@ int output_csv(void)
                fprintf(outfile, "\"Sum of all ranges:\"\n");
                fprintf(outfile,
                        "\"name\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\"");
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        fprintf(outfile, ",\"bu\",\"bu perc\"");
                }
                fprintf(outfile, "\n");
@@ -751,7 +752,7 @@ int output_csv(void)
                                 (shared_networks->touched +
                                  shared_networks->used)) /
                        shared_networks->available);
-               if (num_backups > 0) {
+               if (0 < num_backups) {
                        fprintf(outfile, "%7lu %8.3f",
                                shared_networks->backups,
                                (float) (100 * shared_networks->backups) /
@@ -763,13 +764,13 @@ int output_csv(void)
        if (outfile == stdout) {
                ret = fflush(stdout);
                if (ret) {
-                       eprintf("output_cvs: fflush:");
+                       warn("output_cvs: fflush");
                }
 
        } else {
                ret = fclose(outfile);
                if (ret) {
-                       eprintf("output_cvs: fclose:");
+                       warn("output_cvs: fclose");
                }
 
        }