X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foutput.c;h=657af88462c7baa82752be37b3def4906f9015e6;hb=17429ef85bfb4bdf51f4a659443fe4c31c972928;hp=22a67a46efea929431d6e91b63ff34cd8f714877;hpb=74aef1c34e31699595b4b198bcde5ac1af694260;p=debian%2Fdhcpd-pools.git diff --git a/src/output.c b/src/output.c index 22a67a4..657af88 100644 --- a/src/output.c +++ b/src/output.c @@ -1,19 +1,18 @@ -/* -** Copyright (C) 2006- Sami Kerola -** -** This program is free software; you can redistribute it and/or modify +/* http://dhcpd-pools.sourceforge.net/ +** Copyright 2006- Sami Kerola +** +** This program is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or +** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. -** +** ** This program is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. -** +** ** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +** along with this program. If not, see . */ #ifdef HAVE_CONFIG_H @@ -24,6 +23,7 @@ #include #include #include +#include #include "dhcpd-pools.h" @@ -39,8 +39,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 +54,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 +85,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 +104,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 +123,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 +142,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 +161,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 +172,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 +196,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 +276,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 +425,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 +451,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 +491,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 +517,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 +542,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 +565,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 +590,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 +607,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 +630,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 +645,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 +677,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 +695,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 +715,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 +732,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 +751,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 +763,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"); } }