diff options
| author | J08nY | 2017-03-09 13:18:15 +0100 |
|---|---|---|
| committer | J08nY | 2017-03-09 13:18:15 +0100 |
| commit | 8c65683537ea57a435a2f987f540bcc2ec5db678 (patch) | |
| tree | 18d6e8893c885d98392d9a4cc9a9d98e67003f18 /src/io/output.c | |
| parent | 7eff89c0095da4246a7b9c5a6654dc0d7692325e (diff) | |
| download | ecgen-8c65683537ea57a435a2f987f540bcc2ec5db678.tar.gz ecgen-8c65683537ea57a435a2f987f540bcc2ec5db678.tar.zst ecgen-8c65683537ea57a435a2f987f540bcc2ec5db678.zip | |
Diffstat (limited to 'src/io/output.c')
| -rw-r--r-- | src/io/output.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/io/output.c b/src/io/output.c index 88b120e..cb718fa 100644 --- a/src/io/output.c +++ b/src/io/output.c @@ -11,7 +11,7 @@ FILE *out; FILE *debug; -char *output_scsv(curve_t *curve, config_t *config) { +char *output_scsv(curve_t *curve, config_t *cfg) { pari_sp ltop = avma; GEN vector = curve_params(curve); @@ -48,23 +48,21 @@ char *output_scsv(curve_t *curve, config_t *config) { return result; } -void output_fcsv(FILE *out, curve_t *curve, config_t *config) { - char *string = output_scsv(curve, config); +void output_fcsv(FILE *out, curve_t *curve, config_t *cfg) { + char *string = output_scsv(curve, cfg); fprintf(out, "%s\n", string); free(string); } -void output_csv(curve_t *curve, config_t *config) { - output_fcsv(out, curve, config); -} +void output_csv(curve_t *curve, config_t *cfg) { output_fcsv(out, curve, cfg); } -JSON_Value *output_jjson(curve_t *curve, config_t *config) { +JSON_Value *output_jjson(curve_t *curve, config_t *cfg) { pari_sp ltop = avma; // root object/value is curve JSON_Value *root_value = json_value_init_object(); JSON_Object *root_object = json_value_get_object(root_value); - switch (config->field) { + switch (cfg->field) { case FIELD_PRIME: { char *prime = pari_sprintf("%P#x", curve->field); json_object_dotset_string(root_object, "field.p", prime); @@ -168,22 +166,22 @@ JSON_Value *output_jjson(curve_t *curve, config_t *config) { return root_value; } -char *output_sjson(curve_t *curve, config_t *config) { - JSON_Value *root_value = output_jjson(curve, config); +char *output_sjson(curve_t *curve, config_t *cfg) { + JSON_Value *root_value = output_jjson(curve, cfg); char *result = json_serialize_to_string_pretty(root_value); json_value_free(root_value); return result; } -void output_fjson(FILE *out, curve_t *curve, config_t *config) { - char *s = output_sjson(curve, config); +void output_fjson(FILE *out, curve_t *curve, config_t *cfg) { + char *s = output_sjson(curve, cfg); fprintf(out, "%s\n", s); json_free_serialized_string(s); } -void output_json(curve_t *curve, config_t *config) { - output_fjson(out, curve, config); +void output_json(curve_t *curve, config_t *cfg) { + output_fjson(out, curve, cfg); } void output_init(config_t *cfg) { |
