Rename json_{load,dump} to json_{load,dump}_file

This commit is contained in:
Petri Lehtinen
2009-07-28 10:57:17 +03:00
parent b348519e96
commit f41e380984
7 changed files with 41 additions and 41 deletions

2
test/.gitignore vendored
View File

@@ -1,4 +1,4 @@
load_dump
loadf_dumpf
loads_dumps
load_file_dump_file
testlogs

View File

@@ -1,4 +1,4 @@
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

View File

@@ -11,13 +11,13 @@ int main(int argc, char *argv[])
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;

View File

@@ -8,7 +8,7 @@ run_testprog() {
fi
case "$prog" in
load_dump)
load_file_dump_file)
$runner./$prog \
$prefix.in \
$prefix.$prog.stdout \
@@ -41,9 +41,9 @@ for testfile in $TESTFILES; do
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