From b6525bb94bdf259c7d445ab81874c3a4917d39c2 Mon Sep 17 00:00:00 2001 From: J08nY Date: Wed, 4 Jul 2018 11:46:58 +0200 Subject: Fix setting --points=none. --- src/io/cli.c | 5 +---- src/misc/config.h | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/io/cli.c b/src/io/cli.c index aa9628a..7b7fca9 100644 --- a/src/io/cli.c +++ b/src/io/cli.c @@ -3,7 +3,7 @@ * Copyright (C) 2017-2018 J08nY */ #include "cli.h" -#include +#include "misc/config.h" #include #include "exhaustive/ansi.h" #include "exhaustive/brainpool.h" @@ -179,9 +179,6 @@ static void cli_end(struct argp_state *state) { if (!cfg->thread_memory) { cfg->thread_memory = cfg->bits * 2000000; } - if (!cfg->points.type) { - cfg->points.type = POINTS_PRIME; - } cfg->format = FORMAT_JSON; } diff --git a/src/misc/config.h b/src/misc/config.h index 7db13de..4135f9e 100644 --- a/src/misc/config.h +++ b/src/misc/config.h @@ -14,11 +14,11 @@ enum field_e { FIELD_PRIME = 1 << 0, FIELD_BINARY = 1 << 1 }; enum format_e { FORMAT_JSON }; enum points_e { - POINTS_NONE = 0, - POINTS_PRIME, + POINTS_PRIME = 0, + POINTS_NONPRIME, POINTS_RANDOM, POINTS_ALL, - POINTS_NONPRIME + POINTS_NONE }; struct points_s { enum points_e type; -- cgit v1.3.1