commit c6106f85687fa93745c58754bca257d0714e5646
parent c497b8597319c91ce538c2c340801bafa0099d25
Author: Frederic Cambus <fred@statdns.com>
Date: Mon, 9 Jan 2017 00:09:41 +0100
Wrap the json_array_append_new() calls
Diffstat:
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/output.c b/src/output.c
@@ -31,37 +31,63 @@ char *output(struct results* results) {
for (size_t loop=0; loop<CONTINENTS; loop++) {
if (results->continents[loop]) {
- json_array_append_new(continentsArray, json_pack("{s:s, s:s, s:i}", "data", continentsId[loop], "name", continentsNames[loop], "hits", results->continents[loop]));
+ json_array_append_new(
+ continentsArray,
+ json_pack("{s:s, s:s, s:i}",
+ "data", continentsId[loop],
+ "name", continentsNames[loop],
+ "hits", results->continents[loop]));
}
}
for (size_t loop=0; loop<COUNTRIES; loop++) {
if (results->countries[loop]) {
- json_array_append_new(countriesArray, json_pack("{s:s, s:s, s:i}", "data", GeoIP_code_by_id(loop), "name", GeoIP_name_by_id(loop), "hits", results->countries[loop]));
+ json_array_append_new(
+ countriesArray,
+ json_pack("{s:s, s:s, s:i}",
+ "data", GeoIP_code_by_id(loop),
+ "name", GeoIP_name_by_id(loop),
+ "hits", results->countries[loop]));
}
}
for (size_t loop=0; loop<24; loop++) {
if (results->hours[loop]) {
- json_array_append_new(hoursArray, json_pack("{s:i, s:i}", "data", loop, "hits", results->hours[loop]));
+ json_array_append_new(
+ hoursArray,
+ json_pack("{s:i, s:i}",
+ "data", loop,
+ "hits", results->hours[loop]));
}
}
for (size_t loop=0; loop<STATUS_CODE_MAX; loop++) {
if (results->status[loop]) {
- json_array_append_new(httpStatusArray, json_pack("{s:i, s:i}", "data", loop, "hits", results->status[loop]));
+ json_array_append_new(
+ httpStatusArray,
+ json_pack("{s:i, s:i}",
+ "data", loop,
+ "hits", results->status[loop]));
}
}
for (size_t loop=0; loop<METHODS; loop++) {
if (results->methods[loop]) {
- json_array_append_new(methodsArray, json_pack("{s:s, s:i}", "data", methods[loop], "hits", results->methods[loop]));
+ json_array_append_new(
+ methodsArray,
+ json_pack("{s:s, s:i}",
+ "data", methods[loop],
+ "hits", results->methods[loop]));
}
}
for (size_t loop=0; loop<PROTOCOLS; loop++) {
if (results->protocols[loop]) {
- json_array_append_new(protocolsArray, json_pack("{s:s, s:i}", "data", protocols[loop], "hits", results->protocols[loop]));
+ json_array_append_new(
+ protocolsArray,
+ json_pack("{s:s, s:i}",
+ "data", protocols[loop],
+ "hits", results->protocols[loop]));
}
}