aboutsummaryrefslogtreecommitdiff
path: root/src/io
diff options
context:
space:
mode:
Diffstat (limited to 'src/io')
-rw-r--r--src/io/cli.c6
-rw-r--r--src/io/cli.h4
-rw-r--r--src/io/input.c2
-rw-r--r--src/io/input.h2
-rw-r--r--src/io/output.c23
-rw-r--r--src/io/output.h20
6 files changed, 28 insertions, 29 deletions
diff --git a/src/io/cli.c b/src/io/cli.c
index d98a0c0..65524c9 100644
--- a/src/io/cli.c
+++ b/src/io/cli.c
@@ -88,7 +88,7 @@ struct argp_option cli_options[] = {
{0, 0, 0, 0, "Other:", 5},
{"data-dir", OPT_DATADIR, "DIR", 0, "Set PARI/GP data directory (containing seadata package).", 5},
{"memory", OPT_MEMORY, "SIZE", 0, "Use PARI stack of SIZE (can have suffix k/m/g).", 5},
- {"threads", OPT_THREADS, "NUM", 0, "Use NUM threads.", 5},
+ {"threads", OPT_THREADS, "NUM", 0, "Use NUM threads (in PARI or invalid generation).", 5},
{"thread-stack", OPT_TSTACK, "SIZE", 0, "Use PARI stack of SIZE (per thread, can have suffix k/m/g).", 5},
{"timeout", OPT_TIMEOUT, "TIME", 0, "Timeout computation of a curve parameter after TIME (can have suffix s/m/h/d).", 5},
{0}
@@ -97,7 +97,7 @@ struct argp_option cli_options[] = {
static regex_t re_cm_order;
-bool cli_init() {
+bool cli_init(void) {
int error = regcomp(
&re_cm_order,
"((0[xX][0-9a-fA-F]+)|([0-9]+))(,((0[xX][0-9a-fA-F]+)|([0-9]+)))*",
@@ -540,4 +540,4 @@ char *cli_filter(int key, const char *text, void *input) {
return (char *)text;
}
-void cli_quit() { regfree(&re_cm_order); }
+void cli_quit(void) { regfree(&re_cm_order); }
diff --git a/src/io/cli.h b/src/io/cli.h
index abeb6e6..a712c44 100644
--- a/src/io/cli.h
+++ b/src/io/cli.h
@@ -19,7 +19,7 @@ extern struct argp_option cli_options[];
/**
* @brief
*/
-bool cli_init();
+bool cli_init(void);
/**
* @brief
@@ -42,6 +42,6 @@ char *cli_filter(int key, const char *text, void *input);
/**
*
*/
-void cli_quit();
+void cli_quit(void);
#endif // ECGEN_IO_CLI_H
diff --git a/src/io/input.c b/src/io/input.c
index 507bd59..4c23c28 100644
--- a/src/io/input.c
+++ b/src/io/input.c
@@ -93,7 +93,7 @@ GEN input_string(const char *prompt) {
return result;
}
-bool input_init() {
+bool input_init(void) {
if (cfg->input) {
in = fopen(cfg->input, "r");
delim = ',';
diff --git a/src/io/input.h b/src/io/input.h
index a56347a..c1ac88e 100644
--- a/src/io/input.h
+++ b/src/io/input.h
@@ -50,7 +50,7 @@ extern FILE *in;
* @brief Initialize input based on cfg.
* @return whether the initialization was successful
*/
-bool input_init();
+bool input_init(void);
/**
* @brief Deinitialize input.
diff --git a/src/io/output.c b/src/io/output.c
index c4704c1..a625446 100644
--- a/src/io/output.c
+++ b/src/io/output.c
@@ -10,9 +10,9 @@
#include "util/memory.h"
char *(*output_s)(curve_t *curve);
-char *(*output_s_separator)();
-char *(*output_s_begin)();
-char *(*output_s_end)();
+char *(*output_s_separator)(void);
+char *(*output_s_begin)(void);
+char *(*output_s_end)(void);
FILE *out;
FILE *err;
@@ -165,8 +165,7 @@ static JSON_Value *output_jjson(curve_t *curve) {
}
if (curve->meta.conductor != NULL) {
char *conductor = pari_sprintf("%Pi", curve->meta.conductor);
- json_object_dotset_string(root_object, "meta.conductor",
- conductor);
+ json_object_dotset_string(root_object, "meta.conductor", conductor);
pari_free(conductor);
}
}
@@ -183,11 +182,11 @@ char *output_sjson(curve_t *curve) {
return result;
}
-char *output_sjson_separator() { return output_malloc(",\n"); }
+char *output_sjson_separator(void) { return output_malloc(",\n"); }
-char *output_sjson_begin() { return output_malloc("[\n"); }
+char *output_sjson_begin(void) { return output_malloc("[\n"); }
-char *output_sjson_end() { return output_malloc("]\n"); }
+char *output_sjson_end(void) { return output_malloc("]\n"); }
void output_f(FILE *output, curve_t *curve) {
char *s = output_s(curve);
@@ -207,7 +206,7 @@ void output_f_separator(FILE *output) {
}
}
-void output_o_separator() { output_f_separator(out); }
+void output_o_separator(void) { output_f_separator(out); }
void output_f_begin(FILE *output) {
char *s = output_s_begin();
@@ -217,7 +216,7 @@ void output_f_begin(FILE *output) {
}
}
-void output_o_begin() { output_f_begin(out); }
+void output_o_begin(void) { output_f_begin(out); }
void output_f_end(FILE *output) {
char *s = output_s_end();
@@ -227,9 +226,9 @@ void output_f_end(FILE *output) {
}
}
-void output_o_end() { output_f_end(out); }
+void output_o_end(void) { output_f_end(out); }
-bool output_init() {
+bool output_init(void) {
json_set_allocation_functions(try_malloc, try_free);
if (cfg->output) {
diff --git a/src/io/output.h b/src/io/output.h
index f68acfc..477def4 100644
--- a/src/io/output.h
+++ b/src/io/output.h
@@ -89,21 +89,21 @@ char *output_sjson(curve_t *curve);
* format.
* @return
*/
-char *output_sjson_separator();
+char *output_sjson_separator(void);
/**
* @brief Output JSON output header(a "[") to a malloc'ed string in CSV
* format.
* @return
*/
-char *output_sjson_begin();
+char *output_sjson_begin(void);
/**
* @brief Output JSON output footer(a "]") to a malloc'ed string in CSV
* format.
* @return
*/
-char *output_sjson_end();
+char *output_sjson_end(void);
/**
* @brief Output curve to a malloc'ed string in configured format.
@@ -129,7 +129,7 @@ void output_o(curve_t *curve);
* @brief Output separator to a malloc'ed string in configured format.
* @return
*/
-extern char *(*output_s_separator)();
+extern char *(*output_s_separator)(void);
/**
* @brief Output separator to a FILE *out in configured format.
@@ -140,13 +140,13 @@ void output_f_separator(FILE *out);
/**
* @brief Output separator to configured output in configured format.
*/
-void output_o_separator();
+void output_o_separator(void);
/**
* @brief Output header to a malloc'ed string in configured format.
* @return
*/
-extern char *(*output_s_begin)();
+extern char *(*output_s_begin)(void);
/**
* @brief Output header to a FILE *out in configured format.
@@ -157,13 +157,13 @@ void output_f_begin(FILE *out);
/**
* @brief Output header to configured output in configured format.
*/
-void output_o_begin();
+void output_o_begin(void);
/**
* @brief Output footer to a malloc'ed string in configured format.
* @return
*/
-extern char *(*output_s_end)();
+extern char *(*output_s_end)(void);
/**
* @brief Output footer to a FILE *out in configured format.
@@ -174,7 +174,7 @@ void output_f_end(FILE *out);
/**
* @brief Output header to configured output in configured format.
*/
-void output_o_end();
+void output_o_end(void);
/**
* @brief Configured output FILE*.
@@ -195,7 +195,7 @@ extern FILE *verbose;
* @brief Initialize output based on cfg.
* @return whether the initialization was successful
*/
-bool output_init();
+bool output_init(void);
/**
* @brief Deinitialize output.
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2026-01-25 21:32:08 +0000