diff options
| author | J08nY | 2017-10-14 13:25:47 +0200 |
|---|---|---|
| committer | J08nY | 2017-10-14 13:25:47 +0200 |
| commit | 80514f24dae8352f39f9a9e49c0d9afbd8edd432 (patch) | |
| tree | 77735babce3681a792bf5e05fea5b672091026fc /src/misc | |
| parent | 5a24bec70aa2614e847e866be514341dce10ff19 (diff) | |
| download | ecgen-80514f24dae8352f39f9a9e49c0d9afbd8edd432.tar.gz ecgen-80514f24dae8352f39f9a9e49c0d9afbd8edd432.tar.zst ecgen-80514f24dae8352f39f9a9e49c0d9afbd8edd432.zip | |
Make config_t *cfg a global variable.
The config is setup from parsing CLI options and then doesn't
change for the whole duration of running ecgen, so it makes sense
to make it a global variable.
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/config.c | 3 | ||||
| -rw-r--r-- | src/misc/config.h | 3 | ||||
| -rw-r--r-- | src/misc/types.h | 12 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/misc/config.c b/src/misc/config.c index 466ec92..bffde82 100644 --- a/src/misc/config.c +++ b/src/misc/config.c @@ -4,4 +4,5 @@ */ #include "config.h" -config_t cfg;
\ No newline at end of file +config_t cfg_s; +config_t *cfg = &cfg_s;
\ No newline at end of file diff --git a/src/misc/config.h b/src/misc/config.h index f93cfc3..0a534ef 100644 --- a/src/misc/config.h +++ b/src/misc/config.h @@ -100,6 +100,7 @@ typedef struct { unsigned long hex_digits; } config_t; -extern config_t cfg; +extern config_t cfg_s; +extern config_t *cfg; #endif // ECGEN_CONFIG_H diff --git a/src/misc/types.h b/src/misc/types.h index d20ed2b..3cb3fd4 100644 --- a/src/misc/types.h +++ b/src/misc/types.h @@ -114,35 +114,30 @@ typedef struct { /** * @brief A generator function type. * @param curve A curve_t being generated - * @param cfg An application config * @param args Current optional generator argument * @param state The current generation state * @return state diff */ #define GENERATOR(gen_name) \ - int gen_name(curve_t *curve, const config_t *cfg, arg_t *args, \ - offset_e state) + int gen_name(curve_t *curve, arg_t *args, offset_e state) typedef GENERATOR((*gen_f)); /** * @brief An unroll function type * @param curve - * @param cfg * @param from * @param to * @return */ #define UNROLL(unroll_name) \ - int unroll_name(curve_t *curve, const config_t *cfg, pari_sp from, \ - pari_sp to) + int unroll_name(curve_t *curve, pari_sp from, pari_sp to) typedef UNROLL((*unroll_f)); /** * @brief A check function type. * @param curve A curve_t being checked - * @param cfg An application config * @param args Current optional generator argument * @return state diff */ @@ -162,7 +157,6 @@ typedef struct { * GENERATOR(gen_f) * * @param curve A curve_t being generated - * @param cfg An application config * @param args unused * @return state diff */ @@ -172,7 +166,6 @@ GENERATOR(gen_skip); * CHECK(check_f) * * @param curve A curve_t being checked - * @param cfg An application config * @param args unused * @return */ @@ -182,7 +175,6 @@ CHECK(check_skip); * UNROLL(unroll_f) * * @param curve - * @param cfg * @param from * @param to * @return |