summaryrefslogtreecommitdiff
path: root/verify
diff options
context:
space:
mode:
authorlloydh <lloydh@e775cfb5-b74b-0410-aad5-5bebe4a96390>2007-12-22 14:16:25 +0000
committerlloydh <lloydh@e775cfb5-b74b-0410-aad5-5bebe4a96390>2007-12-22 14:16:25 +0000
commit89d90dd72421844e29cb1bdc7addfd0ebaa487ec (patch)
tree36912c93755f3db4d6e28a137aea979251e14e3c /verify
parentd37daea88d3843e7dbd9c3dd054abdb5449c08ac (diff)
downloadyajl-89d90dd72421844e29cb1bdc7addfd0ebaa487ec.tar.gz
fix bug in validator, false report of valid input
git-svn-id: http://yajl-c.googlecode.com/svn/yajl/trunk@86 e775cfb5-b74b-0410-aad5-5bebe4a96390
Diffstat (limited to 'verify')
-rw-r--r--verify/CMakeLists.txt6
-rw-r--r--verify/json_verify.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt
index fa13553..987b7eb 100644
--- a/verify/CMakeLists.txt
+++ b/verify/CMakeLists.txt
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
# set up some paths
-SET (binDir ${CMAKE_CURRENT_BINARY_DIR}/../dist/bin)
+SET (binDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/bin)
# create some directories
FILE(MAKE_DIRECTORY ${binDir})
@@ -37,8 +37,8 @@ FILE(MAKE_DIRECTORY ${binDir})
SET (SRCS json_verify.c)
# use the library we build, duh.
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../dist/include)
-LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../dist/lib)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include)
+LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
ADD_EXECUTABLE(json_verify ${SRCS})
diff --git a/verify/json_verify.c b/verify/json_verify.c
index 444df52..334d490 100644
--- a/verify/json_verify.c
+++ b/verify/json_verify.c
@@ -56,7 +56,7 @@ main(int argc, char ** argv)
yajl_handle hand;
static unsigned char fileData[65536];
int quiet = 0;
- int retval;
+ int retval = 0;
yajl_parser_config cfg = { 0, 1 };
/* check arguments.*/
@@ -111,6 +111,7 @@ main(int argc, char ** argv)
yajl_free_error(str);
}
retval = 1;
+ break;
}
}
}