X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fjansson.h;h=0f1de8d8077b39d5cd6eced037986683db9c93cb;hb=198d537be76ae4debaac7f730bb2c591b04ab1df;hp=5d335ae0b8602fd7b26e004ecef285ee88ce868f;hpb=f8d0e01e46cd9452b5d7780906029d899215cb89;p=jansson.git

diff --git a/src/jansson.h b/src/jansson.h
index 5d335ae..0f1de8d 100644
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -85,6 +85,14 @@ void json_decref(json_t *json)
 }
 
 
+/* error reporting */
+
+typedef struct json_error_t json_error_t;
+
+const char *json_error_msg(const json_error_t *error);
+int json_error_line(const json_error_t *error);
+
+
 /* getters, setters, manipulation */
 
 size_t json_object_size(const json_t *object);
@@ -113,7 +121,7 @@ int json_object_set_nocheck(json_t *object, const char *key, json_t *value)
     return json_object_set_new_nocheck(object, key, json_incref(value));
 }
 
-static inline
+static JSON_INLINE
 int json_object_iter_set(json_t *object, void *iter, json_t *value)
 {
     return json_object_iter_set_new(object, iter, json_incref(value));
@@ -156,6 +164,8 @@ int json_string_set_nocheck(json_t *string, const char *value);
 int json_integer_set(json_t *integer, json_int_t value);
 int json_real_set(json_t *real, double value);
 
+json_t *json_pack(json_error_t **error, const char *fmt, ...);
+int json_unpack(json_t *root, json_error_t **error, const char *fmt, ...);
 
 /* equality */
 
@@ -170,16 +180,9 @@ json_t *json_deep_copy(json_t *value);
 
 /* loading, printing */
 
-#define JSON_ERROR_TEXT_LENGTH  160
-
-typedef struct {
-    char text[JSON_ERROR_TEXT_LENGTH];
-    int line;
-} json_error_t;
-
-json_t *json_loads(const char *input, json_error_t *error);
-json_t *json_loadf(FILE *input, json_error_t *error);
-json_t *json_load_file(const char *path, json_error_t *error);
+json_t *json_loads(const char *input, size_t flags, json_error_t **error);
+json_t *json_loadf(FILE *input, size_t flags, json_error_t **error);
+json_t *json_load_file(const char *path, size_t flags, json_error_t **error);
 
 #define JSON_INDENT(n)      (n & 0x1F)
 #define JSON_COMPACT        0x20