summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLloyd Hilaiel <lloyd@hilaiel.com>2013-01-28 19:19:44 -0800
committerLloyd Hilaiel <lloyd@hilaiel.com>2013-01-28 19:19:44 -0800
commitabb2d1c4de28a96d838b55402240179556ad4fe7 (patch)
tree1b5cd61c6667c4c5db22c8c17446ae33d0776565
parent79ff20af0422d60fbc869f26461dec0752ceb429 (diff)
parent1afeeaefd7d39e50f1d8860e64c47ce9828ef98f (diff)
downloadyajl-abb2d1c4de28a96d838b55402240179556ad4fe7.tar.gz
Merge pull request #82 from patperry/master
Minor changes to make "gcc -Wextra" happy
-rw-r--r--src/yajl_alloc.c3
-rw-r--r--src/yajl_tree.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/yajl_alloc.c b/src/yajl_alloc.c
index 276315a..20202ec 100644
--- a/src/yajl_alloc.c
+++ b/src/yajl_alloc.c
@@ -25,17 +25,20 @@
static void * yajl_internal_malloc(void *ctx, size_t sz)
{
+ (void)ctx;
return malloc(sz);
}
static void * yajl_internal_realloc(void *ctx, void * previous,
size_t sz)
{
+ (void)ctx;
return realloc(previous, sz);
}
static void yajl_internal_free(void *ctx, void * ptr)
{
+ (void)ctx;
free(ptr);
}
diff --git a/src/yajl_tree.c b/src/yajl_tree.c
index e63240c..f486e89 100644
--- a/src/yajl_tree.c
+++ b/src/yajl_tree.c
@@ -456,8 +456,8 @@ yajl_val yajl_tree_get(yajl_val n, const char ** path, yajl_type type)
{
if (!path) return NULL;
while (n && *path) {
- unsigned int i;
- int len;
+ size_t i;
+ size_t len;
if (n->type != yajl_t_object) return NULL;
len = n->u.object.len;