}
-int json_dump(const json_t *json, const char *path, uint32_t flags)
-{
- int result;
-
- FILE *output = fopen(path, "w");
- if(!output)
- return -1;
-
- result = json_dumpf(json, output, flags);
-
- fclose(output);
- return result;
-}
-
char *json_dumps(const json_t *json, uint32_t flags)
{
strbuffer_t strbuff;
return -1;
return dump_to_file("\n", 1, (void *)output);
}
+
+int json_dump_file(const json_t *json, const char *path, uint32_t flags)
+{
+ int result;
+
+ FILE *output = fopen(path, "w");
+ if(!output)
+ return -1;
+
+ result = json_dumpf(json, output, flags);
+
+ fclose(output);
+ return result;
+}
int line;
} json_error_t;
-json_t *json_load(const char *path, json_error_t *error);
json_t *json_loads(const char *input, json_error_t *error);
json_t *json_loadf(FILE *input, json_error_t *error);
+json_t *json_load_file(const char *path, json_error_t *error);
#define JSON_INDENT(n) (n & 0xFF)
-int json_dump(const json_t *json, const char *path, uint32_t flags);
char *json_dumps(const json_t *json, uint32_t flags);
int json_dumpf(const json_t *json, FILE *output, uint32_t flags);
+int json_dump_file(const json_t *json, const char *path, uint32_t flags);
#endif
return parse_value(lex, error);
}
-json_t *json_load(const char *path, json_error_t *error)
-{
- json_t *result;
- FILE *fp;
-
- fp = fopen(path, "r");
- if(!fp)
- {
- error_set(error, NULL, "unable to open %s: %s",
- path, strerror(errno));
- return NULL;
- }
-
- result = json_loadf(fp, error);
-
- fclose(fp);
- return result;
-}
-
typedef struct
{
const char *data;
lex_close(&lex);
return result;
}
+
+json_t *json_load_file(const char *path, json_error_t *error)
+{
+ json_t *result;
+ FILE *fp;
+
+ fp = fopen(path, "r");
+ if(!fp)
+ {
+ error_set(error, NULL, "unable to open %s: %s",
+ path, strerror(errno));
+ return NULL;
+ }
+
+ result = json_loadf(fp, error);
+
+ fclose(fp);
+ return result;
+}
-load_dump
loadf_dumpf
loads_dumps
+load_file_dump_file
testlogs
-check_PROGRAMS = load_dump loadf_dumpf loads_dumps
+check_PROGRAMS = loadf_dumpf loads_dumps load_file_dump_file
AM_CPPFLAGS = -I$(top_srcdir)/src
AM_CFLAGS = -Wall -Werror
return 2;
}
- json = json_load(argv[1], &error);
+ json = json_load_file(argv[1], &error);
if(!json) {
fprintf(stderr, "%d\n%s\n", error.line, error.text);
return 1;
}
- json_dump(json, argv[2], 0);
+ json_dump_file(json, argv[2], 0);
json_decref(json);
return 0;
fi
case "$prog" in
- load_dump)
+ load_file_dump_file)
$runner./$prog \
$prefix.in \
$prefix.$prog.stdout \
tmpdir="testlogs/`basename $testfile`"
mkdir -p $tmpdir
${srcdir}/split-testfile.py $testfile $tmpdir | while read name; do
- run_test load_dump $tmpdir/$name
run_test loadf_dumpf $tmpdir/$name
run_test loads_dumps $tmpdir/$name
+ run_test load_file_dump_file $tmpdir/$name
echo -n '.'
done || exit 1
echo