girineko/dhcpd-pools
1
0
Fork 0
mirror of git://git.code.sf.net/p/dhcpd-pools/code synced 2025-12-17 08:16:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

json output: add newline at end

Browse source 
And remove extra empty lines where they are not needed.

Reviewed-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Gilles Bouthenot <gilles.bouthenot@univ-fcomte.fr>
This commit is contained in:
Gilles Bouthenot 2012-12-05 12:32:15 +01:00 • committed by Sami Kerola
parent d34259092d
commit 48a23c94e5
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/output.c
View file

@ -331,7 +331,7 @@ int output_json(void)
struct macaddr_t *macaddr_p; struct macaddr_t *macaddr_p;
int ret; int ret;
FILE *outfile; FILE *outfile;
char sep; unsigned int sep;
if (config.output_file[0]) { if (config.output_file[0]) {
outfile = fopen(config.output_file, "w+"); outfile = fopen(config.output_file, "w+");
@ -346,12 +346,12 @@ int output_json(void)
range_p = ranges; range_p = ranges;
range_size = get_range_size(range_p); range_size = get_range_size(range_p);
shared_p = shared_networks; shared_p = shared_networks;
sep = ' '; sep = 0;
fprintf(outfile, "{\n"); fprintf(outfile, "{\n");
if (macaddr != NULL) { if (macaddr != NULL) {
fprintf(outfile, " %c\"active_leases\": [\n", sep); fprintf(outfile, " \"active_leases\": [");
for (i = 0, macaddr_p = macaddr; macaddr_p->next != NULL; for (i = 0, macaddr_p = macaddr; macaddr_p->next != NULL;
macaddr_p = macaddr_p->next) { macaddr_p = macaddr_p->next) {
if (0 != i) { if (0 != i) {
@ -365,12 +365,13 @@ int output_json(void)
i++; i++;
} }
fprintf(outfile, "\n ]"); /* end of active_leases */ fprintf(outfile, "\n ]"); /* end of active_leases */
sep = ','; sep++;
} }
if (config.output_limit[1] & output_limit_bit_1) { if (config.output_limit[1] & output_limit_bit_1) {
if (sep == ',') if (sep) {
printf(",\n"); printf(",\n");
}
fprintf(outfile, " \"subnets\": [\n"); fprintf(outfile, " \"subnets\": [\n");
for (i = 0; i < num_ranges; i++) { for (i = 0; i < num_ranges; i++) {
fprintf(outfile, " "); fprintf(outfile, " ");
@ -400,12 +401,13 @@ int output_json(void)
fprintf(outfile, "}\n"); fprintf(outfile, "}\n");
} }
fprintf(outfile, " ]"); /* end of subnets */ fprintf(outfile, " ]"); /* end of subnets */
sep = ','; sep++;
} }
if (config.output_limit[1] & output_limit_bit_2) { if (config.output_limit[1] & output_limit_bit_2) {
if (sep == ',') if (sep) {
printf(",\n"); printf(",\n");
}
fprintf(outfile, " \"shared-networks\": [\n"); fprintf(outfile, " \"shared-networks\": [\n");
for (i = 0; i < num_shared_networks; i++) { for (i = 0; i < num_shared_networks; i++) {
fprintf(outfile, " "); fprintf(outfile, " ");
@ -424,12 +426,13 @@ int output_json(void)
fprintf(outfile, "}\n"); fprintf(outfile, "}\n");
} }
fprintf(outfile, " ]"); /* end of shared-networks */ fprintf(outfile, " ]"); /* end of shared-networks */
sep = ','; sep++;
} }
if (config.output_limit[0] & output_limit_bit_3) { if (config.output_limit[0] & output_limit_bit_3) {
if (sep == ',') if (sep) {
printf(",\n"); printf(",\n");
}
fprintf(outfile, " \"summary\": {\n"); fprintf(outfile, " \"summary\": {\n");
fprintf(outfile, " \"location\":\"%s\",\n", fprintf(outfile, " \"location\":\"%s\",\n",
shared_networks->name); shared_networks->name);
@ -440,9 +443,10 @@ int output_json(void)
fprintf(outfile, " \"free\":%lu\n", fprintf(outfile, " \"free\":%lu\n",
shared_networks->available - shared_networks->used); shared_networks->available - shared_networks->used);
fprintf(outfile, " }"); /* end of summary */ fprintf(outfile, " }"); /* end of summary */
sep++;
} }
fprintf(outfile, "\n}"); fprintf(outfile, "\n}\n");
if (outfile == stdout) { if (outfile == stdout) {
ret = fflush(stdout); ret = fflush(stdout);
if (ret) { if (ret) {