X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fjansson_private.h;h=08731e8876242e65c0e5a1176be48f017755be71;hb=cf9b384bcbd2fab0bfb44e0165368d3abc965f32;hp=951780c6a061af6c012df6cdcdb376c9981823d4;hpb=5422a862de2354b3419ef628bac5a18c6ef522da;p=jansson.git diff --git a/src/jansson_private.h b/src/jansson_private.h index 951780c..08731e8 100644 --- a/src/jansson_private.h +++ b/src/jansson_private.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Petri Lehtinen + * Copyright (c) 2009-2011 Petri Lehtinen * * Jansson is free software; you can redistribute it and/or modify * it under the terms of the MIT license. See LICENSE for details. @@ -9,6 +9,7 @@ #define JANSSON_PRIVATE_H #include +#include #include "jansson.h" #include "hashtable.h" @@ -56,6 +57,9 @@ typedef struct { #define json_to_real(json_) container_of(json_, json_real_t, json) #define json_to_integer(json_) container_of(json_, json_integer_t, json) +size_t jsonp_hash_key(const void *ptr); +int jsonp_key_equal(const void *ptr1, const void *ptr2); + typedef struct { size_t serial; char key[1]; @@ -64,7 +68,15 @@ typedef struct { const object_key_t *jsonp_object_iter_fullkey(void *iter); void jsonp_error_init(json_error_t *error, const char *source); +void jsonp_error_set_source(json_error_t *error, const char *source); void jsonp_error_set(json_error_t *error, int line, int column, - const char *msg, ...); + size_t position, const char *msg, ...); +void jsonp_error_vset(json_error_t *error, int line, int column, + size_t position, const char *msg, va_list ap); + +/* Wrappers for custom memory functions */ +void* jsonp_malloc(size_t size); +void jsonp_free(void *ptr); +char *jsonp_strdup(const char *str); #endif