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

remove upper limit of sort order definitions

Browse source 
Unlikely to be needed by anyone, but because arbitrary limits are from code
style point of view ugly.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2015-11-30 00:49:42 +00:00
parent 327691f34a
commit 0369340710
No known key found for this signature in database
GPG key ID: A9553245FDE9B739
5 changed files with 72 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/dhcpd-pools.c
View file

@ -89,7 +89,7 @@ struct leases_t *(*find_lease) (union ipaddr_t *ip);
* alarming. */
int main(int argc, char **argv)
{
int i, sorts = 0;
int i;
int option_index = 0;
char const *tmp;
struct range_t *tmp_ranges;
@ -150,6 +150,7 @@ int main(int argc, char **argv)
/* Default sort order is by IPs small to big */
config.reverse_order = false;
config.backups_found = false;
prepare_memory();
/* Parse command line options */
while (1) {
int c;
@ -171,16 +172,23 @@ int main(int argc, char **argv)
strncpy(config.output_format, optarg, (size_t)1);
break;
case 's':
{
/* Output sorting option */
sorts = strlen(optarg);
if (5 < sorts) {
error(0, 0, "main: only first 5 sort orders will be used");
strncpy(config.sort, optarg, (size_t)5);
sorts = 5;
} else
strncpy(config.sort, optarg, (size_t)sorts);
for (i = 0; i < sorts; i++)
field_selector(config.sort[i]);
struct output_sort *p = config.sorts;
while (p && p->next)
p = p->next;
for (i = 0; i < strlen(optarg); i++) {
if (config.sorts == NULL) {
config.sorts = xcalloc(1, sizeof(struct output_sort));
p = config.sorts;
} else {
p->next = xcalloc(1, sizeof(struct output_sort));
p = p->next;
}
p->func = field_selector(optarg[i]);
}
}
break;
case 'r':
/* What ever sort in reverse order */
@ -269,14 +277,13 @@ int main(int argc, char **argv)
error(EXIT_FAILURE, 0, "main: unknown output format `%c'", config.output_format[0]);
}
/* Do the job */
prepare_memory();
set_ipv_functions(VERSION_UNKNOWN);
parse_config(true, config.dhcpdconf_file, shared_networks);
parse_leases();
prepare_data();
do_counting();
tmp_ranges = xmalloc(sizeof(struct range_t) * num_ranges);
if (sorts != 0)
if (config.sorts != NULL)
mergesort_ranges(ranges, num_ranges, tmp_ranges);
if (config.reverse_order == true)
flip_ranges(ranges, tmp_ranges);
@ -300,4 +307,5 @@ void prepare_memory(void)
shared_networks->used = 0;
shared_networks->touched = 0;
shared_networks->backups = 0;
config.sorts = NULL;
}