main: move output_format to state, and rename color_format

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2018-05-20 12:03:07 +01:00
parent e8e9d49ebb
commit 3f85360c64
No known key found for this signature in database
GPG key ID: A9553245FDE9B739
3 changed files with 21 additions and 23 deletions

View file

@ -214,9 +214,10 @@ struct conf_t {
enum dhcp_version ip_version; /*!< Designator if the dhcpd is running in IPv4 or IPv6 mode. */
const char *dhcpdconf_file; /*!< Path to dhcpd.conf file. */
const char *dhcpdlease_file; /*!< Path to dhcpd.leases file. */
int output_format; /*!< Column to use in color_tags array. */
int color_format; /*!< Column to use in color_tags array. */
struct output_sort *sorts; /*!< Linked list how to sort ranges. */
const char *output_file; /*!< Output file path. */
char output_format; /*!< Output format, such as text, json, xml, .... */
const char *mustach_template; /*!< Mustach template file path. */
double warning; /*!< Warning percent threshold. */
double critical; /*!< Critical percent threshold. */
@ -314,7 +315,7 @@ extern int range_output_helper(struct conf_t *state, struct output_helper_t *oh,
struct range_t *range_p);
extern int shnet_output_helper(struct conf_t *state, struct output_helper_t *oh,
struct shared_network_t *shared_p);
extern int output_analysis(struct conf_t *state, const char output_format);
extern int output_analysis(struct conf_t *state);
/* sort.c */
extern void mergesort_ranges(struct conf_t *state,