dhcpd-pools.h: indentation fix

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-03-19 11:52:30 +01:00
parent 93bcd305c4
commit e219f3f722

View file

@ -26,44 +26,40 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#else /* Not STDC_HEADERS */
extern void exit ();
extern char *malloc ();
#endif /* STDC_HEADERS */
#else
extern void exit();
extern char *malloc();
#endif /* STDC_HEADERS */
/* Structures and unions */
struct configuration_t
{
char *dhcpdconf_file;
char *dhcpdlease_file;
char output_format[2];
char sort[6];
int reverse_order;
char *output_file;
int output_limit[2];
struct configuration_t {
char *dhcpdconf_file;
char *dhcpdlease_file;
char output_format[2];
char sort[6];
int reverse_order;
char *output_file;
int output_limit[2];
};
struct shared_network_t
{
char *name;
unsigned long int available;
unsigned long int used;
unsigned long int touched;
unsigned long int backups;
struct shared_network_t {
char *name;
unsigned long int available;
unsigned long int used;
unsigned long int touched;
unsigned long int backups;
};
struct range_t
{
struct shared_network_t *shared_net;
unsigned long int first_ip;
unsigned long int last_ip;
unsigned long int count;
unsigned long int touched;
unsigned long int backups;
struct range_t {
struct shared_network_t *shared_net;
unsigned long int first_ip;
unsigned long int last_ip;
unsigned long int count;
unsigned long int touched;
unsigned long int backups;
};
struct macaddr_t
{
char *ethernet;
char *ip;
struct macaddr_t *next;
struct macaddr_t {
char *ethernet;
char *ip;
struct macaddr_t *next;
};
/* Global variables */
@ -96,38 +92,39 @@ unsigned long int num_backups;
struct macaddr_t *macaddr;
/* Function prototypes */
int prepare_memory (void);
int parse_leases (void);
char * parse_config (int, char *, char *, char *, struct shared_network_t *)
__attribute__((nonnull (2, 3, 4)));
int nth_field (int n, char *dest, const char *src)
__attribute__((nonnull (2, 3)))
int prepare_memory(void);
int parse_leases(void);
char *parse_config(int, char *, char *, char *, struct shared_network_t *)
__attribute__ ((nonnull(2, 3, 4)));
int nth_field(int n, char *dest, const char *src)
__attribute__ ((nonnull(2, 3)))
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__((__hot__))
__attribute__ ((__hot__))
#endif
;
int prepare_data (void);
int do_counting (void);
;
int prepare_data(void);
int do_counting(void);
void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
__attribute__((nonnull (1, 2)));
__attribute__ ((nonnull(1, 2)));
/* General support functions */
void *safe_malloc (const size_t size)
void *safe_malloc(const size_t size)
#if __GNUC__ >= 3
__attribute__ ((__malloc__))
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__ ((__alloc_size__ ((1))))
#endif
__attribute__ ((__malloc__))
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__ ((__alloc_size__((1))))
#endif
;
char *safe_strdup(const char *str) __attribute__((nonnull (1)));
void print_version (void) __attribute__((noreturn));
void usage (int status) __attribute__((noreturn));
#endif
;
char *safe_strdup(const char *str) __attribute__ ((nonnull(1)));
void print_version(void) __attribute__ ((noreturn));
void usage(int status) __attribute__ ((noreturn));
/* qsort required functions... */
/* ...for ranges and... */
int intcomp (const void *x, const void *y) __attribute__((nonnull (1, 2)));
int rangecomp (const void *r1, const void *r2) __attribute__((nonnull (1, 2)));
int intcomp(const void *x, const void *y) __attribute__ ((nonnull(1, 2)));
int rangecomp(const void *r1, const void *r2)
__attribute__ ((nonnull(1, 2)));
/* sort function pointer and functions */
int sort_name (void);
int sort_name(void);
unsigned long int (*returner) (struct range_t r);
unsigned long int ret_ip(struct range_t r);
unsigned long int ret_cur(struct range_t r);
@ -137,15 +134,17 @@ unsigned long int ret_touched(struct range_t r);
unsigned long int ret_tc(struct range_t r);
unsigned long int ret_tcperc(struct range_t r);
void field_selector(char c);
int get_order(struct range_t *left, struct range_t *right) __attribute__((nonnull (1, 2)));
void mergesort_ranges (struct range_t *orig, int size, struct range_t *temp) __attribute__((nonnull (1, 3)));
int get_order(struct range_t *left, struct range_t *right)
__attribute__ ((nonnull(1, 2)));
void mergesort_ranges(struct range_t *orig, int size, struct range_t *temp)
__attribute__ ((nonnull(1, 3)));
/* output function pointer and functions */
int (*output_analysis) (void);
int output_txt (void);
int output_html (void);
int output_xml (void);
int output_csv (void);
int output_txt(void);
int output_html(void);
int output_xml(void);
int output_csv(void);
/* Memory release, file closing etc */
void clean_up (void);
void clean_up(void);
#endif /* DHCPD_POOLS_H */
#endif /* DHCPD_POOLS_H */