Permalink
Browse files

Merge pull request #82 from patperry/master

Minor changes to make "gcc -Wextra" happy
  • Loading branch information...
2 parents 79ff20a + 1afeeae commit abb2d1c4de28a96d838b55402240179556ad4fe7 @lloyd committed Jan 29, 2013
Showing with 5 additions and 2 deletions.
  1. +3 −0 src/yajl_alloc.c
  2. +2 −2 src/yajl_tree.c
View
@@ -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);
}
View
@@ -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;

0 comments on commit abb2d1c

Please sign in to comment.